summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"php-7.1.2RC1PHP-7.1.2Joe Watkins2017-02-013-35/+29
| | | | This reverts commit 2fcf1259c6a9c1d70bcdfb96aeabc54c47e2a4a0.
* Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)"Joe Watkins2017-02-012-36/+0
| | | | This reverts commit 62938bf08806129b42b17e74d79a450c30d4ff30.
* Revert "Inheritance checks should not ignore parents if these implement an ↵Joe Watkins2017-02-015-43/+6
| | | | | | interface" This reverts commit b67eb3440bb244adf6957bf2c68aeeaa6efc8c8d.
* Revert "Added tests demonstrating the same effect with abstracts"Joe Watkins2017-02-014-42/+2
| | | | This reverts commit c11b2b809d349399c8f4b54c6bf24078dece455e.
* fix test for 32bits (int -> float)Remi Collet2017-02-011-2/+2
|
* prepare 7.1.2RC1Joe Watkins2017-01-313-4/+4
|
* Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-311-1/+1
|\ | | | | | | | | * PHP-7.0: removed additional ";" from run-tests.php
| * removed additional ";" from run-tests.phpRodrigo Prado2017-01-311-1/+1
| |
* | update NEWSAnatol Belski2017-01-301-0/+4
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-300-0/+0
|\ \ | |/ | | | | | | * PHP-7.0: update NEWS
| * update NEWSAnatol Belski2017-01-301-0/+4
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Sara Golemon2017-01-301-1/+1
|\ \ | |/ | | | | | | * PHP-7.0: Securely zero the hash context key
| * Securely zero the hash context keySara Golemon2017-01-301-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-301-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 + opcacheAnatol Belski2017-01-301-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.1Joe Watkins2017-01-302-0/+36
|\ \ | |/ | | | | | | * PHP-7.0: fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
| * Merge branch 'pull-request/2348' into PHP-7.0Joe Watkins2017-01-302-0/+36
| |\ | | | | | | | | | | | | * pull-request/2348: fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
| | * fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)jhdxr2017-01-302-0/+36
| |/
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-301-5/+3
|\ \ | |/ | | | | | | * PHP-7.0: move id initialization into ctor
| * move id initialization into ctorAnatol Belski2017-01-301-5/+3
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-301-0/+7
|\ \ | |/ | | | | | | * PHP-7.0: fix system id initialization for multiple threads
| * fix system id initialization for multiple threadsAnatol Belski2017-01-301-0/+7
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-01-291-4/+10
|\ \ | |/
| * Try fpm path for testing in sbin as it is default targetJakub Zelenka2017-01-291-4/+10
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-283-29/+35
|\ \ | |/ | | | | | | * PHP-7.0: fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)
| * fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)jhdxr2017-01-283-29/+35
| |
* | [ci skip] news entry for Fixed bug #73987Joe Watkins2017-01-281-0/+2
| |
* | Added tests demonstrating the same effect with abstractsPedro Magalhães2017-01-284-2/+42
| |
* | Inheritance checks should not ignore parents if these implement an interfacePedro Magalhães2017-01-284-6/+41
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-261-1/+1
|\ \ | |/ | | | | | | * PHP-7.0: Fix 00version.phpt when commit message has multiple lines.
| * Fix 00version.phpt when commit message has multiple lines.Mitch Hagstrand2017-01-261-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.1Joe Watkins2017-01-264-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 ↵andrewnester2017-01-264-12/+14
| | | | | | | | --enable-debug
* | Fixed bug #73994 incorrect arginfo for unpackJoe Watkins2017-01-262-1/+2
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-261-0/+4
|\ \ | |/ | | | | | | * PHP-7.0: [ci skip] news entry for PR #2337
| * [ci skip] news entry for PR #2337Joe Watkins2017-01-261-0/+4
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-252-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 Boks2017-01-251-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 #54382Arnout Boks2017-01-251-0/+27
| |
* | Fix bug #73978 (openssl_decrypt triggers bug in PDO)Jakub Zelenka2017-01-252-3/+8
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2017-01-251-1/+1
|\ \ | |/
| * Fix copying too much leading to potential segfaultBob Weinand2017-01-251-1/+1
| |
* | dirname() should not normalize pathsAnatol Belski2017-01-243-3/+31
| | | | | | | | This is the BC piece with the case where dirname() is used with an URL.
* | make length check more robustAnatol Belski2017-01-241-4/+6
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-232-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 syslogMichael Wallner2017-01-232-0/+8
| |
* | use correct shift and fix slowlog bt in 7.1Antony Dovgal2017-01-231-2/+2
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-231-1/+2
|\ \ | |/ | | | | | | * PHP-7.0: move decl to correct place
| * move decl to correct placeJoe Watkins2017-01-231-1/+2
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-224-6/+44
|\ \ | |/ | | | | | | * PHP-7.0: Fixed #73969 - Fixed segmentation fault when debug_print_backtrace called