summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Fix failed test with recent glibcRemi Collet2013-11-131-2/+2
| |/ |/|
* | 5.5.7 nowJulien Pauli2013-11-123-5/+5
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-11-103-8/+146
|\ \ | |/
| * Update NEWS and remove the unnecessary UPGRADING note.Adam Harvey2013-11-102-10/+4
| * Merge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4Adam Harvey2013-11-103-8/+149
| |\
| | * UPGRADING and NEWSAndrea Faulds2013-10-152-0/+14
| | * Merge branch 'PHP-5.4' into JSONWhitespaceFixAndrea Faulds2013-10-1545-932/+1737
| | |\
| | * | 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-082-1/+17
* | | | Added tests for PHAR/OPCahce incompatibilitiesDmitry Stogov2013-11-083-0/+130
* | | | Update NEWSXinchen Hui2013-11-081-0/+2
* | | | 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-083-1/+22
* | | | Update NEWSXinchen Hui2013-11-081-0/+3
* | | | 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-083-1/+29
| * | | NEWS entryRasmus Lerdorf2013-11-071-0/+2
* | | | NEWS entryRasmus Lerdorf2013-11-071-0/+1
* | | | 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' of git.php.net:php-src into PHP-5.4Rasmus Lerdorf2013-11-07157-967/+1899
| |\ \ \
* | \ \ \ Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Rasmus Lerdorf2013-11-0796-718/+279
|\ \ \ \ \
| * \ \ \ \ 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-062-40/+5
| * | | | | Remove outdate codes, make it clearer, although just a bit..Xinchen Hui2013-11-056-546/+6
| * | | | | Update NEWSXinchen Hui2013-11-051-0/+4
| * | | | | 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-053-3/+40
| | * | | | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Xinchen Hui2013-11-0513-701/+741
| | |\ \ \ \
| | | * | | | Typo fix: umknown -> unknownLior Kaplan2013-10-311-2/+2
| | | * | | | Fix bug #66008Rasmus Lerdorf2013-10-311-0/+1
| | | * | | | 5.4.23-devStanislav Malyshev2013-10-293-4/+6
| | | * | | | 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-0421-919/+964
| |\ \ \ \ \ \ \
| * | | | | | | | 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-2715-8/+108
| | |\ \ \ \ \ \ \
| | * | | | | | | | remove "PHP 6" staffXinchen Hui2013-10-271-4/+0
* | | | | | | | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Rasmus Lerdorf2013-10-31157-1492/+5561
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Typo fix: umknown -> unknownMartin Hujer2013-10-311-1/+1
| * | | | | | | | | add news entry about FPM backlog changeAntony Dovgal2013-10-311-1/+4
| * | | | | | | | | Fix bug #66008Rasmus Lerdorf2013-10-311-0/+1
| * | | | | | | | | updated libs_versions.txtAnatol Belski2013-10-291-2/+1