summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* sync NEWSphp-7.0.0alpha2Anatol Belski2015-06-231-0/+68
* bump versionAnatol Belski2015-06-232-3/+3
* Merge branch 'master' into PHP-7.0.0Anatol Belski2015-06-23689-10268/+9348
|\
| * Moved NEWS entry for bug #69864 to proper categoryChristoph M. Becker2015-06-231-1/+3
| * Merge branch 'PHP-5.6'Christoph M. Becker2015-06-230-0/+0
| |\
| | * Moved NEWS entry for bug #69864 to proper categoryChristoph M. Becker2015-06-231-1/+3
| | * Merge branch 'PHP-5.5' into PHP-5.6Christoph M. Becker2015-06-230-0/+0
| | |\
| | | * Moved NEWS entry for bug #69864 to proper categoryChristoph M. Becker2015-06-231-1/+3
| * | | updated NEWSChristoph M. Becker2015-06-231-0/+1
| * | | Merge branch 'PHP-5.6'Christoph M. Becker2015-06-232-5/+53
| |\ \ \ | | |/ /
| | * | updated NEWSChristoph M. Becker2015-06-231-0/+1
| | * | Merge branch 'PHP-5.5' into PHP-5.6Christoph M. Becker2015-06-232-6/+54
| | |\ \ | | | |/
| | | * updated NEWSChristoph M. Becker2015-06-231-0/+1
| | | * Fixed bug #69864 (Segfault in preg_replace_callback)Christoph M. Becker2015-06-232-6/+54
| * | | Merge branch 'PHP-5.6'Christoph M. Becker2015-06-230-0/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Christoph M. Becker2015-06-230-0/+0
| | |\ \ | | | |/
| | | * Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5George Wang2015-06-2230-1025/+1870
| | | |\
| | | * | bump API version to 6.8George Wang2015-06-221-1/+1
| | * | | Fixed two errors in LDAP testsCôme Bernigaud2015-06-232-2/+2
| | * | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6George Wang2015-06-2291-1520/+2425
| | |\ \ \
| | * | | | bump API version to 6.8George Wang2015-06-221-1/+1
| * | | | | 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
| * | | | | Encapsulate FastCGI implementation details.Dmitry Stogov2015-06-234-132/+142
| * | | | | Fixed bug #69905 (null ptr deref and segfault in ZEND_FETCH_DIM_RW_SPEC_VAR_U...Dmitry Stogov2015-06-232-2/+13
| * | | | | Simplify php_implode(). Fill the resulting string in direct order.Dmitry Stogov2015-06-231-43/+13
| * | | | | bump API version to 6.8George Wang2015-06-221-1/+1
| * | | | | Drop duplicate object-to-type noticesNikita Popov2015-06-225-14/+2
| * | | | | Merge branch 'master' of git.php.net:php-srcDmitry Stogov2015-06-221-10/+1
| |\ \ \ \ \
| | * | | | | Drop superfluous __toString handling codeNikita Popov2015-06-221-10/+1
| * | | | | | Added commentsDmitry Stogov2015-06-221-0/+7
| |/ / / / /
| * | | | | This macro is defined in zend_virtual_cwd.h, avoid redefKalle Sommer Nielsen2015-06-221-1/+3
| * | | | | Silence the "1 file(s) copied" notice (from copying the manifest file)Kalle Sommer Nielsen2015-06-221-1/+1
| * | | | | Merge branch 'master' of https://git.php.net/push/php-srcKalle Sommer Nielsen2015-06-223-16/+15
| |\ \ \ \ \
| | * | | | | Also try __has_builtin() where builtins are usedBob Weinand2015-06-223-16/+15
| * | | | | | 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-2213-14/+0
| |/ / / / /
| * | | | | Add phpdbg userland API to fetch oplogBob Weinand2015-06-224-2/+174
| * | | | | Avoid overhead in RELEASE build.Dmitry Stogov2015-06-221-2/+7
| * | | | | Fixed crash in Zend/tests/bug69891.phpt on x86 (32-bit).Dmitry Stogov2015-06-223-3/+16
| * | | | | Fixed bug #69897 (segfault when manually constructing SQLite3Result)Kalle Sommer Nielsen2015-06-222-2/+6
| * | | | | Revert "Fix arginfo for built-in engine functions"Dmitry Stogov2015-06-222-285/+70
| * | | | | Revert "Fix set_error_handler() arginfo"Dmitry Stogov2015-06-221-5/+5
| * | | | | Revert "And actually use this new arginfo data"Dmitry Stogov2015-06-221-19/+22
| * | | | | Revert "Fix each() arginfo"Dmitry Stogov2015-06-221-3/+3
| * | | | | Revert "Fix genarginfo to respect by-ref passing"Dmitry Stogov2015-06-222-14/+6
| * | | | | Revert "Several return type fixes, still not completed... Incomplete prototyp...Dmitry Stogov2015-06-221-8/+8
| * | | | | Several return type fixes, still not completed... Incomplete prototypes :-/Bob Weinand2015-06-221-8/+8
| * | | | | Fix genarginfo to respect by-ref passingBob Weinand2015-06-222-6/+14
| * | | | | Fix each() arginfoBob Weinand2015-06-221-3/+3