summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2015-06-202-3/+12
|\
| * Fixed bug #69892Nikita Popov2015-06-202-3/+12
* | Fix bug #69740Nikita Popov2015-06-112-0/+31
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-06-101-1/+1
|\ \ | |/
| * regenerated the ini scannerAnatol Belski2015-06-101-1/+1
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-06-102-1/+17
|\ \ | |/
| * fixed bug, where a linebreak immediately after an opening quote of a value ca...Christoph M. Becker2015-06-101-1/+1
| * made failing test more meaningfulChristoph M. Becker2015-06-101-6/+11
| * added failing testChristoph M. Becker2015-06-101-0/+11
* | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2015-06-013-5/+61
|\ \ | |/
| * Fixed bug #69732 (can induce segmentation fault with basic php code).Dmitry Stogov2015-06-013-5/+61
| * Merge the fix for #69703 to 5.5 per request from JulienKalle Sommer Nielsen2015-05-281-2/+2
* | Preserve VARIADIC flag for Closure::__invoke()Nikita Popov2015-05-292-1/+20
* | Shouldn't have been committed, so revertKalle Sommer Nielsen2015-05-281-1902/+1901
* | Fixed bug #69703 (Use __builtin_clzl on PowerPC) -- Patch by dja at axtens do...Kalle Sommer Nielsen2015-05-282-1903/+1904
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-05-122-13/+18
|\ \ | |/
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-05-122-13/+18
| |\
| | * Fix bug #69403 and other int overflowsStanislav Malyshev2015-05-102-14/+19
| | * Fixed res leakXinchen Hui2015-04-141-3/+4
* | | Fix bug #69599Nikita Popov2015-05-123-4/+25
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-05-042-8/+6
|\ \ \ | |/ /
| * | Saving the latter checking in most casesXinchen Hui2015-05-042-8/+6
| * | Fix uninitialized value with extension traitsJohn Boehr2015-05-041-1/+1
* | | Fix uninitialized value with extension traitsJohn Boehr2015-05-041-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-04-281-1/+1
|\ \ \ | |/ /
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-04-211-1/+1
|\ \ \ | |/ /
| * | Remove tail blank which is committed by accidentXinchen Hui2015-04-211-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-04-212-2/+24
|\ \ \ | |/ /
| * | Fixed Bug #69467 (Wrong checked for the interface by using Trait)Xinchen Hui2015-04-212-2/+24
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-04-151-3/+4
|\ \ \ | |/ /
| * | Fixed res leakXinchen Hui2015-04-151-3/+4
* | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2015-04-143-6/+28
|\ \ \ | |/ /
| * | Fixed bug #69419Nikita Popov2015-04-143-6/+28
* | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2015-04-141-5/+3
|\ \ \ | |/ /
| * | Bug #63336 is not a bugDmitry Stogov2015-04-141-5/+3
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-04-141-1/+1
|\ \ \ | |/ /
| * | codes standardXinchen Hui2015-04-141-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-04-141-0/+3
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5.24' into PHP-5.5Stanislav Malyshev2015-04-141-0/+3
| |\ \
| | * \ Merge branch 'PHP-5.5-security' into PHP-5.5.24Stanislav Malyshev2015-04-122-8/+3
| | |\ \
| | * \ \ Merge branch 'PHP-5.4.40' into PHP-5.5.24Stanislav Malyshev2015-04-111-0/+3
| | |\ \ \ | | | | |/ | | | |/|
| | | * | More fixes for bug #69152Stanislav Malyshev2015-04-111-0/+3
| | | * | Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into...Stanislav Malyshev2015-04-011-1/+0
| | | * | Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Xinchen Hui2015-03-255-3/+36
| | | |\ \
| | | * \ \ Merge branch 'arginfo' of https://github.com/realityking/php-src into PHP-5.4Xinchen Hui2015-03-081-0/+1
| | | |\ \ \
| | | | * | | Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against ca...Rouven Weßling2014-01-251-0/+1
* | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-04-102-0/+31
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fixed bug #69420 (Invalid read in zend_std_get_method)Xinchen Hui2015-04-102-0/+31
* | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2015-04-082-0/+26
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)Dmitry Stogov2015-04-082-0/+26