Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"php-7.1.2RC1PHP-7.1.2 | Joe Watkins | 2017-02-01 | 3 | -35/+29 |
| | | | | This reverts commit 2fcf1259c6a9c1d70bcdfb96aeabc54c47e2a4a0. | ||||
* | Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)" | Joe Watkins | 2017-02-01 | 2 | -36/+0 |
| | | | | This reverts commit 62938bf08806129b42b17e74d79a450c30d4ff30. | ||||
* | Revert "Inheritance checks should not ignore parents if these implement an ↵ | Joe Watkins | 2017-02-01 | 5 | -43/+6 |
| | | | | | | interface" This reverts commit b67eb3440bb244adf6957bf2c68aeeaa6efc8c8d. | ||||
* | Revert "Added tests demonstrating the same effect with abstracts" | Joe Watkins | 2017-02-01 | 4 | -42/+2 |
| | | | | This reverts commit c11b2b809d349399c8f4b54c6bf24078dece455e. | ||||
* | fix test for 32bits (int -> float) | Remi Collet | 2017-02-01 | 1 | -2/+2 |
| | |||||
* | prepare 7.1.2RC1 | Joe Watkins | 2017-01-31 | 3 | -4/+4 |
| | |||||
* | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-31 | 1 | -1/+1 |
|\ | | | | | | | | | * PHP-7.0: removed additional ";" from run-tests.php | ||||
| * | removed additional ";" from run-tests.php | Rodrigo Prado | 2017-01-31 | 1 | -1/+1 |
| | | |||||
* | | update NEWS | Anatol Belski | 2017-01-30 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-30 | 0 | -0/+0 |
|\ \ | |/ | | | | | | | * PHP-7.0: update NEWS | ||||
| * | update NEWS | Anatol Belski | 2017-01-30 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Sara Golemon | 2017-01-30 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * PHP-7.0: Securely zero the hash context key | ||||
| * | Securely zero the hash context key | Sara Golemon | 2017-01-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-30 | 1 | -2/+14 |
|\ \ | |/ | | | | | | | * PHP-7.0: Fixed bug #73983 crash on finish work with phar in cli + opcache | ||||
| * | Fixed bug #73983 crash on finish work with phar in cli + opcache | Anatol Belski | 2017-01-30 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | The file_cache_only option causes the storage to be per process, furthermore the arena is destroyed per request. Thus, zend_string's can't survive between request and the permanent flag should not be set. This is already done with the file cache part, but the persistency part is used in various scenarios and should respect this case as well. In this particular bug, the pcre pattern cache needs to survive between requests and uses pattern strings as hash keys. One more case relevant here would be various situations where the flow disables the use of shared memory. | ||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-30 | 2 | -0/+36 |
|\ \ | |/ | | | | | | | * PHP-7.0: fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454) | ||||
| * | Merge branch 'pull-request/2348' into PHP-7.0 | Joe Watkins | 2017-01-30 | 2 | -0/+36 |
| |\ | | | | | | | | | | | | | * pull-request/2348: fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454) | ||||
| | * | fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454) | jhdxr | 2017-01-30 | 2 | -0/+36 |
| |/ | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-30 | 1 | -5/+3 |
|\ \ | |/ | | | | | | | * PHP-7.0: move id initialization into ctor | ||||
| * | move id initialization into ctor | Anatol Belski | 2017-01-30 | 1 | -5/+3 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-30 | 1 | -0/+7 |
|\ \ | |/ | | | | | | | * PHP-7.0: fix system id initialization for multiple threads | ||||
| * | fix system id initialization for multiple threads | Anatol Belski | 2017-01-30 | 1 | -0/+7 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2017-01-29 | 1 | -4/+10 |
|\ \ | |/ | |||||
| * | Try fpm path for testing in sbin as it is default target | Jakub Zelenka | 2017-01-29 | 1 | -4/+10 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-28 | 3 | -29/+35 |
|\ \ | |/ | | | | | | | * PHP-7.0: fixed bug #50989 (DOM support for LIBXML_NOXMLDECL) | ||||
| * | fixed bug #50989 (DOM support for LIBXML_NOXMLDECL) | jhdxr | 2017-01-28 | 3 | -29/+35 |
| | | |||||
* | | [ci skip] news entry for Fixed bug #73987 | Joe Watkins | 2017-01-28 | 1 | -0/+2 |
| | | |||||
* | | Added tests demonstrating the same effect with abstracts | Pedro Magalhães | 2017-01-28 | 4 | -2/+42 |
| | | |||||
* | | Inheritance checks should not ignore parents if these implement an interface | Pedro Magalhães | 2017-01-28 | 4 | -6/+41 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-26 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * PHP-7.0: Fix 00version.phpt when commit message has multiple lines. | ||||
| * | Fix 00version.phpt when commit message has multiple lines. | Mitch Hagstrand | 2017-01-26 | 1 | -1/+1 |
| | | | | | | | | | | | | The environment variable "TRAVIS_COMMIT_MESSAGE" can contain multiple lines. An example can be seen here https://travis-ci.org/php/php-src/jobs/195465293 | ||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-26 | 4 | -12/+14 |
|\ \ | |/ | | | | | | | * PHP-7.0: Fixed #73973 - debug_zval_dump() assertion error for resource consts with --enable-debug | ||||
| * | Fixed #73973 - debug_zval_dump() assertion error for resource consts with ↵ | andrewnester | 2017-01-26 | 4 | -12/+14 |
| | | | | | | | | --enable-debug | ||||
* | | Fixed bug #73994 incorrect arginfo for unpack | Joe Watkins | 2017-01-26 | 2 | -1/+2 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-26 | 1 | -0/+4 |
|\ \ | |/ | | | | | | | * PHP-7.0: [ci skip] news entry for PR #2337 | ||||
| * | [ci skip] news entry for PR #2337 | Joe Watkins | 2017-01-26 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-25 | 2 | -4/+55 |
|\ \ | |/ | | | | | | | | | * PHP-7.0: Fix bug #54382 (getAttributeNodeNS doesn't get xmlns* attributes) Added (failing) testcase for bug #54382 | ||||
| * | Fix bug #54382 (getAttributeNodeNS doesn't get xmlns* attributes) | Arnout Boks | 2017-01-25 | 1 | -4/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix is based on the same strategy for handling namespace declarations as used by getAttributeNode. Note that this strategy makes these methods not return a DOMAttr for xmlns* attributes, but an instance of the (undocumented) class DOMNameSpaceNode. This is not really ideal, but at least this fix makes the behavior of getAttributeNode and getAttributeNodeNS consistent. A follow-up action would be to investigate whether DOMNameSpaceNode can be made into a subclass of DOMAttr (which may be hard due to the way libxml treats namespace declarations) or document this deviating return value for xmlns* attributes. | ||||
| * | Added (failing) testcase for bug #54382 | Arnout Boks | 2017-01-25 | 1 | -0/+27 |
| | | |||||
* | | Fix bug #73978 (openssl_decrypt triggers bug in PDO) | Jakub Zelenka | 2017-01-25 | 2 | -3/+8 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Bob Weinand | 2017-01-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix copying too much leading to potential segfault | Bob Weinand | 2017-01-25 | 1 | -1/+1 |
| | | |||||
* | | dirname() should not normalize paths | Anatol Belski | 2017-01-24 | 3 | -3/+31 |
| | | | | | | | | This is the BC piece with the case where dirname() is used with an URL. | ||||
* | | make length check more robust | Anatol Belski | 2017-01-24 | 1 | -4/+6 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-23 | 2 | -0/+10 |
|\ \ | |/ | | | | | | | * PHP-7.0: Fix Bug #69865 php-fpm does not close stderr when using syslog | ||||
| * | Fix Bug #69865 php-fpm does not close stderr when using syslog | Michael Wallner | 2017-01-23 | 2 | -0/+8 |
| | | |||||
* | | use correct shift and fix slowlog bt in 7.1 | Antony Dovgal | 2017-01-23 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-23 | 1 | -1/+2 |
|\ \ | |/ | | | | | | | * PHP-7.0: move decl to correct place | ||||
| * | move decl to correct place | Joe Watkins | 2017-01-23 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-22 | 4 | -6/+44 |
|\ \ | |/ | | | | | | | * PHP-7.0: Fixed #73969 - Fixed segmentation fault when debug_print_backtrace called |