summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Fixed bug #70470Bouke van der Bijl2017-09-054-28/+123
| | |
| * | Add test for bug #75155Nikita Popov2017-09-042-0/+26
| | |
| * | Revert "Fixed #74977 - Appending AppendIterator leads to segfault"Nikita Popov2017-09-042-19/+1
| | | | | | | | | | | | This reverts commit dbc2ffba822d13e74e37f5ba6e106f163c1008e8.
* | | Fixed bug #75152 (signed integer overflow in parse_iv)Xinchen Hui2017-09-116-67/+58
|/ /
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-09-021-1/+1
|\ \ | |/ | | | | | | * PHP-7.0: Fix command
| * Fix commandAnatol Belski2017-09-021-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2017-09-022-2/+3
|\ \ | |/ | | | | | | * PHP-7.0: Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?)
| * Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?)Christoph M. Becker2017-09-022-2/+3
| | | | | | | | | | | | | | | | We back-port https://github.com/libgd/libgd/commit/dd48286 even though we cannot come up with a regression test, because the erroneous condition appears to be impossible to trigger. We also parenthesize the inner ternary operation to avoid confusion.
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-311-0/+14
|\ \ | |/ | | | | | | * PHP-7.0: Make for exclusion per regex
| * Make for exclusion per regexAnatol Belski2017-08-311-0/+14
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-311-2/+5
|\ \ | |/ | | | | | | * PHP-7.0: Extend ignore list for DLLs to not to look after
| * Extend ignore list for DLLs to not to look afterAnatol Belski2017-08-311-2/+5
| | | | | | | | fix typo
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-311-3/+3
|\ \ | |/ | | | | | | * PHP-7.0: Fix `nmake install` fails when there are no shared extensions
| * Fix `nmake install` fails when there are no shared extensionsDylan K. Taylor2017-08-311-3/+3
| | | | | | | | | | | | check for existence instead of muting everything check for exe existence before trying to copy
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-311-1/+2
|\ \ | |/ | | | | | | * PHP-7.0: Copy dependencies of the core DLL in `nmake snap` for statically-compiled extensions when packaging builds
| * Copy dependencies of the core DLL in `nmake snap` for statically-compiled ↵Dylan K. Taylor2017-08-311-1/+2
| | | | | | | | extensions when packaging builds
* | Merge branch 'PHP-7.0' into PHP-7.1Remi Collet2017-08-311-1/+1
|\ \ | |/ | | | | | | * PHP-7.0: move AC_DEFINE in the right position (in bundled lib conditon)
| * move AC_DEFINE in the right position (in bundled lib conditon)Remi Collet2017-08-311-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-281-1/+1
|\ \ | |/ | | | | | | * PHP-7.0: Move to next bin SDK version for AppVeyor
| * Move to next bin SDK version for AppVeyorAnatol Belski2017-08-281-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2017-08-274-0/+41
|\ \ | |/ | | | | | | * PHP-7.0: Fixed bug #75124 (gdImageGrayScale() may produce colors)
| * Fixed bug #75124 (gdImageGrayScale() may produce colors)Christoph M. Becker2017-08-274-0/+41
| | | | | | | | | | | | | | We have to make sure to avoid alpha-blending issues by explicitly switching to `gdEffectReplace` and to restore the old value afterwards. This is a port of <https://github.com/libgd/libgd/commit/a7a7ece>.
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-08-253-11/+37
|\ \ | |/
| * Fixed bug #75090Thomas Punt2017-08-253-11/+37
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-251-1/+1
|\ \ | |/ | | | | | | * PHP-7.0: update libs versions
| * update libs versionsAnatol Belski2017-08-251-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Remi Collet2017-08-241-8/+8
|\ \ | |/ | | | | | | * PHP-7.0: From documentation, only the sign of returned value is relevant
| * From documentation, only the sign of returned value is relevantRemi Collet2017-08-241-8/+8
| | | | | | | | With recent glibc, memcmp sometime return a negative value instead of -1
* | Update NEWSTianfang Yang2017-08-221-0/+4
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Tianfang Yang2017-08-221-5/+46
|\ \ | |/ | | | | | | * PHP-7.0: Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
| * Merge branch 'pull-request/2534' into PHP-7.0Tianfang Yang2017-08-222-5/+50
| |\ | | | | | | | | | | | | * pull-request/2534: Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
| | * Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before ↵Ingmar Runge2017-08-222-5/+50
| |/ | | | | | | PHP-FPM sets it up)
* | Merge branch 'PHP-7.0' into PHP-7.1Andrea Faulds2017-08-192-2/+4
|\ \ | |/
| * Fixed bug #75097 (gethostname fails if your host name is 64 chars long)Andrea Faulds2017-08-192-2/+4
| | | | | | | | | | | | | | | | PHP contained two different off-by-one errors, which are fixed here. First, it created a buffer of size HOST_NAME_MAX, not adding space for a null terminator. Second, it subtracted 1 from the size of that buffer when passing its size to gethostname(), despite gethostname() expecting it to be a buffer size including space for a terminating null byte, not a string length.
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-190-0/+0
|\ \ | |/ | | | | | | * PHP-7.0: [ci skip] update NEWS
| * [ci skip] update NEWSAnatol Belski2017-08-191-0/+3
| |
* | [ci skip] update NEWSAnatol Belski2017-08-191-0/+3
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-194-4/+48
|\ \ | |/ | | | | | | * PHP-7.0: Fix issues with phpt and EXTENSION on windows (BUG 75042)
| * Fix issues with phpt and EXTENSION on windows (BUG 75042)John Boehr2017-08-194-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Commands are not properly escaped for windows * Specifying "-n" to check loaded modules causes "Module already loaded" warning * Extensions to be loaded need the "php_" prefix on Windows Bug: https://bugs.php.net/bug.php?id=75042 Add back -n flag to fetch loaded extensions in run-tests.php Add test for phpt EXTENSIONS directive Add a second test for bug 75042 Add test to test loading of nonexistent shared module with the EXTENSIONS phpt block Pass ini settings when checking loaded extensions Fix skipifs
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-191-1/+7
|\ \ | |/ | | | | | | * PHP-7.0: Fix .pgd name for ts build
| * Fix .pgd name for ts buildAnatol Belski2017-08-191-1/+7
| |
* | NEWSRemi Collet2017-08-181-0/+2
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Remi Collet2017-08-181-0/+3
|\ \ | |/ | | | | | | | | * PHP-7.0: NEWS Fixed bug #75093 OpenSSL support not detected
| * NEWSRemi Collet2017-08-181-0/+2
| |
| * Fixed bug #75093 OpenSSL support not detectedRemi Collet2017-08-181-0/+3
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-181-2/+7
|\ \ | |/ | | | | | | * PHP-7.0: Fix phpize exit status
| * Fix phpize exit statusAnatol Belski2017-08-181-2/+7
| | | | | | | | | | Configure and others are generated, not copied. Seems there's yet much more to do wrt exit status catching.
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-08-181-0/+5
|\ \ | |/ | | | | | | * PHP-7.0: Add dump env target
| * Add dump env targetAnatol Belski2017-08-181-0/+5
| |
* | Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1Joe Watkins2017-08-1619-9541/+12095
|\ \ | | | | | | | | | | | | * 'PHP-7.1' of git.php.net:/php-src: Do the revert properly, and put back fraction support in 7.1