summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix bug #62490Michael Wallner2013-12-054-8/+73
| | | | inifiles delete handler did not return false if the key was not found
* more test fixesMichael Wallner2013-12-034-5/+7
|
* fix testMichael Wallner2013-12-031-2/+2
|
* fix php_stream_copy_to_stream_ex usageMichael Wallner2013-12-031-5/+5
|
* add missing clean sectionMichael Wallner2013-12-031-0/+4
|
* remove test for already removed featureMichael Wallner2013-12-031-38/+0
|
* Leftover: Bump version to 5.7.0Sebastian Bergmann2013-12-031-1/+1
|
* Merge branch 'PHP-5.6'Nikita Popov2013-12-021-1/+12
|\
| * Support gmp_remroot() on GMP 4.1Nikita Popov2013-12-021-1/+12
| |
| * Added note about const scalar exprs in UPGRADING fileBob Weinand2013-12-021-0/+3
| |
* | Merge branch 'PHP-5.6'Michael Wallner2013-12-022-1/+42
|\ \ | |/ | | | | | | | | * PHP-5.6: BFN Fix bug #65196
| * Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2013-12-022-1/+42
| |\ | | | | | | | | | | | | | | | * PHP-5.5: BFN Fix bug #65196
| | * BFNMichael Wallner2013-12-021-0/+4
| | |
| | * Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-022-1/+42
| | |\ | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #65196
| | | * Fix bug #65196Michael Wallner2013-12-023-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | Passing DOMDocumentFragment to DOMDocument::saveHTML() produces invalid markup, because a DocumentFragment is just a container for child nodes and not a real node itself.
* | | | Fix Bug #64776 The XSLT extension is not thread safe.Michael Wallner2013-12-022-21/+7
| | | |
* | | | Merge branch 'PHP-5.6'Michael Wallner2013-12-023-0/+109
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-5.6: BFN fix bug #49634x
| * | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2013-12-023-0/+109
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: BFN fix bug #49634x
| | * | BFNMichael Wallner2013-12-021-0/+4
| | | |
| | * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-023-0/+109
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: fix bug #49634x
| | | * fix bug #49634xMichael Wallner2013-12-024-0/+113
| | | |
* | | | Merge branch 'PHP-5.6'Dmitry Stogov2013-12-024-20/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: Fixed tests
| * | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2013-12-024-20/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Fixed tests
| | * | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-12-024-20/+10
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: Fixed tests
| | | * Fixed testsDmitry Stogov2013-12-024-20/+10
| | | |
* | | | Merge branch 'PHP-5.6'Dmitry Stogov2013-12-021-3/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: Fixed ability to build non-specialized GOTO VM
| * | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2013-12-021-3/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Fixed ability to build non-specialized GOTO VM
| | * | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-12-021-3/+9
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed ability to build non-specialized GOTO VM Conflicts: Zend/zend_vm_gen.php
| | | * Fixed ability to build non-specialized GOTO VMDmitry Stogov2013-12-021-3/+10
| | | |
* | | | Merge branch 'PHP-5.6'Nikita Popov2013-12-013-0/+6
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2013-12-013-0/+6
| |\ \ \ | | |/ /
| | * | Fix bug #65764Nikita Popov2013-12-014-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not exactly sure whether this is the right way to fix it. The question is whether Generator::throw() on a newborn generator (i.e. a generator that is not yet at yield expression) should first advance to the first yield and throw the exception there or whether it should instead throw the exception in the caller's context. The old behavior was to throw it at the start of the function (i.e. the very first opcode), which causes issues like the one in #65764. Effectively it's impossible to properly handle the exceptions in this case. For now I choose the variant where the generator advances to the first yield before throwing, as that's consistent with how all other methods on the Generator object currently behave. This does not necessarily match the behavior in other languages, e.g. Python would throw the exception in the caller's context. But then our send() method already has this kind of deviation, so it stays internally consistent at least.
| | * | - BFNFelipe Pena2013-11-301-0/+3
| | | |
| | * | Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5Felipe Pena2013-11-307-197/+334
| | |\ \
| * | \ \ Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6Felipe Pena2013-11-306-197/+332
| |\ \ \ \
* | \ \ \ \ Merge branch 'master' of git.php.net:/php-srcFelipe Pena2013-11-306-197/+332
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'PHP-5.6'Nikita Popov2013-11-306-197/+332
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2013-11-306-197/+332
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Cleanup generator closing code a bitNikita Popov2013-11-301-68/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All code dealing with unfinished execution cleanup is now in a separate function (previously most of it was run even when execution was properly finished. Furthermore some code dealing with unclean shutdowns has been removed, which is no longer necessary, because we no longer try to clean up in this case.
| | | * | | | Fixed bug #66041: list() fails to unpack yielded ArrayAccess objectNikita Popov2013-11-307-134/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yield return values now use IS_VAR rather than IS_TMP_VAR. This fixes the issue with list() and should also be faster as it avoids doing a zval copy.
* | | | | | | Merge branch 'PHP-5.6'Felipe Pena2013-11-302-4/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | * PHP-5.6: - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6Felipe Pena2013-11-302-4/+21
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | * PHP-5.5: - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
| | * | | - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)Felipe Pena2013-11-302-4/+21
| | |/ /
* | | | Merge branch 'PHP-5.6'Nikita Popov2013-11-291-1/+1
|\ \ \ \ | |/ / /
| * | | Fixed unused value compiler warningArunSK2013-11-291-1/+1
| | | |
* | | | Merge branch 'PHP-5.6'Nikita Popov2013-11-292-4/+53
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2013-11-292-4/+53
| |\ \ \ | | |/ /
| | * | Fixed bug #65768: DateTimeImmutable::diff does not worknikita22062013-11-293-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | This commit also prevents user classes from directly implementing DateTimeInterface, because ext/date relies on classes implementing it to support certain internal structures.
* | | | Merge branch 'PHP-5.6'Dmitry Stogov2013-11-292-0/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: Added validation of class names in the autoload process
| * | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2013-11-292-0/+21
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Added validation of class names in the autoload process Conflicts: NEWS