summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.1'Sara Golemon2017-01-301-1/+1
|\
| * Merge branch 'PHP-7.0' into PHP-7.1Sara Golemon2017-01-301-1/+1
| |\
| | * Securely zero the hash context keySara Golemon2017-01-301-1/+1
* | | Merge branch 'PHP-7.1'Anatol Belski2017-01-301-2/+14
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-301-2/+14
| |\ \ | | |/
| | * Fixed bug #73983 crash on finish work with phar in cli + opcacheAnatol Belski2017-01-301-2/+14
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-302-0/+36
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-302-0/+36
| |\ \ | | |/
| | * Merge branch 'pull-request/2348' into PHP-7.0Joe Watkins2017-01-302-0/+36
| | |\
| | | * fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)jhdxr2017-01-302-0/+36
| | |/
* | | Merge branch 'PHP-7.1'Anatol Belski2017-01-301-5/+3
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-301-5/+3
| |\ \ | | |/
| | * move id initialization into ctorAnatol Belski2017-01-301-5/+3
* | | Merge branch 'PHP-7.1'Anatol Belski2017-01-301-0/+7
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-301-0/+7
| |\ \ | | |/
| | * fix system id initialization for multiple threadsAnatol Belski2017-01-301-0/+7
* | | Merge branch 'PHP-7.1'Jakub Zelenka2017-01-291-4/+10
|\ \ \ | |/ /
| * | 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 'pull-request/2345'Joe Watkins2017-01-299-0/+153
|\ \ \
| * | | FTP: implement MLSD for structured listing of directories, decribed at https:...Andreas Treichel2017-01-298-0/+150
|/ / /
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-283-29/+35
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-283-29/+35
| |\ \ | | |/
| | * 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
* | | [ci skip] news entry for Fixed bug #73987Joe Watkins2017-01-281-0/+2
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-286-6/+81
|\ \ \ | |/ /
| * | 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
* | | NEWSAdam Baratz2017-01-271-0/+3
* | | Add test coverage for bug #72969Adam Baratz2017-01-277-0/+571
* | | Expose DB-Library version as \PDO::DBLIB_ATTR_VERSION attribute on \PDO instanceAdam Baratz2017-01-274-0/+23
* | | style cleanupAdam Baratz2017-01-271-8/+11
* | | Merge branch 'pull-request/1635'Joe Watkins2017-01-2717-22/+24
|\ \ \
| * | | Use modern autotools name of configure.ac instead of configure.inBrian Evans2017-01-2717-22/+24
|/ / /
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-261-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-261-1/+1
| |\ \ | | |/
| | * Fix 00version.phpt when commit message has multiple lines.Mitch Hagstrand2017-01-261-1/+1
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-264-12/+14
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-264-12/+14
| |\ \ | | |/
| | * Fixed #73973 - debug_zval_dump() assertion error for resource consts with --e...andrewnester2017-01-264-12/+14
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-262-1/+2
|\ \ \ | |/ /
| * | Fixed bug #73994 incorrect arginfo for unpackJoe Watkins2017-01-262-1/+2
* | | [ci skip] add upgrading note about PHP_OS_FAMILYJoe Watkins2017-01-261-0/+1
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-261-0/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-261-0/+4
| |\ \ | | |/
| | * [ci skip] news entry for PR #2337Joe Watkins2017-01-261-0/+4
* | | Merge branch 'PHP-7.1'Joe Watkins2017-01-252-4/+55
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-252-4/+55
| |\ \ | | |/
| | * Fix bug #54382 (getAttributeNodeNS doesn't get xmlns* attributes)Arnout Boks2017-01-251-4/+28