summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-11-102-8/+139
|\
| * Merge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4Adam Harvey2013-11-102-8/+139
| |\
| | * Merge branch 'PHP-5.4' into JSONWhitespaceFixAndrea Faulds2013-10-1528-898/+1526
| | |\
| | * | Better test: Check combined leading/trailingAndrea Faulds2013-10-151-0/+66
| | * | Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case...Andrea Faulds2013-09-172-8/+73
* | | | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2013-11-091-3/+2
|\ \ \ \ | |/ / /
| * | | Fix broken testRasmus Lerdorf2013-11-091-3/+2
* | | | Fixed issue #115 (path issue when using phar).Dmitry Stogov2013-11-081-1/+14
* | | | Added tests for PHAR/OPCahce incompatibilitiesDmitry Stogov2013-11-083-0/+130
* | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-11-082-1/+18
|\ \ \ \ | |/ / /
| * | | Fixed bug #65947 (basename is no more working after fgetcsv in certain situat...Xinchen Hui2013-11-082-1/+18
* | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-11-082-1/+25
|\ \ \ \ | |/ / /
| * | | Fixed Bug #66043 (Segfault calling bind_param() on mysqli)Xinchen Hui2013-11-082-1/+25
* | | | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2013-11-073-20/+59
|\ \ \ \ | |/ / /
| * | | Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to stringsRasmus Lerdorf2013-11-073-21/+60
* | | | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2013-11-0684-124/+227
|\ \ \ \ | |/ / /
| * | | Add a couple more test cases to parse_url() testsSara Golemon2013-11-0610-10/+37
| * | | fix missing change from 'tcp_socket' to the more common 'server'ptarjan2013-11-061-3/+3
| * | | fix many parallel test issuesptarjan2013-11-0674-109/+185
| * | | Cleanup temp test fileChristopher Jones2013-11-061-0/+4
* | | | Revert "Fixed issue #115 (path issue when using phar)."Xinchen Hui2013-11-061-39/+5
* | | | Remove outdate codes, make it clearer, although just a bit..Xinchen Hui2013-11-056-546/+6
* | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-11-053-3/+35
|\ \ \ \ | |/ / /
| * | | Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws...Xinchen Hui2013-11-052-2/+35
| * | | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Xinchen Hui2013-11-058-689/+718
| |\ \ \
| | * | | Typo fix: umknown -> unknownLior Kaplan2013-10-311-2/+2
| | * | | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Yasuo Ohgaki2013-10-291-0/+27
| | |\ \ \
* | | \ \ \ Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Xinchen Hui2013-11-0411-704/+744
|\ \ \ \ \ \
| * | | | | | Typo fix: umknown -> unknownMartin Hujer2013-10-311-1/+1
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Yasuo Ohgaki2013-10-294-28/+28
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fixed Bug 64760 var_export() does not use full precision for floating-point n...Yasuo Ohgaki2013-10-294-28/+28
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-10-291-0/+27
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | add bundled libzip LICENSE, as required by BSD License termsRemi Collet2013-10-291-0/+27
| | |/ / / /
| * | | | | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2013-10-281-628/+628
| |\ \ \ \ \ | | |/ / / /
| | * | | | - Updated to version 2013.8 (2013h)Derick Rethans2013-10-281-628/+628
| | * | | | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Derick Rethans2013-10-281-1/+1
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Derick Rethans2013-10-284-17/+28
| |\ \ \ \ \ \
| | * | | | | | Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)Dmitry Stogov2013-10-282-3/+3
| | * | | | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-10-281-1/+1
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Yasuo Ohgaki2013-10-261-1/+1
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Fixed bug #65950 Field name truncation if the field name is bigger than 32 ch...Yasuo Ohgaki2013-10-261-1/+1
| | * | | | | | | Improved performance of array_merge() by eliminating useless copyingDmitry Stogov2013-10-281-13/+24
| | |/ / / / / /
| * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2013-10-231-589/+591
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| | * | | | | - Updated to version 2013.7 (2013g)Derick Rethans2013-10-231-589/+591
| | |/ / / /
* | | | | | Fixed coredump due to abnormal implemention of pharXinchen Hui2013-11-041-1/+2
* | | | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-10-271-4/+0
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Xinchen Hui2013-10-2714-7/+104
| |\ \ \ \ | | |/ / /
| * | | | remove "PHP 6" staffXinchen Hui2013-10-271-4/+0
* | | | | Added Zend Debugger to the note about the load order (by trash4you at online ...Xinchen Hui2013-10-231-2/+2
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Yasuo Ohgaki2013-10-221-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |