summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* master renames phase 2Anatol Belski2014-08-2564-463/+461
* master renames phase 1Anatol Belski2014-08-25486-11616/+11534
* Merge branch 'PHP-5.6'Lior Kaplan2014-08-257-0/+252
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-08-257-0/+252
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-257-0/+252
| | |\
| | | * Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>Lior Kaplan2014-08-257-0/+252
* | | | bring back the logic to parse 64 bit props also in 32 bit buildAnatol Belski2014-08-241-1/+19
* | | | fix a phraseAnatol Belski2014-08-241-1/+1
* | | | Merge branch 'master' of git.php.net:php-srcAnatol Belski2014-08-241-5/+1
|\ \ \ \
| * \ \ \ Merge branch 'PHP-5.6'Ferenc Kovacs2014-08-241-5/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-08-241-3/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-08-241-3/+1
| | | |\ \ | | | | |/
| | | | * this test depends on the simplexml ext, not just on xmlFerenc Kovacs2014-08-241-3/+1
* | | | | note on %pd formatAnatol Belski2014-08-241-0/+4
* | | | | fixes to %pd format usageAnatol Belski2014-08-2453-114/+202
|/ / / /
* | | | Merge branch 'PHP-5.6'Tjerk Meesters2014-08-233-1/+45
|\ \ \ \ | |/ / /
| * | | Fixed #67694: Regression in session_regenerate_id()Tjerk Meesters2014-08-233-1/+45
* | | | Use %d instead of object idTjerk Meesters2014-08-231-2/+2
* | | | Fixed test case based on var_dump() changes made in c1965f58d4dd3970912dcd6a6...Tjerk Meesters2014-08-231-3/+6
* | | | fix wrong type causing build errorkrakjoe2014-08-221-1/+1
* | | | adedd note on portable numeric macrosAnatol Belski2014-08-221-1/+16
* | | | note on LFS macrosAnatol Belski2014-08-221-0/+10
* | | | updated UPGRADING so farAnatol Belski2014-08-221-2/+13
* | | | note on hash table and sprintfAnatol Belski2014-08-221-2/+17
* | | | note on zpp specsAnatol Belski2014-08-221-0/+5
* | | | updated UPGRADING.INTERNALS with new data typesAnatol Belski2014-08-221-0/+39
* | | | Merge remote-tracking branch 'weltling/master'POST_64BIT_BRANCH_MERGEAnatol Belski2014-08-22511-11534/+11763
|\ \ \ \
| * | | | fix zppAnatol Belski2014-08-211-2/+2
| * | | | fixed array_pad()Anatol Belski2014-08-211-3/+3
| * | | | fix zppAnatol Belski2014-08-211-1/+1
| * | | | fix zppAnatol Belski2014-08-211-1/+1
| * | | | fix zppAnatol Belski2014-08-211-2/+2
| * | | | fix zpp and a bit moreAnatol Belski2014-08-211-20/+20
| * | | | fix zppAnatol Belski2014-08-211-3/+3
| * | | | fix zppAnatol Belski2014-08-211-2/+2
| * | | | Merge remote-tracking branch 'php/master'Anatol Belski2014-08-211-1/+1
| |\ \ \ \
| * | | | | fix zppAnatol Belski2014-08-211-1/+1
| * | | | | fix zppAnatol Belski2014-08-211-1/+1
| * | | | | fix zppAnatol Belski2014-08-211-8/+8
| * | | | | fix zppAnatol Belski2014-08-211-1/+1
| * | | | | fix zppAnatol Belski2014-08-211-1/+1
| * | | | | fix zppAnatol Belski2014-08-211-2/+2
| * | | | | fix zppAnatol Belski2014-08-211-6/+6
| * | | | | fix zppAnatol Belski2014-08-212-2/+2
| * | | | | fix zppAnatol Belski2014-08-212-8/+8
| * | | | | fix zppAnatol Belski2014-08-211-3/+3
| * | | | | fix zppAnatol Belski2014-08-211-1/+1
| * | | | | Merge remote-tracking branch 'php/master'Anatol Belski2014-08-212-16/+25
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'php/master'Anatol Belski2014-08-2125-111/+107
| |\ \ \ \ \ \
| * | | | | | | fixed the testAnatol Belski2014-08-211-2/+2