summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-08-144-14/+14
|\
| * Fixed #65431 (Discarded qualifiers from pointer target warnings when using --...Xinchen Hui2013-08-144-14/+14
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-08-062-0/+5
|\ \ | |/
| * Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fa...Xinchen Hui2013-08-062-0/+5
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-046-8/+8
|\ \ | |/
| * non living code related typo fixesVeres Lajos2013-08-046-8/+8
* | Merge commit '5753b74' into PHP-5.5Rasmus Lerdorf2013-08-021-10/+10
|\ \ | |/
| * Make sure test.php isn't coming in from the include_pathRasmus Lerdorf2013-08-021-10/+10
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-08-023-15/+65
|\ \ | |/
| * Fixed bug Bug #65372 (Segfault in gc_zval_possible_root when return reference...Xinchen Hui2013-08-023-15/+65
* | Fix commentJohannes Schlüter2013-07-231-1/+1
* | backward compatibilityLajos Veres2013-07-211-0/+1
* | HASH_KEY_NON_EXISTANT fixVeres Lajos2013-07-214-9/+9
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-07-212-2/+37
|\ \ | |/
| * Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in traitArpad Ray2013-07-202-2/+8
| * Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in traitArpad Ray2013-07-192-0/+29
| * typo fixesVeres Lajos2013-07-154-4/+4
| * less serious compatAbility fixesVeres Lajos2013-07-151-2/+2
* | typo fixesVeres Lajos2013-07-154-4/+4
* | typos (orig)Veres Lajos2013-07-151-1/+1
* | less serious compatAbility fixesVeres Lajos2013-07-151-2/+2
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-07-143-71/+146
|\ \ | |/
| * Fixed bug #65254 (Exception not catchable when exception thrown in autoload w...Xinchen Hui2013-07-143-81/+166
| * fix assembly of safe_address() for x86 and x86_64Nuno Lopes2013-07-031-2/+2
| * Merge branch 'PHP-5.3' into PHP-5.4Sebastian Bergmann2013-07-031-1/+1
| |\
| | * Add bison 2.6.4 to the list of supported versionsSebastian Bergmann2013-07-031-1/+1
* | | fix version - not -dev anymore since 5.5.0 releaseStanislav Malyshev2013-07-121-1/+1
* | | Fix assembly of safe_address() for aarch64Ard Biesheuvel2013-07-041-1/+1
* | | fix assembly of safe_address() for x86 and x86_64Nuno Lopes2013-07-031-2/+2
* | | Don't try to clean up generator stack on unclean shutdownNikita Popov2013-06-293-0/+46
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-242-2/+29
|\ \ \ | |/ /
| * | Fixed bug (is_callable() triggers Fatal Error)Xinchen Hui2013-06-242-2/+29
* | | Fix #65108 (is_callable() triggers Fatal Error)David Soria Parra2013-06-241-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Ard Biesheuvel2013-06-211-2/+0
|\ \ \ | |/ /
| * | Fix non-specialized executor buildArd Biesheuvel2013-06-211-2/+0
* | | Fix bug #65051: count() off by one inside unset()Nikita Popov2013-06-172-3/+26
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-162-344/+352
|\ \ \ | |/ /
| * | Fix bug #64936 - clean doc comment state at the beginning and end of the scanStanislav Malyshev2013-06-163-342/+348
| * | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-109-10/+10
* | | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-7/+7
* | | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-109-10/+10
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-101-2/+2
|\ \ \ | |/ /
| * | typo fixes (argument)Veres Lajos2013-06-101-2/+2
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-06-102-2/+32
|\ \ \ | |/ /
| * | Fixed bug #64988 (Class loading order affects E_STRICT warning)Xinchen Hui2013-06-102-2/+32
| * | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Dmitry Stogov2013-06-101-2/+2
| |\ \
| | * | Fix spelling and correct typo.Carson McDonald2013-06-101-2/+2
* | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-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