summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Test for #63336, xfail nowXinchen Hui2012-10-231-0/+24
| * | | | Fixed bug #63305 (zend_mm_heap corrupted with traits)Xinchen Hui2012-10-233-2/+48
* | | | | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4ULF WENDEL2012-10-2271-28550/+39856
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Christopher Jones2012-10-213-10/+32
| |\ \ \ \ | | |/ / /
| | * | | Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)Christopher Jones2012-10-213-10/+32
| * | | | update NEWSAnatoliy Belsky2012-10-191-0/+1
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-10-190-0/+0
| |\ \ \ \ | | |/ / /
| | * | | updated NEWSAnatoliy Belsky2012-10-191-0/+1
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-10-1959-28459/+39657
| |\ \ \ \ | | |/ / /
| | * | | Fixed bug #63284 PCRE upgrade to 8.31Anatoliy Belsky2012-10-1959-28459/+39657
| | | |/ | | |/|
| * | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-191-0/+23
| |\ \ \ | | |/ /
| | * | preg indenpent test script for #63055Xinchen Hui2012-10-191-0/+23
| * | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-190-0/+0
| |\ \ \ | | |/ /
| | * | Update libmagic.patchXinchen Hui2012-10-191-57/+102
| * | | Add fix & missing fixChristopher Jones2012-10-181-1/+8
| * | | Merge branch 'PHP-5.3' into PHP-5.4Christopher Jones2012-10-180-0/+0
| |\ \ \ | | |/ /
| | * | Add fix & missing fixChristopher Jones2012-10-181-0/+7
| * | | Merge branch 'PHP-5.3' into PHP-5.4Christopher Jones2012-10-184-3/+6
| |\ \ \ | | |/ /
| | * | Fixed bug #63307 (Unused variable in oci8.c)Christopher Jones2012-10-182-2/+3
| | * | Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-10-1824-110/+430
| | |\ \
| | * | | Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)Christopher Jones2012-10-183-2/+4
| | * | | Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-10-1066-0/+0
| | |\ \ \
| | * \ \ \ Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-10-091053-0/+0
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-10-0868-1/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-10-0821-683/+805
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-09-267-5/+79
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-09-194-0/+77
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-09-186-167/+222
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-09-171-0/+3
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-09-164-23/+33
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2012-10-1826-205/+476
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.3' into PHP-5.4Derick Rethans2012-10-181-79/+95
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | - Updated to version 2012.7 (2012g)Derick Rethans2012-10-181-79/+95
| | * | | | | | | | | | | | | Merge branch 'PHP-5.3' into PHP-5.4Derick Rethans2012-10-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | SUpport newer bisons.Derick Rethans2012-10-181-1/+1
| | * | | | | | | | | | | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge the fix for #61964 to 5.3, which will fix #63304Xinchen Hui2012-10-182-7/+89
| | * | | | | | | | | | | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | indentXinchen Hui2012-10-181-1/+1
| | * | | | | | | | | | | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-182-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | better fix for #63055Xinchen Hui2012-10-182-2/+3
| | * | | | | | | | | | | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-183-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)Xinchen Hui2012-10-183-2/+30
| | * | | | | | | | | | | | | I forgot that inconsistent is only avaliable in debug modeXinchen Hui2012-10-182-4/+1
| | * | | | | | | | | | | | | Add commentsXinchen Hui2012-10-181-3/+3
| | * | | | | | | | | | | | | Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)Xinchen Hui2012-10-183-1/+27
| | * | | | | | | | | | | | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-10-171-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | PHP 5.3.18 NEWSJohannes Schlüter2012-10-171-4/+1
| | | * | | | | | | | | | | | fix NEWSAndrey Hristov2012-10-171-6/+10
| | | * | | | | | | | | | | | Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3Andrey Hristov2012-10-171316-1153/+2199
| | | |\ \ \ \ \ \ \ \ \ \ \ \