summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-05-132-13/+18
* 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
* | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2015-04-064-24/+26
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix bug #60022Nikita Popov2015-04-064-7/+9
* | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2015-04-061-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix static member destructionNikita Popov2015-04-061-1/+1
* | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2015-04-062-7/+47
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fixed bug #68652 (segmentation fault in destructor)Dmitry Stogov2015-04-062-7/+47
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2015-04-021-7/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Prevent GC from changing zval or object 'color' before they are actually inse...Dmitry Stogov2015-04-021-7/+2
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2015-04-011-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix typo: unitialized -> uninitializedLior Kaplan2015-04-011-1/+1
| |/ / / /
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2015-03-134-7/+51
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #69221Nikita Popov2015-03-134-7/+51
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-03-111-0/+16
|\ \ \ \ \ | |/ / / /
| * | | | Improve test script for #69212Xinchen Hui2015-03-111-0/+16
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2015-03-103-0/+35
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #69212Nikita Popov2015-03-103-0/+35
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-03-102-16/+16
|\ \ \ \ \ | |/ / / /
| * | | | TypoXinchen Hui2015-03-102-16/+16
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-03-101-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fixed testXinchen Hui2015-03-101-1/+2
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-03-103-39/+176
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #66609 (php crashes with __get() and ++ operator in some cases)Xinchen Hui2015-03-103-39/+176
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-03-081-1/+1
|\ \ \ \ \ | |/ / / /