summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix weird asm instruction order with gcc by marking as volatile in phpdbgtmp_livelinessBob Weinand2015-07-131-1/+1
|
* Preserve return value in zend_vm_call_opcode_handler with global opline/ex ↵Bob Weinand2015-07-132-2/+8
| | | | registers enabled
* Don't return T_ERROR from token_get_all()Nikita Popov2015-07-097-226/+212
| | | | | | This turned out to be rather inconvenient after all. Instead just return the same output we did on PHP 5. If people want to have an error, use TOKEN_PARSE.
* refix the NEWSAnatol Belski2015-07-091-2/+4
|
* Fixed exception catching on break/continueDmitry Stogov2015-07-096-14/+58
| | | | Fixed "finaly" handling on exception in "return" statement
* Fix posix_setrlimit segfaultNikita Popov2015-07-091-2/+1
|
* Fix too early terminated temporary range with break/cont/gotoBob Weinand2015-07-095-10/+10
| | | | I have no crashing or leaking reproduce script, only valgrind invalid reads for that one; hence no phpt here
* Merge branch 'PHP-5.6'Ferenc Kovacs2015-07-090-0/+0
|\ | | | | | | | | * PHP-5.6: move the use-after-free fixes to 5.6.11
| * move the use-after-free fixes to 5.6.11Ferenc Kovacs2015-07-091-8/+6
| |
* | Fixed exception habdling on "return" statement.Dmitry Stogov2015-07-097-6/+150
| | | | | | | | Such exceptions shouldn't be caught in the same function.
* | Fix bug #69430Nikita Popov2015-07-097-371/+415
| | | | | | | | | | Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors are reported as T_ERROR tokens.
* | Update token_get_all() arginfoNikita Popov2015-07-091-1/+2
| |
* | Add test guaranteeing that loop vars are only freed after potential return ↵Bob Weinand2015-07-091-0/+19
| | | | | | | | type exceptions
* | Fixed invalid live-range detectionDmitry Stogov2015-07-094-11/+46
| |
* | Disable opcache.fast_shutdown if USE_ZEND_ALLOC=0Dmitry Stogov2015-07-091-1/+1
| |
* | Added missing API functionsDmitry Stogov2015-07-092-0/+16
| |
* | Fixed Bug #70032 (make_http_soap_request calls ↵Xinchen Hui2015-07-092-1/+5
| | | | | | | | zend_hash_get_current_key_ex(,,,NULL))
* | Fix posix_setrlimit() to use int as values instead of strings.Magnus Määttä2015-07-091-15/+8
| | | | | | | | Add constant for unlimited (POSIX_RLIMIT_INFINITY).
* | Add posix_setrlimit() FR #54603Magnus Määttä2015-07-084-2/+120
| |
* | Fixed situation, when CHECH_EXCEPTION() might change value of "opline" ↵Dmitry Stogov2015-07-085-1831/+993
| | | | | | | | | | | | | | variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected). CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE(). As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
* | Merge branch 'PHP-5.6'Julien Pauli2015-07-080-0/+0
|\ \ | |/ | | | | | | * PHP-5.6: 5.5.27 release
| * Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-07-080-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: 5.5.27 release Conflicts: main/php_version.h
| | * 5.5.27 releaseJulien Pauli2015-07-082-2/+13
| | |
* | | Working fix for ctrl+d on readline/libeditBob Weinand2015-07-081-5/+2
| | |
* | | Merge branch 'PHP-5.6'Xinchen Hui2015-07-080-0/+0
|\ \ \ | |/ /
| * | Revert "Fixed invalid read"Xinchen Hui2015-07-081-2/+2
| | | | | | | | | | | | | | | | | | I must be confused while switching from master to 5.6 This reverts commit 94957a7091d2d87d3b75c8395a3a11a4fbecaea1.
* | | Merge branch 'master' of git.php.net:php-srcXinchen Hui2015-07-080-0/+0
|\ \ \
| * | | fix NEWSAnatol Belski2015-07-081-2/+4
| | | |
* | | | Fixed bug #70018 (exec does not strip all whitespace)Xinchen Hui2015-07-083-2/+20
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | Merge branch 'PHP-5.6' Conflicts: ext/standard/exec.c
| * | Fixed invalid readXinchen Hui2015-07-081-2/+2
| | |
* | | Merge branch 'master' of git.php.net:php-srcXinchen Hui2015-07-081-4/+10
|\ \ \
| * | | Add assertion in liveliness computationNikita Popov2015-07-081-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assert that a live-range does not start, while one for the same variable is already active. To satisfy this constraint, explicitly exclude writes from JMP_SET and COALESCE. They were previously also handled correctly, because their result variable was only killed after the second write to it after the false branch. This just makes it more explicit.
* | | | Make sure fast_call_var is initialized properlyXinchen Hui2015-07-082-2/+4
|/ / /
* | | Add comment to explaining the new checkXinchen Hui2015-07-081-0/+3
| | |
* | | Remove outdate commentXinchen Hui2015-07-082-2/+0
| | |
* | | Fixed bug #70012 (Exception lost with nested finally block)Xinchen Hui2015-07-085-8/+50
| | |
* | | Merge branch 'PHP-5.6'Xinchen Hui2015-07-080-0/+0
|\ \ \ | |/ /
| * | Fixed bug #70012 (Exception lost with nested finally block)Xinchen Hui2015-07-084-4/+45
| | |
* | | Fix failing tests from exception code changesAaron Piotrowski2015-07-079-24/+24
| | |
* | | PHP 7.0.0 Beta 2 NEWSKalle Sommer Nielsen2015-07-081-1/+3
| | |
* | | ZEND_SEPARATE reuses temporariesNikita Popov2015-07-082-0/+20
| | |
* | | Switch code on thrown TypeError and ParseError to 0, update related testsAaron Piotrowski2015-07-076-22/+21
| | |
* | | Merge branch 'PHP-5.6'Christoph M. Becker2015-07-071-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: fixed typo in test for bug #66985
| * | fixed typo in test for bug #66985Christoph M. Becker2015-07-071-1/+1
| | |
* | | Properly exit on EOF on stdin in readline modeBob Weinand2015-07-072-5/+8
| | |
* | | Remove loop_var_stackNikita Popov2015-07-074-79/+30
| | | | | | | | | | | | | | | | | | | | | Instead add a loop_var member to brk_cont_element. Now that brk_cont is compile-time the distinction is no longer necessary. Also drops brk_cont.start, check the loop_var op_type instead.
* | | SQLite3::open/__construct has 2 optional argsRasmus Lerdorf2015-07-071-1/+1
| | |
* | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-07-070-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Better fix for bug #69958 Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Conflicts: ext/mysqlnd/mysqlnd.c ext/phar/phar_object.c
| * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-07-075-65/+108
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Better fix for bug #69958 Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Conflicts: ext/phar/phar_object.c
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-07-071-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Conflicts: ext/mysqlnd/mysqlnd.c