summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pull-request/341'Stanislav Malyshev2013-06-10228-317/+317
* split the test for 32 and 64 bitAnatol Belski2013-06-102-1/+56
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-1062-69/+69
|\
| * typo fixes (argument)Veres Lajos2013-06-1054-56/+56
| * typo fixes (accommodate, parameter)Veres Lajos2013-06-109-13/+13
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-06-100-0/+0
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-06-100-0/+0
| |\
| | * missing colonAnatol Belski2013-06-101-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-06-100-0/+0
|\ \ \ | |/ /
| * | Backported the fix for bug #53437Anatol Belski2013-06-1012-41/+707
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-06-100-0/+0
| |\ \ | | |/
| | * Backported the fix for bug #53437Anatol Belski2013-06-1012-40/+698
* | | fixed the testAnatol Belski2013-06-101-0/+2
* | | Fix a BC breach related to bug #53437Anatol Belski2013-06-1011-45/+98
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-103-2/+33
|\ \ \ | |/ /
| * | Fixed bug #64988 (Class loading order affects E_STRICT warning)Xinchen Hui2013-06-103-2/+33
| * | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Dmitry Stogov2013-06-108-2/+98
| |\ \
* | | | Fix image method signaturesJakub Vrana2013-06-101-7/+7
* | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-06-108-2/+98
|\ \ \ \
| * \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-107-0/+96
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | PHPTests for the DOMDocument::loadHTMLfile method.Antonio Diaz Ruiz2013-06-107-0/+96
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-100-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Fix spelling and correct typo.Carson McDonald2013-06-101-2/+2
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-101-2/+2
| |\ \ \ \
| | * | | | Fix spelling and correct typo.Carson McDonald2013-06-101-2/+2
* | | | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-06-101-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-06-101-1/+1
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Fixed test scriptDmitry Stogov2013-06-101-1/+1
* | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-06-101-0/+3
|\ \ \ \ | |/ / /
| * | | Callback has to be restored in MSHUTDOWNDmitry Stogov2013-06-101-0/+3
* | | | Fixed commentsDmitry Stogov2013-06-101-2/+4
* | | | Avoid multiple allocations of the same key in different processesDmitry Stogov2013-06-101-1/+3
* | | | Compact HashTables before storing them in shared memoryDmitry Stogov2013-06-103-0/+52
* | | | Use size_t instead of intDmitry Stogov2013-06-101-2/+2
* | | | Update NEWSXinchen Hui2013-06-091-0/+4
* | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-091-6/+13
|\ \ \ \ | |/ / /
| * | | Update NEWsXinchen Hui2013-06-091-0/+3
| * | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-06-091-6/+13
| |\ \ \ | | |/ /
| | * | Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits s...Xinchen Hui2013-06-092-7/+18
* | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-090-0/+0
|\ \ \ \ | |/ / /
| * | | Fixed merge wronglyXinchen Hui2013-06-092-2/+2
* | | | Update NEWSXinchen Hui2013-06-091-0/+2
* | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-093-0/+34
|\ \ \ \ | |/ / /
| * | | Update NEWSXinchen Hui2013-06-091-0/+1
| * | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-06-093-0/+34
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)Xinchen Hui2013-06-094-0/+36
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-060-0/+0
|\ \ \ | |/ /
| * | fix 5.4.16 dateStanislav Malyshev2013-06-061-1/+1
* | | fix NEWSAnatol Belski2013-06-061-1/+2
* | | updated NEWSAnatol Belski2013-06-061-0/+1