summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* NEWS entries for latest cherry picksphp-7.2.1PHP-7.2.1Sara Golemon2018-01-021-0/+7
|
* Fix bug #74782: remove file name from output to avoid XSSStanislav Malyshev2018-01-0214-48/+48
| | | | (cherry picked from commit 73ca9b37731dd9690ffd9706333b17eaf90ea091)
* Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtxChristoph M. Becker2018-01-023-5/+20
| | | | | | | | | Due to a signedness confusion in `GetCode_` a corrupt GIF file can trigger an infinite loop. Furthermore we make sure that a GIF without any palette entries is treated as invalid *after* open palette entries have been removed. (cherry picked from commit 8d6e9588671136837533fe3785657c31c5b52767)
* Prepare NEWS for 7.2.1 finalSara Golemon2018-01-021-6/+2
|
* Fixed bug #75579 (Interned strings buffer overflow may cause crash)Dmitry Stogov2017-12-282-2/+34
|
* Update NEWS for 7.2.1Sara Golemon2017-12-121-0/+3
|
* Update NEWS for PHP 7.2.1RC1Sara Golemon2017-12-121-1/+1
|
* Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-12-110-0/+0
|\ | | | | | | | | * PHP-7.1: Sync known vc++ versions in 7.1
| * Sync known vc++ versions in 7.1Anatol Belski2017-12-111-0/+4
| |
* | Add vc++ 19.12 to the known listAnatol Belski2017-12-111-0/+2
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2017-12-091-1/+1
|\ \ | |/
| * ext/imap/config.m4: fix ac_cv_u8t_decompose checkMichael Heimpold2017-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Once upon the time, commit c58f63a38ae19caaab339c61486fc3bd7e5894f9 changed the check from U8T_CANONICAL to U8T_DECOMPOSE. However, the autoconf cache id was not renamed. Sometimes it is desirable to preseed the autoconf variables, e.g. when cross-compiling to avoid the tests running on the host system. In this case it's confusing when the cache id does not match the variable to set, so let's adjust it. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-12-061-1/+3
|\ \ | |/ | | | | | | * PHP-7.1: Fix yet one data race in PCRE
| * Fix yet one data race in PCREAnatol Belski2017-12-061-1/+3
| | | | | | | | | | | | | | | | PCRE 8.x initializes the pattern compiler on demand during the first pcre_study call. It could be worse, but since the compiled patterns are cached, the locking impact is minimal. PCRE 10.x always compiles the pattern and thread sanitizer doesn't complain about the compiler initialization, thus the newer PCRE version seems to be unafected.
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-12-051-1/+1
|\ \ | |/ | | | | | | * PHP-7.1: Fix use after free revealed by phpdbg
| * Fix use after free revealed by phpdbgAnatol Belski2017-12-051-1/+1
| |
* | Fixed bug #75601 Thread race in PCRE JIT supportAnatol Belski2017-12-051-0/+18
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-12-050-0/+0
|\ \ | |/ | | | | | | | | * PHP-7.1: Fixed bug #75601 Thread race in PCRE JIT support bump versions
| * Fixed bug #75601 Thread race in PCRE JIT supportAnatol Belski2017-12-051-0/+18
| |
| * bump versionskrakjoe2017-12-053-5/+9
| |
* | [ci skip] update NEWSAnatol Belski2017-12-051-0/+2
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-12-050-0/+0
|\ \ | |/ | | | | | | * PHP-7.1: [ci skip] update NEWS
| * [ci skip] update NEWSAnatol Belski2017-12-051-0/+2
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-12-050-0/+0
|\ \ | |/ | | | | | | * PHP-7.1: 7.0.28 is next
| * Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-12-050-0/+0
| |\ | | | | | | | | | | | | * PHP-7.0: 7.0.28 is next
| | * 7.0.28 is nextAnatol Belski2017-12-053-5/+9
| | |
* | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-12-050-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: [ci skip] update NEWS
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-12-050-0/+0
| |\ \ | | |/ | | | | | | | | | * PHP-7.0: [ci skip] update NEWS
| | * [ci skip] update NEWSAnatol Belski2017-12-051-0/+1
| | |
* | | Merge branch 'PHP-7.1' into PHP-7.2Dmitry Stogov2017-12-043-2/+37
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Fixed bug #75608 ("Narrowing occurred during type inference" error)
| * | Fixed bug #75608 ("Narrowing occurred during type inference" error)Dmitry Stogov2017-12-043-2/+37
| | |
* | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-12-040-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Use dtor unconditionally in error case
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-12-040-0/+0
| |\ \ | | |/ | | | | | | | | | * PHP-7.0: Use dtor unconditionally in error case
| | * Use dtor unconditionally in error caseAnatol Belski2017-12-041-1/+1
| | |
* | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-12-040-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-12-040-0/+0
| |\ \ | | |/ | | | | | | | | | * PHP-7.0: Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
| | * Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)Xinchen Hui2017-12-042-1/+65
| | | | | | | | | | | | (cherry picked from commit 3b9ba7b6bd9e24bdbeca8e8e3f24cee2fccc51d8)
* | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-12-031-0/+11
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Fix compat with libcurl 7.56.1+ and file:// wrapper
| * | Fix compat with libcurl 7.56.1+ and file:// wrapperAnatol Belski2017-12-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since 7.52.x libcurl file:// scheme was implemented in a way described in https://tools.ietf.org/html/draft-ietf-appsawg-file-scheme-16 . The draft is still not accepted and the change contained a BC breach with win32 path handling. It was reported upstream and 7.52.x fixed it, but the BC breaching behavior was reintroduced in 7.56.1. Thus, it is better to handle this on the PHP side.
* | | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2017-12-020-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-12-021-2/+2
| |\ \ | | |/
| | * Fix ZEND_SIGNED_MULTIPLY_LONG for AArch64Andy Postnikov2017-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Register operands are required in this context. This is a backport of 8c8679207ae5ada8751288e75b78c928a4d34d1d to PHP 7.0+. The current code caused incorrect behavior on AArch64 when compiling with clang.
* | | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-12-011-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Consider Xdebug for tmi ini generation, too
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-12-011-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.0: Consider Xdebug for tmi ini generation, too
| | * Consider Xdebug for tmi ini generation, tooAnatol Belski2017-12-011-1/+1
| | |
* | | Merge branch 'PHP-7.1' into PHP-7.2Dmitry Stogov2017-12-011-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Set trailing zero
| * | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2017-12-011-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.0: Set trailing zero
| | * Set trailing zeroDmitry Stogov2017-12-011-1/+1
| | |
* | | Revert "Fix macro redefinition warnings"Anatol Belski2017-11-302-5/+0
| | | | | | | | | | | | This reverts commit 23d2bd374838897ec97f9994e70856686a89f132.
* | | Fix macro redefinition warningsAnatol Belski2017-11-302-0/+5
| | | | | | | | | | | | The corresponding implementations are available from APR.