summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prepare 7.3.10php-7.3.10PHP-7.3.10Christoph M. Becker2019-09-244-5/+5
|
* Fix #78559: Heap buffer overflow in mb_eregiChristoph M. Becker2019-09-243-0/+19
| | | | | | We backport kkos/oniguruma@d3e402928b6eb3327f8f7d59a9edfa622fec557b. (cherry picked from commit 8f949eba8083e34d181c30bcf11aaeef2496bb97)
* Raise minimal GCC version,php-7.3.10RC1Remi Collet2019-09-111-2/+2
| | | | | | | Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions (cherry picked from commit c43fc204b1639a8aa6c6212202def29b3c4cf611)
* Prepare 7.3.10RC1Christoph M. Becker2019-09-104-5/+5
|
* Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-101-14/+0
|\ | | | | | | | | * PHP-7.2: Drop regression test
| * Drop regression testChristoph M. Becker2019-09-101-14/+0
| | | | | | | | | | | | | | The state returned by `sodium_crypto_generichash_init()` has to be regarded as opaque byte string; neither its size nor its exact structure are fixed, and actually vary for diffent libsodium versions. Therefore we drop the test altogether.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-09-093-3/+13
|\ \ | |/
| * Fix bug #72884 isCloneable() on SplFileObject should return falseCHU Zhaowei2019-09-094-3/+17
| |
* | Fix versionChristoph M. Becker2019-09-091-3/+3
| | | | | | | | 7.3.10 is next, not 7.3.11.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-093-0/+19
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78510: Partially uninitialized buffer returned by sodium_crypto_generichash_init()
| * Fix #78510: Partially uninitialized buffer returned by ↵Christoph M. Becker2019-09-093-0/+19
| | | | | | | | | | | | sodium_crypto_generichash_init() Backport jedisct1/libsodium.php@28d13bf437cb969a0583031fc7ac54c5a8dc8116.
* | fix versionStanislav Malyshev2019-09-051-3/+3
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-035-8/+5
|\ \ | |/ | | | | | | * PHP-7.2: Fix #41997: SP call yields additional empty result set
| * Fix #41997: SP call yields additional empty result setChristoph M. Becker2019-09-035-8/+5
| | | | | | | | | | | | | | When stored procedures are called, the "final result set is a status result that includes no result set". Calling `::nextRowset()` on the actual last result set should return FALSE, since there is actually no further result set to be processed.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-09-031-1/+1
|\ \ | |/
| * Fix opcache return type for hash_update_streamTyson Andre2019-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can return false if the resource type is wrong. ``` php > var_export(hash_update_stream(hash_init('md5'), imagecreate(1,1))); Warning: hash_update_stream(): supplied resource is not a valid stream resource in php shell code on line 1 false ``` The return types were initially added in c88ffa9a5673cb3141660626ba1921671f0b84d6
* | Update NEWSChristoph M. Becker2019-09-021-0/+3
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-021-5/+0
|\ \ | |/ | | | | | | * PHP-7.2: Fix #76577: outdated documentation concerning track_errors
| * Fix #76577: outdated documentation concerning track_errorsChristoph M. Becker2019-09-021-5/+0
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-09-021-1/+1
|\ \ | |/
| * Fix pkg-config version constraint for ICUNikita Popov2019-09-021-1/+1
| | | | | | | | On PHP 7.2 our minimum ICU version is 4.0, not 40.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-08-302-2/+6
|\ \ | |/
| * Fixed bug #78469Sergei Turchanov2019-08-302-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcgi_accept_request function is supposed to call a FastCGI implementation's on_accept hook when entering an "accepting" stage (that is right before calling "accept"). This hook implementation (fpm_request_accepting) updates a worker state to an "accepting" state which is effectively an "Idle" state, and updates counters on the scoreboard of the corresponding pool (idle++, active--). But this is not done when listening for client connections on a named pipe on Windows platform. In that case a combination of ConnectNamedPipe/WaitForSingleObject is used (to be able to catch in_shutdown as far as I understand), but it is nonetheless functionally equivalent to "accept" call. Also by not calling on_hook neither a worker's state is updated to "accepting" state nor scoreboard counters are updated.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-08-293-3/+26
|\ \ | |/
| * Fix use-after-free of immediately invoked closure with extra argsNikita Popov2019-08-293-2/+21
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-08-283-1/+21
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78473: odbc_close() closes arbitrary resources
| * Fix #78473: odbc_close() closes arbitrary resourcesChristoph M. Becker2019-08-283-1/+21
| | | | | | | | | | We have to bail out, if an invalid resource is given. For consistency with the other `zend_fetch_resource(2)` calls, we return `FALSE`.
* | Upgrade oniguruma lib to 6.9.3Stanislav Malyshev2019-08-2764-10853/+14742
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-08-271-1/+1
|\ \ | |/ | | | | | | * PHP-7.2: Update SDK version for AppVeyor
| * Update SDK version for AppVeyorChristoph M. Becker2019-08-271-1/+1
| |
* | Fix bug #78334 (fpm log prefix message includes wrong stdout/stderr notation)Tsuyoshi Sadakata2019-08-268-9/+95
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-08-262-0/+32
|\ \ | |/
| * Remove properties HT from nested GC dataNikita Popov2019-08-262-0/+30
| | | | | | | | | | | | | | The properties HT may be a GC root itself, so we need to remove it. I'm not sure this issue actually applies to PHP 7.2, but committing it there to be safe. As seen from the test case, the handling here is rather buggy on 7.2.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-08-261-2/+2
|\ \ | |/
| * Also fix signature for passthruTyson Andre2019-08-261-1/+1
| | | | | | | | | | | | | | | | Backported from a1a8d144854acb1c891cf0c21abb0f612b1d8de7 https://www.php.net/manual/en/function.passthru.php#refsect1-function.passthru-returnvalues `passthru()` is false with invalid args `passthru('command')` is null.
| * Fix opcache optimizer info for time_nanosleepTyson Andre2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can also return an array. See https://www.php.net/manual/en/function.time-nanosleep.php#refsect1-function.time-nanosleep-returnvalues > If the delay was interrupted by a signal, an associative array will be returned with the components: > > - seconds - number of seconds remaining in the delay > - nanoseconds - number of nanoseconds remaining in the delay Sending a SIGUSR1 to the below program would trigger this behavior. ``` pcntl_signal(\SIGUSR1, function ($signo, $signinfo) { echo "Handling a signal $signo\n"; }); echo "Sleeping for 100 seconds\n"; var_export(time_nanosleep(100, 0)); ``` The incomplete signature existed since c88ffa9a5. No phpt tests existed for time_nanosleep returning an array
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-08-262-5/+23
|\ \ | |/
| * Fix overflow in memory limit checksNikita Popov2019-08-262-5/+23
| | | | | | | | | | | | Due to overflows in the memory limit checks, we were missing cases where the allocation size was close to the address space size, and caused an OOM condition rather than a memory limit error.
* | Fix testStanislav Malyshev2019-08-251-1/+1
| | | | | | | | | | Not sure why offset changed... probably different PCRE version calculates them in different way.
* | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-08-251-0/+10
|\ \ | |/ | | | | | | * PHP-7.2: Fix #75457: heap-use-after-free in php7.0.25
| * Merge branch 'PHP-7.1' into PHP-7.2Stanislav Malyshev2019-08-251-0/+10
| |\ | | | | | | | | | | | | * PHP-7.1: Fix #75457: heap-use-after-free in php7.0.25
| | * Fix #75457: heap-use-after-free in php7.0.25Christoph M. Becker2019-08-252-1/+20
| | | | | | | | | | | | Backport <https://vcs.pcre.org/pcre?view=revision&revision=1638>.
* | | Update Oniguruma to 6.9.1Stanislav Malyshev2019-08-2556-1533/+1727
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-08-241-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.2: Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe() set version for release
| * | Merge branch 'PHP-7.1' into PHP-7.2Stanislav Malyshev2019-08-241-3/+3
| |\ \ | | |/ | | | | | | | | | | | | * PHP-7.1: Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe() set version for release
| | * Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()Stanislav Malyshev2019-08-241-3/+3
| | | | | | | | | | | | Backport from https://github.com/kkos/oniguruma/commit/0f7f61ed1b7b697e283e37bd2d731d0bd57adb55
| | * set version for releasephp-7.1.31Joe Watkins2019-07-313-4/+4
| | |
* | | Fix #77812: Interactive mode does not support PHP 7.3-style heredocChristoph M. Becker2019-08-234-4/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | As of PHP 7.3.0, the rules regarding the heredoc and nowdoc closing identifier have been relaxed. While formerly, the closing identifier was required to be placed at the beginning of a line and to be immediately followed by (a semicolon and) a line break, it may now be preceeded by whitespace, and may be followed by any non-word character. We adjust the recognition logic respectively.
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-08-231-2/+7
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Suppress deprecation warning on IDNA2003 ICU methods for clang
| * | Suppress deprecation warning on IDNA2003 ICU methods for clangChristoph M. Becker2019-08-231-2/+7
| | |
View Lorry Controller Status