mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-18 22:41:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
117,235 Commits 503 Branches 1,387 Tags 833 MiB
3b9e822e11
Commit Graph

341 Commits

Author SHA1 Message Date
George Peter Banyard
12e903d894 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #79080 [ci skip]
 2020-01-25 13:31:43 +01:00
George Peter Banyard
86f463c396 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #79080 [ci skip]
 2020-01-25 13:31:10 +01:00
George Peter Banyard
a1f2f8f06e Fixed bug #79080 [ci skip] 
Rewrote session.gc_probability and session.gc_divisor INI setting
description to be more succint.
 2020-01-25 13:29:36 +01:00
Nikita Popov
ae706e51e1 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Update php.ini files to add missing FTP extension
 2020-01-17 09:51:31 +01:00
aand18
4d24f5a494 Update php.ini files to add missing FTP extension 
FTP functionality isn't enabled by default and not listed as a disabled
extension in the `php.ini` file either.

This should spare a few googles to anyone needing FTP functionality in PHP.

Closes GH-5084.
 2020-01-17 09:51:18 +01:00
Remi Collet
97f994762f Merge branch 'PHP-7.4' 
* PHP-7.4:
  typo and better wording
 2019-10-24 07:43:56 +02:00
Remi Collet
69b608cf13 typo and better wording 2019-10-24 07:43:49 +02:00
Remi Collet
ff09d39328 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Added suppot for glob() wildcard matching in ffi.preload directive
  Reverting push to wrong repo
  Update alloc patch
 2019-10-24 07:40:27 +02:00
Dmitry Stogov
fea8c5481b Added suppot for glob() wildcard matching in ffi.preload directive 2019-10-24 07:40:07 +02:00
Remi Collet
3d9bbd1b53 Merge branch 'PHP-7.4' 
* PHP-7.4:
  add new ffi.preload  option in php.ini and display ini entries in MINFO
 2019-10-23 07:49:29 +02:00
Remi Collet
dcd772325d add new ffi.preload option in php.ini and display ini entries in MINFO 2019-10-23 07:49:13 +02:00
Christoph M. Becker
0436bc875e Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix miscellaneous typos in docs
 2019-10-19 19:20:25 +02:00
Tyson Andre
38f388fba4 Fix miscellaneous typos in docs 2019-10-19 19:19:28 +02:00
Nikita Popov
21e631e473 Merge branch 'PHP-7.4' 2019-10-06 10:07:57 +02:00
Nikita Popov
6623e7ac51 Add support for mbstring.regex_retry_limit 
This is very similar to the existing mbstring.regex_stack_limit,
but for backtracking. The default value matches pcre.backtrack_limit.
Only used on libonig >= 2.8.0.
 2019-10-06 10:06:33 +02:00
Nikita Popov
1cde9e8528 Merge branch 'PHP-7.4' 2019-09-30 10:30:20 +02:00
Nikita Popov
1806ce9cb0 Add max_depth option to unserialize() 
Add a max_depth option to unserialize and an unserialize_max_depth
ini setting, which can be used to control the depth limit. The
default value is 4096.

This option is intended to prevent stack overflows during the
unserialization of deeply nested structures.

This fixes bug #78549 and addresses oss-fuzz #17581, #17589, #17664,
and #17788.
 2019-09-30 10:28:24 +02:00
Nikita Popov
790ed7d540 Enable display_startup_errors by default 2019-09-06 14:33:03 +02:00
Christoph M. Becker
6926018bda Merge branch 'PHP-7.4' 
* PHP-7.4:
  Document opcache.preload_user directive
 2019-09-03 14:08:52 +02:00
Christoph M. Becker
61dcae50d5 Document opcache.preload_user directive 2019-09-03 14:08:17 +02:00
Nikita Popov
ea5854ca8c Make error_reporting=E_ALL the default 2019-09-02 10:03:26 +02:00
Christoph M. Becker
29925cef47 Merge branch 'PHP-7.4' 
* PHP-7.4:
  add ffi to php.ini extension [ci skip]
 2019-08-27 15:54:18 +02:00
Pavel Dyakonov
f08095faa5 add ffi to php.ini extension [ci skip] 2019-08-27 15:53:51 +02:00
Christoph M. Becker
54401001a8 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Allow multiple cache instances per user/host on Windows
 2019-07-17 19:52:49 +02:00
Christoph M. Becker
e2ed7e6716 Allow multiple cache instances per user/host on Windows 
Formerly, there was at most a single OPcache instance per user and the
so called system ID (which is determined from the PHP version).
Sometimes multiple OPcaches might be desired, though, particularly for
unrelated CLI scripts, which may even be necessary (e.g. for our test
suite in parallel mode).

We therefore introduce a new INI directive `opcache.cache_id` which
allows to configure independent OPcache instances for the same user.

We also use `GetUserNameW()` instead of `php_win32_get_username()`,
because the latter retrieves the user name encoded in the
`default_charset`, which can obviously yield different results for
different charsets, leading to OPcache "incompatibilities".  Slightly
worse, some characters may not even be encodeable in the
`default_charset` and would be replaced by question marks, which could
result in different users sharing the same OPcache.

We also refactor, and re-use existing APIs to avoid duplicated code.
 2019-07-17 19:51:07 +02:00
Christoph M. Becker
7556600dfc Fix #65547: Default value for sunrise/sunset zenith still wrong 
The value of the zenith angle to calculate sunrise and sunset times is
commonly defined as 90°50', and is "obtained by adding the average
apparent radius of the Sun (16') to the average amount of atmospheric
refraction at the horizon (34')", according to
http://aa.usno.navy.mil/faq/docs/RST_defs.php.

This value is also used for the Sunrise/Sunset Algorithm published in
the Almanac for Computers, 1990, see
https://web.archive.org/web/20161202180207/http://williams.best.vwh.net/sunrise_sunset_algorithm.htm.
 2019-07-15 13:52:09 +02:00
Joe Watkins
d41ab64456
Merge branch 'PHP-7.4' 
* PHP-7.4:
  simple ignore arguments in exceptions implementation
 2019-07-02 13:19:25 +02:00
Joe Watkins
0819e6dc9b
simple ignore arguments in exceptions implementation 2019-07-02 13:18:39 +02:00
Nikita Popov
ca8f348646 Merge branch 'PHP-7.4' 2019-06-17 13:14:26 +02:00
Nikita Popov
1b63528d38 Merge branch 'PHP-7.3' into PHP-7.4 2019-06-17 13:14:18 +02:00
Erik Lundin
9f0515c40c Add syslog.filter=raw 
This passes through syslog message unchanged, without splitting
messages at newlines.
 2019-06-17 13:13:25 +02:00
Kalle Sommer Nielsen
c71e35ea91 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove some more interbase leftovers
  Fix typo
  NEWS for ext/interbase unbundling
 2019-05-01 23:45:24 +03:00
Kalle Sommer Nielsen
eaab0a2b6f Remove some more interbase leftovers 2019-05-01 23:45:06 +03:00
Christoph M. Becker
7502df133c Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove html_errors from INI Quick Reference as INI values are identical to Engine values
 2019-04-24 19:22:11 +02:00
George Peter Banyard
8b8d5a4bd1 Remove html_errors from INI Quick Reference as INI values are identical to Engine values 2019-04-24 19:21:52 +02:00
Nikita Popov
772a158d7a Merge branch 'PHP-7.4' 2019-04-16 10:40:01 +02:00
Nikita Popov
9a85a944d8 s/mysql_connect()/mysqli_connect() in php.ini 2019-04-16 10:39:40 +02:00
Peter Kokot
f9b5d9c2a7 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Add opcache.lockfile_path and opcache.lockfile_path to ini settings
 2019-04-05 19:46:11 +02:00
Peter Kokot
1dd5ab0cad Add opcache.lockfile_path and opcache.lockfile_path to ini settings 
Some default opcache settings were missing.
 2019-04-05 19:44:56 +02:00
Stanislav Malyshev
63e0c22037 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Unfortunately, travis CI has old oniguruma library
  Update NEWS & UPGRADING
  Add fallbacks for older oniguruma versions
  Add mbstring.regex_stack_limit to php.ini-*
  Implement RF bug #72777 - ensure stack limits on mbstring functions.
 2019-04-01 00:32:49 -07:00
Stanislav Malyshev
077ce33aa9 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Update NEWS & UPGRADING
  Add fallbacks for older oniguruma versions
  Add mbstring.regex_stack_limit to php.ini-*
  Implement RF bug #72777 - ensure stack limits on mbstring functions.
 2019-04-01 00:05:36 -07:00
Stanislav Malyshev
bc4cb277d3 Add mbstring.regex_stack_limit to php.ini-* 2019-03-28 22:57:07 -07:00
Remi Collet
1df4ef0773 Merge branch 'PHP-7.4' 
* PHP-7.4:
  comment out sqlite3.defensive = 1 follow common practice, this is the default value
 2019-03-19 16:28:22 +01:00
Remi Collet
11bdc3eca4 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  comment out sqlite3.defensive = 1 follow common practice, this is the default value
 2019-03-19 16:28:10 +01:00
Remi Collet
5686e6e33e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  comment out sqlite3.defensive = 1 follow common practice, this is the default value
 2019-03-19 16:27:57 +01:00
Remi Collet
78c9a53df7 comment out sqlite3.defensive = 1 
follow common practice, this is the default value
 2019-03-19 16:26:26 +01:00
Christoph M. Becker
2b54140b72 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #76956: Wrong value for 'syslog.filter' documented in php.ini
 2019-03-18 10:21:38 +01:00
Christoph M. Becker
e0e5d26c9c Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #76956: Wrong value for 'syslog.filter' documented in php.ini
 2019-03-18 10:20:41 +01:00
Christoph M. Becker
ad2d2e41de Fix #76956: Wrong value for 'syslog.filter' documented in php.ini 2019-03-18 10:19:30 +01:00
Christoph M. Becker
dd6911550f Merge branch 'PHP-7.4' 
* PHP-7.4:
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
 2019-03-11 16:32:16 +01:00