summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'Christoph M. Becker2015-06-232-5/+53
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Christoph M. Becker2015-06-232-6/+54
| |\
| | * Fixed bug #69864 (Segfault in preg_replace_callback)Christoph M. Becker2015-06-232-6/+54
| * | Fixed two errors in LDAP testsCôme Bernigaud2015-06-232-2/+2
* | | Fixed two errors in LDAP testsCôme Bernigaud2015-06-232-2/+2
* | | Revert "Simplify php_implode(). Fill the resulting string in direct order."Dmitry Stogov2015-06-231-13/+43
* | | Simplify php_implode(). Fill the resulting string in direct order.Dmitry Stogov2015-06-231-43/+13
* | | Drop duplicate object-to-type noticesNikita Popov2015-06-222-2/+0
* | | Fix typo + DSP referenceKalle Sommer Nielsen2015-06-221-2/+1
* | | Remove these old references to the DSP files we don't use anymoreKalle Sommer Nielsen2015-06-2212-12/+0
* | | Fixed crash in Zend/tests/bug69891.phpt on x86 (32-bit).Dmitry Stogov2015-06-221-1/+1
* | | Fixed bug #69897 (segfault when manually constructing SQLite3Result)Kalle Sommer Nielsen2015-06-221-1/+1
* | | Fix bug #68546 (json_decode cannot access property started with \0)Jakub Zelenka2015-06-215-11/+60
* | | Fix bug #62922Nikita Popov2015-06-203-1/+13
* | | add test for bug #69838Anatol Belski2015-06-201-0/+17
* | | Fix bug #69838 OPCACHE Warning Internal error: wrong size calculationAnatol Belski2015-06-201-1/+1
* | | Micro optimizationXinchen Hui2015-06-201-2/+2
* | | Remove unused varXinchen Hui2015-06-201-2/+1
* | | Improve strtr (Fixed a bug which the lenth check doesn't work at all)Xinchen Hui2015-06-191-11/+12
* | | Remove the references to imageps*() after the T1Lib removal (Noticed by Ferenc)Kalle Sommer Nielsen2015-06-191-10/+0
* | | Fixed Bug #69883 (Compilation failed on PCRE)Xinchen Hui2015-06-191-2/+10
* | | more precise way to destroy iterator objectAnatol Belski2015-06-191-1/+3
* | | added test for bug #69846Anatol Belski2015-06-191-0/+162
* | | better approach to fix bug #69846Anatol Belski2015-06-192-4/+7
* | | Merge branch 'master' of git.php.net:php-srcXinchen Hui2015-06-191-4/+0
|\ \ \
| * | | Fix memory leak (double copy) in SplPriorityQueueBob Weinand2015-06-191-4/+0
* | | | Micro optimizations for pcreXinchen Hui2015-06-191-50/+59
|/ / /
* | | Merge branch 'PHP-5.6'Xinchen Hui2015-06-191-1/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-06-191-1/+0
| |\ \ | | |/
| | * Merge branch 'patch-3' of https://github.com/s0ph1e/php-src into PHP-5.5Xinchen Hui2015-06-191-1/+0
| | |\
| | | * Remove excess variable in mail.c (5.5 branch)Sophia Nepochataya2015-06-181-1/+0
* | | | Merge branch 'PHP-5.6'Anatol Belski2015-06-182-51/+275
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-06-182-51/+275
| |\ \ \ | | |/ /
| | * | fixes bug #69835: phpinfo() does not report many Windows SKUsChristian Wenz2015-06-182-51/+275
| | |/
* | | partial fix to bug #69846Anatol Belski2015-06-181-1/+2
* | | Merge branch 'PHP-5.6'Lior Kaplan2015-06-181-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2015-06-181-2/+2
| |\ \ | | |/
| | * Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2015-06-181-2/+2
| | |\
| | | * Fixed bug #69689 (Align PCRE_MINOR with current version)Lior Kaplan2015-06-181-2/+2
* | | | Fixed bug #69872 (uninitialised value in strtr with array)Xinchen Hui2015-06-181-11/+10
* | | | fix unknown size of void errorAnatol Belski2015-06-171-1/+1
* | | | Merge branch 'PHP-5.6'Sara Golemon2015-06-171-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Sara Golemon2015-06-171-2/+2
| |\ \ \ | | |/ /
| | * | Fix buffer growth in sockets/conversion.cSara Golemon2015-06-171-2/+2
| * | | Implements extended error messagesAndreas Heigl2015-06-171-0/+4
* | | | Merge branch 'pull-request/1284'Anatol Belski2015-06-17162-259/+259
|\ \ \ \
| * | | | Fix some missed testsAaron Piotrowski2015-06-152-2/+2
| * | | | Changed AssertionException to AssertionErrorAaron Piotrowski2015-06-142-7/+7
| * | | | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-06-14171-3774/+8276
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-05-181-1/+1
| |\ \ \ \ \