]>
granicus.if.org Git - php/log
Dmitry Stogov [Fri, 10 Jul 2015 00:46:57 +0000 (03:46 +0300)]
Readded tests
Dmitry Stogov [Fri, 10 Jul 2015 00:32:46 +0000 (03:32 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
add missing NEWS entry
PDO_OCI LOB fixes (Senthil)
Improve test portability (Senthil)
Add new test section. Diff with query 5 is still to be resolved
Add Oracle syntax (Senthil)
Dmitry Stogov [Fri, 10 Jul 2015 00:31:52 +0000 (03:31 +0300)]
Squashed commit of the following:
commit
03cf871f1576f08b2348c141b209894a7bf17a86
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 10 02:45:31 2015 +0300
Revert "Fixed bug #62210 (Exceptions can leak temporary variables. As a part of the fix serious refactoring was done. op_array->brk_cont_array was removed, and replaced with more general and speed efficient op_array->T_liveliness. ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time). (Bob, Dmitry, Laruence)"
This reverts commit
5ee841325901a4b040cfea56292a24702fe224d9 .
commit
285a68227ce3d380e821a24fa389aa5239bd3fe1
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 10 02:45:26 2015 +0300
Revert "Tuned off dubugging of live ranges"
This reverts commit
404dc93d35f7061fc4b1b41ad6cb0721b9b52bcc .
commit
93d9d11157301ee2ec99afb6f5744b126d17f637
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 10 02:45:17 2015 +0300
Revert "Remove loop_var_stack"
This reverts commit
b3a4c05071c3786e27e1326fa1b4d5acad62fccd .
commit
ede68ebbc284aec79e3f719f2c8dbf9da6907752
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 10 02:45:12 2015 +0300
Revert "ZEND_SEPARATE reuses temporaries"
This reverts commit
1852f538b9f8d5e7d67fe5a4f6080396d8b10034 .
commit
96d8995dc1f517fb01b481736273767509f76c47
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 10 02:45:10 2015 +0300
Revert "Add assertion in liveliness computation"
This reverts commit
ed14019e8c0c852480eebc6fc552d8c3d939dce1 .
commit
0649d7bfef152e6cc8e67b922534e9946c634d9c
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 10 02:45:07 2015 +0300
Revert "Fixed invalid live-range detection"
This reverts commit
54f367ee2a2e4cb7c952b17915c226fdc56038ab .
commit
dfe8f3851f6b04595eb089323e3492115a59363e
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 10 02:45:04 2015 +0300
Revert "Add test guaranteeing that loop vars are only freed after potential return type exceptions"
This reverts commit
f5db5a558d550bf441373febebbb02f3884209d1 .
commit
52a94aad6f48a199358cc07f7e4f56bb73050504
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 10 02:45:01 2015 +0300
Revert "Fixed exception habdling on "return" statement."
This reverts commit
17c5315bdf8f8087979aeb55f6d3a512ba197cf5 .
commit
6e90ad7331901711e89c2ceb2bcab5023e5cee60
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 10 02:44:58 2015 +0300
Revert "Fix too early terminated temporary range with break/cont/goto"
This reverts commit
cc876c04b420589cb1f62b650d0c0e24975dd4af .
commit
7b766e44b1970e4031f75109c302c07ead2c05cb
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 10 02:44:55 2015 +0300
Revert "Fixed exception catching on break/continue"
This reverts commit
8c3f701eebfa92d761bb368cfa8c2d1ccf821b9d .
Ferenc Kovacs [Fri, 10 Jul 2015 00:31:16 +0000 (02:31 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing NEWS entry
Ferenc Kovacs [Fri, 10 Jul 2015 00:30:29 +0000 (02:30 +0200)]
add missing NEWS entry
Christopher Jones [Thu, 9 Jul 2015 23:55:36 +0000 (09:55 +1000)]
PDO_OCI LOB fixes (Senthil)
Christopher Jones [Thu, 9 Jul 2015 23:53:45 +0000 (09:53 +1000)]
Improve test portability (Senthil)
Christopher Jones [Thu, 9 Jul 2015 23:49:10 +0000 (09:49 +1000)]
Add new test section. Diff with query 5 is still to be resolved
Christopher Jones [Thu, 9 Jul 2015 23:47:45 +0000 (09:47 +1000)]
Add Oracle syntax (Senthil)
Nikita Popov [Thu, 9 Jul 2015 20:59:31 +0000 (22:59 +0200)]
Don't return T_ERROR from token_get_all()
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.
Anatol Belski [Thu, 9 Jul 2015 20:55:44 +0000 (22:55 +0200)]
refix the NEWS
Dmitry Stogov [Thu, 9 Jul 2015 20:20:50 +0000 (23:20 +0300)]
Fixed exception catching on break/continue
Fixed "finaly" handling on exception in "return" statement
Nikita Popov [Thu, 9 Jul 2015 18:40:07 +0000 (20:40 +0200)]
Fix posix_setrlimit segfault
Bob Weinand [Thu, 9 Jul 2015 18:07:40 +0000 (20:07 +0200)]
Fix too early terminated temporary range with break/cont/goto
I have no crashing or leaking reproduce script, only valgrind invalid reads for that one; hence no phpt here
Ferenc Kovacs [Thu, 9 Jul 2015 18:02:18 +0000 (20:02 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
move the use-after-free fixes to 5.6.11
Ferenc Kovacs [Thu, 9 Jul 2015 18:01:37 +0000 (20:01 +0200)]
move the use-after-free fixes to 5.6.11
Dmitry Stogov [Thu, 9 Jul 2015 17:47:25 +0000 (20:47 +0300)]
Fixed exception habdling on "return" statement.
Such exceptions shouldn't be caught in the same function.
Nikita Popov [Thu, 9 Jul 2015 17:10:06 +0000 (19:10 +0200)]
Fix bug #69430
Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors
are reported as T_ERROR tokens.
Nikita Popov [Thu, 9 Jul 2015 16:19:12 +0000 (18:19 +0200)]
Update token_get_all() arginfo
Bob Weinand [Thu, 9 Jul 2015 14:54:41 +0000 (16:54 +0200)]
Add test guaranteeing that loop vars are only freed after potential return type exceptions
Dmitry Stogov [Thu, 9 Jul 2015 14:38:29 +0000 (17:38 +0300)]
Fixed invalid live-range detection
Dmitry Stogov [Thu, 9 Jul 2015 09:19:51 +0000 (12:19 +0300)]
Disable opcache.fast_shutdown if USE_ZEND_ALLOC=0
Dmitry Stogov [Thu, 9 Jul 2015 09:19:30 +0000 (12:19 +0300)]
Added missing API functions
Xinchen Hui [Thu, 9 Jul 2015 08:32:18 +0000 (16:32 +0800)]
Fixed Bug #70032 (make_http_soap_request calls zend_hash_get_current_key_ex(,,,NULL))
Magnus Määttä [Wed, 8 Jul 2015 22:04:13 +0000 (00:04 +0200)]
Fix posix_setrlimit() to use int as values instead of strings.
Add constant for unlimited (POSIX_RLIMIT_INFINITY).
Magnus Määttä [Wed, 8 Jul 2015 20:12:07 +0000 (22:12 +0200)]
Add posix_setrlimit() FR #54603
Dmitry Stogov [Wed, 8 Jul 2015 15:33:58 +0000 (18:33 +0300)]
Fixed situation, when CHECH_EXCEPTION() might change value of "opline" 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.
Julien Pauli [Wed, 8 Jul 2015 15:00:47 +0000 (17:00 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
5.5.27 release
Julien Pauli [Wed, 8 Jul 2015 15:00:29 +0000 (17:00 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.27 release
Conflicts:
main/php_version.h
Julien Pauli [Wed, 8 Jul 2015 14:59:44 +0000 (16:59 +0200)]
5.5.27 release
Bob Weinand [Wed, 8 Jul 2015 14:54:41 +0000 (16:54 +0200)]
Working fix for ctrl+d on readline/libedit
Xinchen Hui [Wed, 8 Jul 2015 14:35:10 +0000 (22:35 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Wed, 8 Jul 2015 14:34:27 +0000 (22:34 +0800)]
Revert "Fixed invalid read"
I must be confused while switching from master to 5.6
This reverts commit
94957a7091d2d87d3b75c8395a3a11a4fbecaea1 .
Xinchen Hui [Wed, 8 Jul 2015 11:31:36 +0000 (19:31 +0800)]
Merge branch 'master' of git.php.net:php-src
Xinchen Hui [Wed, 8 Jul 2015 11:30:37 +0000 (19:30 +0800)]
Fixed bug #70018 (exec does not strip all whitespace)
Merge branch 'PHP-5.6'
Conflicts:
ext/standard/exec.c
Anatol Belski [Wed, 8 Jul 2015 10:50:40 +0000 (12:50 +0200)]
fix NEWS
Xinchen Hui [Wed, 8 Jul 2015 11:06:49 +0000 (19:06 +0800)]
Fixed invalid read
Xinchen Hui [Wed, 8 Jul 2015 10:25:04 +0000 (18:25 +0800)]
Merge branch 'master' of git.php.net:php-src
Xinchen Hui [Wed, 8 Jul 2015 10:24:27 +0000 (18:24 +0800)]
Make sure fast_call_var is initialized properly
Nikita Popov [Wed, 8 Jul 2015 09:54:38 +0000 (11:54 +0200)]
Add assertion in liveliness computation
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.
Xinchen Hui [Wed, 8 Jul 2015 09:44:54 +0000 (17:44 +0800)]
Add comment to explaining the new check
Xinchen Hui [Wed, 8 Jul 2015 09:42:50 +0000 (17:42 +0800)]
Remove outdate comment
Xinchen Hui [Wed, 8 Jul 2015 09:15:09 +0000 (17:15 +0800)]
Fixed bug #70012 (Exception lost with nested finally block)
Xinchen Hui [Wed, 8 Jul 2015 09:14:32 +0000 (17:14 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Wed, 8 Jul 2015 09:14:19 +0000 (17:14 +0800)]
Fixed bug #70012 (Exception lost with nested finally block)
Aaron Piotrowski [Wed, 8 Jul 2015 04:14:05 +0000 (23:14 -0500)]
Fix failing tests from exception code changes
Kalle Sommer Nielsen [Wed, 8 Jul 2015 00:37:59 +0000 (02:37 +0200)]
PHP 7.0.0 Beta 2 NEWS
Nikita Popov [Tue, 7 Jul 2015 22:12:47 +0000 (00:12 +0200)]
ZEND_SEPARATE reuses temporaries
Aaron Piotrowski [Tue, 7 Jul 2015 21:54:39 +0000 (16:54 -0500)]
Switch code on thrown TypeError and ParseError to 0, update related tests
Christoph M. Becker [Tue, 7 Jul 2015 21:39:18 +0000 (23:39 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed typo in test for bug #66985
Christoph M. Becker [Tue, 7 Jul 2015 21:35:28 +0000 (23:35 +0200)]
fixed typo in test for bug #66985
Bob Weinand [Tue, 7 Jul 2015 20:45:34 +0000 (22:45 +0200)]
Properly exit on EOF on stdin in readline mode
Nikita Popov [Tue, 7 Jul 2015 17:46:29 +0000 (19:46 +0200)]
Remove loop_var_stack
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.
Rasmus Lerdorf [Tue, 7 Jul 2015 18:53:07 +0000 (11:53 -0700)]
SQLite3::open/__construct has 2 optional args
Stanislav Malyshev [Tue, 7 Jul 2015 17:19:20 +0000 (10:19 -0700)]
Merge branch 'PHP-5.6'
* 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
Stanislav Malyshev [Tue, 7 Jul 2015 05:58:28 +0000 (22:58 -0700)]
Better fix for bug #69958
Stanislav Malyshev [Tue, 7 Jul 2015 05:58:28 +0000 (22:58 -0700)]
Better fix for bug #69958
Stanislav Malyshev [Sun, 5 Jul 2015 07:00:53 +0000 (00:00 -0700)]
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Stanislav Malyshev [Sun, 5 Jul 2015 06:47:48 +0000 (23:47 -0700)]
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Stanislav Malyshev [Sun, 5 Jul 2015 04:01:50 +0000 (21:01 -0700)]
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Stanislav Malyshev [Tue, 7 Jul 2015 17:12:51 +0000 (10:12 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* 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
Aaron Piotrowski [Tue, 7 Jul 2015 17:10:22 +0000 (12:10 -0500)]
Use NULL where possible for exception class
Matches usage of zend_throw_exception()/zend_throw_exception_ex().
Aaron Piotrowski [Tue, 7 Jul 2015 16:37:33 +0000 (11:37 -0500)]
Allow NULL for exception_ce
Stanislav Malyshev [Tue, 7 Jul 2015 17:09:34 +0000 (10:09 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* 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
Stanislav Malyshev [Tue, 7 Jul 2015 17:08:37 +0000 (10:08 -0700)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
add missing second argument for ucfirst to the proto
Anatol Belski [Tue, 7 Jul 2015 16:40:16 +0000 (18:40 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix C89 compat
Anatol Belski [Tue, 7 Jul 2015 16:39:33 +0000 (18:39 +0200)]
fix C89 compat
Stanislav Malyshev [Tue, 7 Jul 2015 05:58:28 +0000 (22:58 -0700)]
Better fix for bug #69958
Stanislav Malyshev [Tue, 7 Jul 2015 04:19:42 +0000 (21:19 -0700)]
update news
Stanislav Malyshev [Sun, 5 Jul 2015 07:00:53 +0000 (00:00 -0700)]
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Stanislav Malyshev [Sun, 5 Jul 2015 06:47:48 +0000 (23:47 -0700)]
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Stanislav Malyshev [Sun, 5 Jul 2015 04:01:50 +0000 (21:01 -0700)]
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Kalle Sommer Nielsen [Tue, 7 Jul 2015 16:26:14 +0000 (18:26 +0200)]
fix C89 compat
Anatol Belski [Tue, 7 Jul 2015 15:11:24 +0000 (17:11 +0200)]
added info about the user space stream context for pipes
Anatol Belski [Tue, 7 Jul 2015 14:15:22 +0000 (16:15 +0200)]
mention pcre.jit in the supplied php.ini-*
Julien Pauli [Tue, 7 Jul 2015 14:03:37 +0000 (16:03 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix test related to
c22da81
Conflicts:
ext/standard/tests/general_functions/bug41037.phpt
Julien Pauli [Tue, 7 Jul 2015 14:01:44 +0000 (16:01 +0200)]
Fix test related to
c22da81
Ferenc Kovacs [Tue, 7 Jul 2015 13:50:02 +0000 (15:50 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing second argument for ucfirst to the proto
Ferenc Kovacs [Tue, 7 Jul 2015 13:49:44 +0000 (15:49 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add missing second argument for ucfirst to the proto
Ferenc Kovacs [Tue, 7 Jul 2015 13:49:16 +0000 (15:49 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add missing second argument for ucfirst to the proto
Ferenc Kovacs [Tue, 7 Jul 2015 13:48:55 +0000 (15:48 +0200)]
add missing second argument for ucfirst to the proto
Xinchen Hui [Tue, 7 Jul 2015 13:40:46 +0000 (21:40 +0800)]
Merge branch 'master' of git.php.net:php-src
Xinchen Hui [Tue, 7 Jul 2015 13:38:37 +0000 (21:38 +0800)]
Update NEWs
Xinchen Hui [Tue, 7 Jul 2015 13:38:24 +0000 (21:38 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
ext/sqlite3/sqlite3.c
Xinchen Hui [Tue, 7 Jul 2015 13:37:35 +0000 (21:37 +0800)]
Fixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk())
Anatol Belski [Tue, 7 Jul 2015 13:34:04 +0000 (15:34 +0200)]
updated NEWS
Xinchen Hui [Tue, 7 Jul 2015 13:29:20 +0000 (21:29 +0800)]
Update NEWs
Xinchen Hui [Tue, 7 Jul 2015 13:28:51 +0000 (21:28 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
ext/spl/spl_iterators.c
Xinchen Hui [Tue, 7 Jul 2015 13:25:28 +0000 (21:25 +0800)]
Fixed bug #69970 (Use-after-free vulnerability in spl_recursive_it_move_forward_ex())
Julien Pauli [Tue, 7 Jul 2015 13:03:58 +0000 (15:03 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed double ZEND_TICKS opcode generation for declare()
Conflicts:
Zend/zend_compile.c
Julien Pauli [Mon, 6 Jul 2015 13:46:48 +0000 (15:46 +0200)]
Fixed double ZEND_TICKS opcode generation for declare()
Dmitry Stogov [Tue, 7 Jul 2015 12:43:14 +0000 (15:43 +0300)]
Tuned off dubugging of live ranges
Dmitry Stogov [Tue, 7 Jul 2015 12:41:12 +0000 (15:41 +0300)]
Fixed bug #62210 (Exceptions can leak temporary variables. As a part of the fix serious refactoring was done. op_array->brk_cont_array was removed, and replaced with more general and speed efficient op_array->T_liveliness. ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time). (Bob, Dmitry, Laruence)
Squashed commit of the following:
commit
38e22106d4bdcc829dd2b64be1d3c6cdc089f3ed
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 15:12:19 2015 +0300
Added NEWS entry
commit
0a355935bfb10b5a4c893f4db9496ea8abbcf71b
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 15:06:32 2015 +0300
Inline function, to eliminate repeatable checks
commit
d937584f3aef0baae6001377b61fd700b6f36e14
Merge:
0341626 32677f5
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 14:35:49 2015 +0300
Merge branch 'master' into temporary_cleaning
* master:
Fixed bug #70006 (cli - function with default arg = STDOUT crash output).
Fix x86 build
Fixed use after free on closure_call_leak_with_exception.phpt
Fixed test
commit
0341626ea94a5e474c660732d33884460847d5e7
Merge:
74869fa dec35de
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 12:00:53 2015 +0300
Merge branch 'temporary_cleaning' of https://github.com/laruence/php-src into temporary_cleaning
* 'temporary_cleaning' of https://github.com/laruence/php-src:
Fixed checkpoint get
Fixed crash of invalid pointer derefer
cleanup
commit
74869fa67375b8daf772ac30b6b936fd2a2132c6
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 11:45:34 2015 +0300
Fixed wrong GOTO resolution
commit
dec35ded3294e3022e88a623188c3d1d71381675
Author: Xinchen Hui <laruence@gmail.com>
Date: Tue Jul 7 15:58:49 2015 +0800
Fixed checkpoint get
commit
b0f419540ad24c44810c9b05da046965618ffc65
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 10:47:11 2015 +0300
Fixed crash of invalid pointer derefer (laruence)
commit
7a428d98ca2899c5933914caa0cd17b4126e952c
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 10:35:47 2015 +0300
Fixed identation
commit
9c3a4dce9ce02034d19d28182aa9c1298d528daf
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 10:33:52 2015 +0300
Fixed invalid size
commit
653abc670b2a1f453b0fc3fc4a9eca919ee870cc
Author: Xinchen Hui <laruence@gmail.com>
Date: Tue Jul 7 11:29:14 2015 +0800
Fixed crash of invalid pointer derefer
commit
e04500ceda606ac4f364d03bcd562327bdc74eee
Author: Xinchen Hui <laruence@gmail.com>
Date: Tue Jul 7 11:28:26 2015 +0800
cleanup
commit
34183e1687681038e77b650078927b35ee84e933
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 04:49:46 2015 +0300
op_array->T_liveliness compression
commit
2f6ad845795a08c3d7ac219e9c42950565b20394
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 04:44:44 2015 +0300
White spaces
commit
be83f115a3f82a548c8d377c66574de5e5187410
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 04:42:26 2015 +0300
Identation
commit
1f5084b99038c374ac012b017c4d1652bb5d4222
Merge:
91b620d 1adf3df
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 04:41:54 2015 +0300
Merge branch 'master' into temporary_cleaning
* master:
Throw TypeError for invalid callback
Fix crash when exception occurs during nested rope
Fix crash when exception is thrown during ROPE_END
Small cleanup in ternary compilation
move the define to the right place
fix ext/ldap build
Rectify information about invalid shift warning being now ArithmeticError
commit
91b620d684c5a2296774432d5d0ff8f5d14397d6
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 04:32:04 2015 +0300
Replace GOTO by FREE/FE_FREE and JMP at compile time
commit
7052e5697918fab83d2975977c3392f7188fbc87
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Jul 7 02:25:08 2015 +0300
Use zend_regenerate_var_liveliness_info() to regenerate information after pass two.
commit
ae72b0dc6797815a846b8f95abccb36367422d27
Merge:
a81c4bb a919fe8
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Jul 6 21:02:34 2015 +0300
Merge branch 'master' into temporary_cleaning
* master:
Do not display EXT_TYPE_UNUSED in phpdbg opcodes
Run debug build with opcache on travis
commit
a81c4bb8c6f1ba8124a5a7636694480ff0f1328c
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Jul 6 20:59:34 2015 +0300
Improved algorithm. It's actually the same algorithm with second loop removed and simpler temporary data structures. The only difference may be in "re-defined" vatriable handling. Now live-range in that case started from the seconnd definition (this must be more safe).
commit
9a16810f7a7c10373603c5250d985616acf45e97
Merge:
bbfbe47 001ecd3
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Jul 6 17:57:45 2015 +0300
Merge branch 'master' into temporary_cleaning
* master:
Simplify TMP var number decoding (without HashTable)
commit
bbfbe470c865cb8b3cae8bf6518e6d06af525522
Merge:
0bda4ab 436b01e
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Jul 6 17:02:01 2015 +0300
Merge branch 'master' into temporary_cleaning
* master:
Avoid dangerous optimization
Fixed JMPZNZ instruction printing
Attempt at falling back on ldap_find_control for Mac OS
commit
0bda4abea7ba0a51c2ec125edb547645d0329792
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Jul 6 16:05:33 2015 +0300
Fixed live-range construction for OP_DATA opcode
Added comments about algorithm assumtions
commit
521ad9df98fdf1dd8b7c212799ddeb1a84483e6f
Merge:
4398dab a09dcb0
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Mon Jul 6 14:54:15 2015 +0200
Merge branch 'master' of https://github.com/php/php-src into temporary_cleaning
commit
4398dab82f9a5ce64df55b24988ce7d31e24074f
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Mon Jul 6 13:51:27 2015 +0200
Add a few phpt tests related to temporary cleaning
commit
739656f83ff5b570bb311d2c7cb2d72380a3c759
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Jul 6 14:28:49 2015 +0300
Fixed Zend/tests/foreach_004.phpt failure (FE_FETCH shouldn't be included into TMP vatriablr live range)
commit
3df462a2bcf5fa8f9244ea299178152a5d436277
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Jul 6 13:41:02 2015 +0300
Improve data layout (reduce the op_array structure size on 64-bit systems)
commit
883b73c56e6dab6489ae4cda2c1331b53a995586
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Jul 6 13:28:45 2015 +0300
Removed op_array->brk_cont_array
commit
ae5e58b59843513505e84e396c1446ac35cb1b94
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Mon Jul 6 04:22:58 2015 +0200
Fix bug with brk_cont variable free / free loop vars via temporary liveliness info
commit
b4223ca62771e1003c9ab778a09a177ad71e6d57
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Mon Jul 6 04:07:07 2015 +0200
Fix bugs / cleanup fixes
commit
ea33189d220c7fc0884848571635abe3cddd2f4d
Author: Xinchen Hui <laruence@gmail.com>
Date: Sun Jul 5 20:58:38 2015 +0800
Removed useless TsTop
commit
1dbb007e4addba9ac3bfc227db27a651cbcf5ede
Merge:
550bbf8 3a8af24
Author: Xinchen Hui <laruence@gmail.com>
Date: Sat Jul 4 15:06:44 2015 +0800
Merge branch 'temporary_cleaning' of https://github.com/dstogov/php-src into temporary_cleaning
commit
3a8af245290ceb507108340831254672f24022fa
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 3 16:15:36 2015 +0300
More exceptions from regular liveliness analyses (with explanation in comments).
Mark old "unexplained" exceptions with ???.
commit
ba721efa2cbd2136668fec956ef3b034ac1a29d6
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 3 14:16:09 2015 +0300
Print list of live temp variables (at least for internal debugging)
commit
8d1f88fe91e62b4333703c58b871d85b66fb7b70
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 3 13:31:56 2015 +0300
Use op_array->T_liveliness to free incomplete ropes and restore error_reporting level on exception
commit
80c1d0d779e6e9609a211907838f3727aa7b301a
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Jul 3 11:05:39 2015 +0300
Don't keep empty T_liveliness
commit
501ae8aaac0a92368b50e9f342b04d7334d263f6
Author: Dmitry Stogov <dmitry@zend.com>
Date: Thu Jul 2 22:31:48 2015 +0300
Reverted changes to Zend/zend_arena.h.
Reuse CG(arena) instead of creating a new one.
commit
a4fce36907147df5ac1af78b44135e3f07c1844c
Merge:
6ff7246 fd0fcce
Author: Dmitry Stogov <dmitry@zend.com>
Date: Thu Jul 2 22:01:42 2015 +0300
Merge branch 'temporary_cleaning' of github.com:bwoebi/php-src into temporary_cleaning
* 'temporary_cleaning' of github.com:bwoebi/php-src:
Fix remaining issues with compacted temporaries
Fix regression from last commit (+1 ?!)
Fix off-by-one (opcache may remove last ZEND_RETURN)
Speed algorithm up, more fail safety when reusing temporaries
Dumb bug in opcode.c (forgot to update Ts[i])
Fix opcache support
Exempt ROPE temporaries from freeing
Hmm, we need temporary info for all the opcodes
Add opcache support for cleaning in optimization step (Opcache seems to have a few unrelated issues which blow up together with that patch)
Add proper temporary cleaning upon frame abortion
Fix arena on small sizes (size < sizeof(zend_arena))
commit
fd0fcce81177717f3a05ac87192b5ed05eead0a1
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Thu Jul 2 20:00:33 2015 +0200
Fix remaining issues with compacted temporaries
commit
427dc58bbb93022d1c2077f874afcdb9dd82d5c5
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Wed Jul 1 22:49:12 2015 +0200
Fix regression from last commit (+1 ?!)
commit
1adcf56a6e9f09e7ad06331d4d6280035b17a7d1
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Wed Jul 1 22:17:07 2015 +0200
Fix off-by-one (opcache may remove last ZEND_RETURN)
commit
25b231b7841fa4078c65976cabdd843845a6cbe6
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Wed Jul 1 20:59:24 2015 +0200
Speed algorithm up, more fail safety when reusing temporaries
commit
22d9d05350e35d180018d0bccbad6f173cb4797d
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Wed Jul 1 16:48:46 2015 +0200
Dumb bug in opcode.c (forgot to update Ts[i])
commit
6538269bfa5bcbad34fc2f051b0fd5e4ebf2ff00
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Wed Jul 1 13:05:52 2015 +0200
Fix opcache support
commit
333a7c4a8813a45dc79ce55b8e9c0a0b98671e13
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Sat Jun 27 22:40:21 2015 +0200
Exempt ROPE temporaries from freeing
commit
02585f77085427baea48448c134a96c542af3337
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Fri Jun 26 16:20:55 2015 +0200
Hmm, we need temporary info for all the opcodes
commit
cbcaedbd78199897e5cacffd700b706f21590abf
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Fri Jun 26 01:04:09 2015 +0200
Add opcache support for cleaning in optimization step
(Opcache seems to have a few unrelated issues which blow up together with that patch)
commit
fef649f4067823a1f96f85340cf715e5877310bc
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Fri Jun 26 01:02:27 2015 +0200
Add proper temporary cleaning upon frame abortion
commit
1cec2e7271b789b84601f8acf385950af1bb0c7c
Author: Bob Weinand <bobwei9@hotmail.com>
Date: Thu Jun 25 23:33:21 2015 +0200
Fix arena on small sizes (size < sizeof(zend_arena))
Xinchen Hui [Tue, 7 Jul 2015 11:21:54 +0000 (19:21 +0800)]
Merge branch 'master' of git.php.net:php-src
Xinchen Hui [Tue, 7 Jul 2015 11:21:02 +0000 (19:21 +0800)]
Fixed bug #70006 (cli - function with default arg = STDOUT crash output).
Kalle Sommer Nielsen [Tue, 7 Jul 2015 10:43:58 +0000 (12:43 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Tue, 7 Jul 2015 10:41:05 +0000 (12:41 +0200)]
Fix x86 build
Xinchen Hui [Tue, 7 Jul 2015 10:19:57 +0000 (18:19 +0800)]
Fixed use after free on closure_call_leak_with_exception.phpt
Dmitry Stogov [Tue, 7 Jul 2015 07:14:37 +0000 (10:14 +0300)]
Fixed test
Stanislav Malyshev [Tue, 7 Jul 2015 07:01:42 +0000 (00:01 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Better fix for bug #69958