summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prepare PHP 7.3.11php-7.3.11PHP-7.3.11Christoph M. Becker2019-10-224-5/+5
|
* Fix #78633: Heap buffer overflow (read) in mb_eregiChristoph M. Becker2019-10-224-1/+16
| | | | | | We backport kkos/oniguruma@15c4228aa2ffa02140a99912dd3177df0b1841c6. (cherry picked from commit 4f50d58caba8286b5c533f6925b2ec320dd0742e)
* Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)Jakub Zelenka2019-10-224-4/+74
| | | | (cherry picked from commit ab061f95ca966731b1c84cf5b7b20155c0a1c06a)
* Prepare 7.3.11RC1php-7.3.11RC1Christoph M. Becker2019-10-084-5/+5
|
* Merge branch 'PHP-7.2' into PHP-7.3Remi Collet2019-10-080-0/+0
|\ | | | | | | | | * PHP-7.2: next is 7.2.25
| * next is 7.2.25Remi Collet2019-10-083-5/+8
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-083-2/+37
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78641: addGlob can modify given remove_path value
| * Fix #78641: addGlob can modify given remove_path valueChristoph M. Becker2019-10-083-2/+37
| | | | | | | | | | | | | | `remove_path` points to the given string, so we must not modify it. Instead we use a duplicate, if we need the modification. We may want to switch to `zend_string`s in master.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-10-072-3/+25
|\ \ | |/
| * Check for object_init_ex() failure in user filter factoryNikita Popov2019-10-072-3/+25
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-10-071-0/+1
|\ \ | |/
| * Set session.gc_probability=0 in bug78624.phptNikita Popov2019-10-071-0/+1
| | | | | | | | | | We only want to test manually triggered session GC. Avoid spurious output due to automatic GC.
* | Backport fix for uaf during pcre jit fallbackNikita Popov2019-10-071-5/+5
| | | | | | | | | | Backports parts of https://vcs.pcre.org/pcre2?view=revision&revision=1175 fixing https://bugs.exim.org/show_bug.cgi?id=2453.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-075-2/+12
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78623: Regression caused by "SP call yields additional empty result set"
| * Fix #78623: Regression caused by "SP call yields additional empty result set"Christoph M. Becker2019-10-075-2/+12
| | | | | | | | This reverts commit 41a4379cb45419a376043ca5f8c5a2bca82cea7c.
* | Make sure T_ERROR is returned for all lexer exceptionsNikita Popov2019-10-043-119/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This originally manifested as a leak in oss-fuzz #18000. The following is a reduced test case: <?php [ 5 => 1, "foo" > 1, " " => "" == 0 ]; <<<BAR $x BAR; Because this particular error condition did not return T_ERROR, EG(exception) was set while performing binary operation constant evaluation, which checks exceptions for cast failures. Instead of adding this indirect test case, I'm adding an assertion that the lexer has to return T_ERROR if EG(exception) is set.
* | Improve diagnostic on PCRE JIT mmap failureNikita Popov2019-10-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | Print a more informative message that indicates that this is likely a permission issue, and also indicate that pcre.jit=0 can be used to work around it. Also automatically disable the JIT, so that this message is only shown once. See bug #78630.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-044-0/+1559
|\ \ | |/ | | | | | | * PHP-7.2: Split intl tests for ICU 65
| * Split intl tests for ICU 65Christoph M. Becker2019-10-044-0/+1559
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-044-2/+28
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78620: Out of memory error
| * Fix #78620: Out of memory errorChristoph M. Becker2019-10-044-2/+28
| | | | | | | | | | The integer addition in `ZEND_MM_ALIGNED_SIZE_EX` can overflow, what we have to catch early.
* | Merge branch 'PHP-7.2' into PHP-7.3Joe Watkins2019-10-044-7/+85
|\ \ | |/ | | | | | | * PHP-7.2: fix #78624: session_gc return value for user defined session handlers
| * fix #78624: session_gc return value for user defined session handlersBrent Shaffer2019-10-044-7/+85
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Joe Watkins2019-10-032-4/+57
|\ \ | |/ | | | | | | * PHP-7.2: Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
| * Fix bug #76809 (SSL settings aren't respected when persistent connection is ↵Fábio Souto2019-10-032-4/+57
| | | | | | | | reused)
* | Merge branch 'PHP-7.2' into PHP-7.3Joe Watkins2019-10-035-6/+38
|\ \ | |/ | | | | | | * PHP-7.2: Fix #76859 stream_get_line skips data if used with data-generating filter
| * Fix #76859 stream_get_line skips data if used with data-generating filterKonstantin Kopachev2019-10-035-6/+38
| | | | | | | | | | | | | | | | | | stream_get-line repeatedly calls php_stream_fill_read_buffer until enough data is accumulated in buffer. However, when stream contains filters attached to it, then each call to fill buffer essentially resets buffer read/write pointers and new data is written over old. This causes stream_get_line to skip parts of data from stream This patch fixes such behavior, so fill buffer call will append.
* | Updated to version 2019.3 (2019c)Derick Rethans2019-10-021-1/+1
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-022-6/+0
|\ \ | |/ | | | | | | * PHP-7.2: Revert "Fix #78620: Out of memory error"
| * Revert "Fix #78620: Out of memory error"Christoph M. Becker2019-10-022-6/+0
| | | | | | | | | | | | This reverts commit 8ce04df7e0108a10f7b782a28204e9384ab1129c. Cf. <https://github.com/php/php-src/pull/4766#discussion_r330658679>.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-022-0/+6
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78620: Out of memory error
| * Fix #78620: Out of memory errorChristoph M. Becker2019-10-022-0/+6
| | | | | | | | | | If the integer addition in `ZEND_MM_ALIGNED_SIZE_EX` overflows, the macro evaluates to `0`, what we should catch early.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-10-022-0/+11
|\ \ | |/
| * Fix segfault with __COMPILER_HALT_OFFSET__ and trailing {}Nikita Popov2019-10-022-0/+11
| | | | | | | | Fixes OSS-Fuzz #17895.
* | Merge branch 'PHP-7.2' into PHP-7.3Dmitry Stogov2019-10-021-2/+2
|\ \ | |/ | | | | | | * PHP-7.2: Fixed test that "fails" from time to time
| * Fixed test that "fails" from time to timeDmitry Stogov2019-10-021-1/+1
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Dmitry Stogov2019-10-021-1/+1
|\ \ | |/ | | | | | | * PHP-7.2: Fixed test that "fails" from time to time
| * Fixed test that "fails" from time to timeDmitry Stogov2019-10-021-1/+1
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-016-6/+6
|\ \ | |/ | | | | | | * PHP-7.2: Add missing skip keyword in tests
| * Add missing skip keyword in testsFabien Villepinte2019-10-016-6/+6
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-09-303-0/+21
|\ \ | |/
| * Fixed bug #78612Nikita Popov2019-09-303-0/+21
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-303-20/+30
|\ \ | |/ | | | | | | * PHP-7.2: Fix #78609: mb_check_encoding() no longer supports stringable objects
| * Fix #78609: mb_check_encoding() no longer supports stringable objectsChristoph M. Becker2019-09-303-20/+30
| | | | | | | | We apply type juggling for other types than array.
* | Fix #78413: php-fpm request_terminate_timeout does not take effect after ↵Sergei Turchanov2019-09-308-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | fastcgi_finish_request To retain legacy behavior I decided to add an option to control request termination logic. If request_terminate_timeout_track_finished is set, then request will be tracked for time limits even after fastcgi_finish_request was called. This patch depends on the fix provided in BUG 78469 (otherwise php-fpm workers listening on named pipes on Windows will be erroneously terminated) (PR #4636)
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-291-0/+2
|\ \ | |/ | | | | | | * PHP-7.2: Fix build for libzip < 0.11.2
| * Fix build for libzip < 0.11.2Christoph M. Becker2019-09-291-0/+2
| | | | | | | | | | We must not define method entries, if the actual method definitions or the arginfo structures are not defined.
* | Don't throw warnings during heredoc scan-aheadNikita Popov2019-09-284-181/+207
| | | | | | | | Otherwise these warnings will turn up twice (or more...)
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-2711-20/+20
|\ \ | |/ | | | | | | * PHP-7.2: Fix SKIPIF in ext/mysqli
| * Fix SKIPIF in ext/mysqliFabien Villepinte2019-09-2711-20/+20
| |
View Lorry Controller Status