summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5'Stanislav Malyshev2013-08-046-8/+8
|\
| * 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
| |\ \ | | |/
* | | Merge commit '5753b74'Rasmus 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.5'Xinchen Hui2013-08-023-15/+65
|\ \ \ | | |/ | |/|
| * | 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
* | | Constify streams API and a few other calls down the rabbit hole.Andrey Hristov2013-07-301-4/+4
* | | Merge branch 'PHP-5.5'Johannes Schlüter2013-07-231-1/+1
|\ \ \ | |/ /
| * | Fix commentJohannes Schlüter2013-07-231-1/+1
* | | Merge branch 'pull-request/326'Stanislav Malyshev2013-07-212-43/+40
|\ \ \
| * | | zend_register_null_constantkrakjoe2013-04-152-33/+23
| * | | zend_API.h includedkrakjoe2013-04-151-19/+10
| * | | use Z_* family macroskrakjoe2013-04-151-18/+18
| * | | zend_register_bool_constant patchkrakjoe2013-04-152-0/+16
* | | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-07-214-9/+10
|\ \ \ \ | | |/ / | |/| |
| * | | backward compatibilityLajos Veres2013-07-211-0/+1
| * | | HASH_KEY_NON_EXISTANT fixVeres Lajos2013-07-214-9/+9
* | | | Merge branch 'PHP-5.5'Xinchen Hui2013-07-212-2/+37
|\ \ \ \ | |/ / /
| * | | 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
* | | | typo fixesVeres Lajos2013-07-154-4/+4
* | | | less serious compatAbility fixesVeres Lajos2013-07-151-2/+2
* | | | typos (orig)Veres Lajos2013-07-151-1/+1
* | | | Merge branch 'PHP-5.5'Xinchen Hui2013-07-143-71/+146
|\ \ \ \ | |/ / /
| * | | 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
* | | | | Merge branch 'PHP-5.5'Ard Biesheuvel2013-07-041-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
* | | | | fix assembly of safe_address() for x86 and x86_64Nuno Lopes2013-07-031-2/+2
* | | | | Sync list of supported bison version with PHP-5.5Sebastian Bergmann2013-07-031-1/+1
* | | | | Merge branch 'PHP-5.5'Nikita Popov2013-06-293-0/+46
|\ \ \ \ \ | |/ / / /
| * | | | Don't try to clean up generator stack on unclean shutdownNikita Popov2013-06-293-0/+46
* | | | | Merge branch 'PHP-5.5'Xinchen Hui2013-06-242-2/+29
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | Merge branch 'PHP-5.5'David Soria Parra2013-06-241-1/+1
|\ \ \ \ \ | |/ / / /