summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 5.4.5php-5.4.5PHP-5.4.5Stanislav Malyshev2012-07-173-6/+4
* Revert "Fix bug #62112: number_format() is not binary safe"Stanislav Malyshev2012-07-172-18/+2
* 5.4.5 RC1php-5.4.5RC1Stanislav Malyshev2012-07-033-3/+5
* fix (signed) integer overflow (part of bug #52550Nuno Lopes2012-07-021-1/+1
* Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot ...Xinchen Hui2012-07-023-1/+22
* Fix accidential change of php_version.hNikita Popov2012-07-011-1/+1
* Revert JSON merges to 5.4Nikita Popov2012-07-0117-233/+48
* Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-07-010-0/+0
|\
| * Revert JSON changes to PHP 5.3Nikita Popov2012-07-0112-195/+46
* | fix bug #61359: json_encode() calls too many reallocsStanislav Malyshev2012-06-302-9/+15
* | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2012-06-300-0/+0
|\ \ | |/
| * remove duplicates, fix orderStanislav Malyshev2012-06-301-14/+7
* | update NEWSStanislav Malyshev2012-06-301-30/+108
* | Fixed the common misspelling of the word occurred (occured -> occurred)Marc Easen2012-06-3034-73/+73
* | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-06-301-1/+3
|\ \ | |/
| * - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 fo...Felipe Pena2012-06-301-1/+3
* | mergeandrey2012-06-291-1/+1
* | Merge branch 'PHP-5.3' into PHP-5.4andrey2012-06-291-0/+7
|\ \ | |/
| * fix Bug #62273 Segmentation Fault in Mysqli/Mysqlndandrey2012-06-291-0/+7
* | Merge branch 'PHP-5.3' into PHP-5.4andrey2012-06-290-0/+0
|\ \ | |/
| * Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3andrey2012-06-2931-73/+95
| |\
* | \ Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4andrey2012-06-2911-46/+66
|\ \ \
| * \ \ Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-291-4/+4
| |\ \ \ | | | |/ | | |/|
| | * | Fix some lengths in crypt()Nikita Popov2012-06-291-6/+6
| * | | fix NEWS orderStanislav Malyshev2012-06-281-2/+2
| * | | Merge branch 'PHP-5.3' into PHP-5.4Anthony Ferrara2012-06-283-2/+13
| |\ \ \ | | |/ /
| | * | Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)Anthony Ferrara2012-06-283-2/+13
| * | | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-288-42/+51
| |\ \ \ | | |/ /
| | * | Add json_last_error_msg() functionNikita Popov2012-06-288-42/+51
| * | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-06-270-0/+0
| |\ \ \ | | |/ /
| | * | Fix #62432 ReflectionMethod random corrupt memory on high concurrentJohannes Schlüter2012-06-2721-25/+27
* | | | Merge branch 'PHP-5.3' into PHP-5.4andrey2012-06-291-19/+56
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | new charsetsandrey2012-06-291-19/+56
| |/
* | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-2712-59/+114
|\ \ | |/
| * Improve JSON error handlingNikita Popov2012-06-279-49/+95
* | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-06-271-0/+3
|\ \ | |/
| * Fix memleak in CLIJohannes Schlüter2012-06-271-0/+3
* | update NEWSStanislav Malyshev2012-06-261-1/+1
* | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2012-06-260-0/+0
|\ \ | |/
| * ws fixStanislav Malyshev2012-06-262-2/+2
| * BFNMoriyoshi Koizumi2012-06-251-0/+2
| * Fix bug #62373 (serialize() generates wrong reference to the object)Moriyoshi Koizumi2012-06-252-5/+27
* | Fixed bug #62357 (compile failure: (S) Arguments missing for built-in functio...Xinchen Hui2012-06-262-1/+3
* | Fix bug #62373 (serialize() generates wrong reference to the object)Moriyoshi Koizumi2012-06-252-5/+27
* | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-241-2/+2
|\ \ | |/
| * Fix memory allocation checks for base64 encodeNikita Popov2012-06-241-2/+2
* | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-2314-26/+147
|\ \ | |/
| * Improve json_encode error handlingNikita Popov2012-06-239-13/+110
| * - BFNFelipe Pena2012-06-231-0/+2
* | - BFNFelipe Pena2012-06-231-2/+4