summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4Lars Strojny2012-08-2123-260/+73
|\ \
| * \ Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-08-2119-238/+0
| |\ \ | | |/
| | * Move test files to tests dirReeze Xia2012-08-2119-238/+0
| * | Implemented FR #62840 (Add sort flag to ArrayObject::ksort)Xinchen Hui2012-08-214-22/+73
* | | Bug 62462: adjusting testLars Strojny2012-08-211-0/+0
|/ /
* | Bug 62462: Prevent multibyte characters from being split between the linesLars Strojny2012-08-202-2/+22
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-08-201-0/+1
|\ \ | |/
| * skip test for bug 43130 on firebird , not relevantPopa Adrian Marius2012-08-201-0/+1
* | Fix for #62844Stanislav Malyshev2012-08-191-0/+1
* | relative-schemeAndrew Faulds2012-08-191-1/+1
* | bug #62844; relative URL schemes in parse_url()Andrew Faulds2012-08-192-0/+13
* | update NEWSStanislav Malyshev2012-08-191-1/+12
* | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-08-191-2/+0
|\ \ | |/
| * - Value stored to var is never usedFelipe Pena2012-08-191-2/+0
* | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-08-191-4/+4
|\ \ | |/
| * - Value stored to var is never usedFelipe Pena2012-08-191-4/+4
* | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-08-191-1/+0
|\ \ | |/
| * - Value stored to var is never usedFelipe Pena2012-08-191-1/+0
* | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-08-191-1/+0
|\ \ | |/
| * - Value stored to var is never usedFelipe Pena2012-08-191-1/+0
* | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-08-191-2/+0
|\ \ | |/
| * - Value stored to var is never usedFelipe Pena2012-08-191-2/+0
* | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-08-191-2/+2
|\ \ | |/
| * - Value stored to var is never readFelipe Pena2012-08-191-2/+2
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-08-192-4/+27
|\ \ | |/
| * Update NEWSXinchen Hui2012-08-191-0/+2
| * Fixed bug #62852 (Unserialize invalid DateTime causes crash)Reeze Xia2012-08-192-4/+27
* | Fix test failedXinchen Hui2012-08-181-2/+2
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-08-1719-0/+598
|\ \ | |/
| * More intl tests extracted from symfonyMatt Ficken2012-08-1719-0/+598
* | Update version numbers to 5.4.7-dev.Adam Harvey2012-08-172-4/+4
* | Fixed bug #62836 (Seg fault or broken object references on unserialize())Xinchen Hui2012-08-174-0/+81
* | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-08-162-2/+20
|\ \ | |/
| * Fixed bug #62839Pierrick Charron2012-08-163-2/+21
* | - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not ...Felipe Pena2012-08-161-1/+4
* | Merge commit '8649e42' into PHP-5.4Antony Dovgal2012-08-161-2/+1
|\ \ | |/
| * Fixed bug #62838Antony Dovgal2012-08-162-2/+5
* | Merge branch 'PHP-5.3' into PHP-5.4Christopher Jones2012-08-143-3/+3
|\ \ | |/
| * Merge branch 'skipif1' into PHP-5.3Christopher Jones2012-08-143-3/+3
| |\
| | * Fix skipifsChristopher Jones2012-08-143-3/+3
| |/
* | Merge branch 'PHP-5.3' into PHP-5.4Christopher Jones2012-08-142-25/+29
|\ \ | |/
| * Small test tidy upChristopher Jones2012-08-142-25/+29
* | better fix & this test pass nowXinchen Hui2012-08-152-5/+2
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-08-150-0/+0
|\ \ | |/
| * Merge fix e7535e06e63104ccc0c90c4425b6c2541aa3c939 to 5.3Xinchen Hui2012-08-151-0/+1
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-08-150-0/+0
|\ \ | |/
| * Fixed bug (segfault due to retval is not initialized)Xinchen Hui2012-08-152-1/+4
* | update NEWSXinchen Hui2012-08-151-0/+1
* | Attempt to fix segfault due to retval is not initializedXinchen Hui2012-08-151-1/+1
* | improve the fixXinchen Hui2012-08-151-2/+2