]>
granicus.if.org Git - php/log
Dmitry Stogov [Mon, 5 Dec 2016 18:50:06 +0000 (21:50 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Dmitry Stogov [Mon, 5 Dec 2016 18:49:09 +0000 (21:49 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Dmitry Stogov [Mon, 5 Dec 2016 18:45:08 +0000 (21:45 +0300)]
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Bob Weinand [Sat, 3 Dec 2016 16:34:02 +0000 (17:34 +0100)]
Use an inline handler instead of repeating logic for calling assign op helpers each time
Anatol Belski [Sun, 4 Dec 2016 21:46:23 +0000 (22:46 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix test
Anatol Belski [Sun, 4 Dec 2016 21:45:31 +0000 (22:45 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test
Anatol Belski [Sun, 4 Dec 2016 21:42:39 +0000 (22:42 +0100)]
fix test
This test depends on connection flags modifable from teh env,
that can affect the exact function called.
Anatol Belski [Sun, 4 Dec 2016 21:29:33 +0000 (22:29 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix test
Anatol Belski [Sun, 4 Dec 2016 21:28:34 +0000 (22:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test
Anatol Belski [Sun, 4 Dec 2016 21:27:17 +0000 (22:27 +0100)]
fix test
On Windows, either doubled backslashes or forward slashes are supported
on the server side.
Anatol Belski [Sun, 4 Dec 2016 20:00:34 +0000 (21:00 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix ident
Anatol Belski [Sun, 4 Dec 2016 19:59:56 +0000 (20:59 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix ident
Anatol Belski [Sun, 4 Dec 2016 19:59:12 +0000 (20:59 +0100)]
fix ident
Anatol Belski [Sun, 4 Dec 2016 16:30:03 +0000 (17:30 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix test
Anatol Belski [Sun, 4 Dec 2016 16:29:22 +0000 (17:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test
Anatol Belski [Sun, 4 Dec 2016 16:28:43 +0000 (17:28 +0100)]
fix test
Anatol Belski [Sun, 4 Dec 2016 13:03:17 +0000 (14:03 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
enforce the test ini usage for the child process
Fix session upgrade documentation
Anatol Belski [Sun, 4 Dec 2016 13:02:37 +0000 (14:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
enforce the test ini usage for the child process
Anatol Belski [Sun, 4 Dec 2016 13:01:40 +0000 (14:01 +0100)]
enforce the test ini usage for the child process
Yasuo Ohgaki [Sun, 4 Dec 2016 08:48:55 +0000 (17:48 +0900)]
Merge branch 'pull-request/2228' into PHP-7.1
* pull-request/2228:
Fix session upgrade documentation
Tobias Schultze [Sun, 4 Dec 2016 06:33:29 +0000 (07:33 +0100)]
Fix session upgrade documentation
Bob Weinand [Sat, 3 Dec 2016 22:44:44 +0000 (23:44 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Sat, 3 Dec 2016 22:42:29 +0000 (23:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 3 Dec 2016 22:37:23 +0000 (23:37 +0100)]
Fix PHP-7.0 build (wrong fix for the branch)
Anatol Belski [Sat, 3 Dec 2016 19:05:17 +0000 (20:05 +0100)]
add pragma
Anatol Belski [Sat, 3 Dec 2016 19:04:18 +0000 (20:04 +0100)]
suffix CS
Bob Weinand [Sat, 3 Dec 2016 17:29:11 +0000 (18:29 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Sat, 3 Dec 2016 17:28:47 +0000 (18:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 3 Dec 2016 17:23:58 +0000 (18:23 +0100)]
Fix leak when using $this outside of object context
Anatol Belski [Sat, 3 Dec 2016 14:44:36 +0000 (15:44 +0100)]
Improve multiplication on x64.
Thanks Bob for the spot.
Christoph M. Becker [Sat, 3 Dec 2016 13:20:00 +0000 (14:20 +0100)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Sat, 3 Dec 2016 13:18:56 +0000 (14:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 3 Dec 2016 13:18:00 +0000 (14:18 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Adrien Crivelli [Wed, 30 Nov 2016 09:19:35 +0000 (18:19 +0900)]
Fix minor typo
Yasuo Ohgaki [Sat, 3 Dec 2016 05:23:35 +0000 (14:23 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix typo in php.ini-* comment
Yasuo Ohgaki [Sat, 3 Dec 2016 05:23:05 +0000 (14:23 +0900)]
Fix typo in php.ini-* comment
Nikita Popov [Fri, 2 Dec 2016 16:04:20 +0000 (17:04 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 2 Dec 2016 16:03:59 +0000 (17:03 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 2 Dec 2016 16:03:05 +0000 (17:03 +0100)]
Fix leak in shift_right_function
Bob Weinand [Fri, 2 Dec 2016 14:42:31 +0000 (15:42 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Fri, 2 Dec 2016 14:42:19 +0000 (15:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Fri, 2 Dec 2016 14:41:47 +0000 (15:41 +0100)]
Fix test of wrong operator in self_xor.phpt
Dmitry Stogov [Fri, 2 Dec 2016 13:04:18 +0000 (16:04 +0300)]
Eliminated useless exception check
Dmitry Stogov [Fri, 2 Dec 2016 12:58:47 +0000 (15:58 +0300)]
Eliminated useless exception checks (FE_RESET with array argument can't throw exception)
Dmitry Stogov [Fri, 2 Dec 2016 12:40:11 +0000 (15:40 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Eliminated useless exception check
Dmitry Stogov [Fri, 2 Dec 2016 12:40:04 +0000 (15:40 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Eliminated useless exception check
Dmitry Stogov [Fri, 2 Dec 2016 12:39:33 +0000 (15:39 +0300)]
Eliminated useless exception check
Dmitry Stogov [Fri, 2 Dec 2016 12:14:48 +0000 (15:14 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Dmitry Stogov [Fri, 2 Dec 2016 12:14:37 +0000 (15:14 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Dmitry Stogov [Fri, 2 Dec 2016 12:13:55 +0000 (15:13 +0300)]
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Dmitry Stogov [Fri, 2 Dec 2016 11:00:50 +0000 (14:00 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed behavior of failing compound assignments (they shouldn't change the source value).
Dmitry Stogov [Fri, 2 Dec 2016 11:00:29 +0000 (14:00 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value).
Dmitry Stogov [Fri, 2 Dec 2016 10:58:44 +0000 (13:58 +0300)]
Fixed behavior of failing compound assignments (they shouldn't change the source value).
Davey Shafik [Fri, 2 Dec 2016 10:31:31 +0000 (02:31 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Bump versions and NEWS for 7.1.1-dev
Davey Shafik [Fri, 2 Dec 2016 10:14:51 +0000 (02:14 -0800)]
Bump versions and NEWS for 7.1.1-dev
Dmitry Stogov [Fri, 2 Dec 2016 09:36:02 +0000 (12:36 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed possible memory leak in &=, |=, ^=.
Dmitry Stogov [Fri, 2 Dec 2016 09:35:44 +0000 (12:35 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed possible memory leak in &=, |=, ^=.
Dmitry Stogov [Fri, 2 Dec 2016 09:34:46 +0000 (12:34 +0300)]
Fixed possible memory leak in &=, |=, ^=.
Dmitry Stogov [Fri, 2 Dec 2016 08:58:41 +0000 (11:58 +0300)]
Revert "Fix return value memory leaks upon exceptions in opcode operand freeing"
This reverts commit
9ad9d7ae375a6e8847ceaab287d3d23e0963a06e.
Dmitry Stogov [Fri, 2 Dec 2016 08:58:36 +0000 (11:58 +0300)]
Revert "Fix memory leaks with FE_RESET upon empty iterator"
This reverts commit
00e516e57549f29387ef858de7847e7e4ca0c1c0.
Dmitry Stogov [Fri, 2 Dec 2016 08:58:33 +0000 (11:58 +0300)]
Revert "Fix accidental zval_ptr_dtor()ing of object"
This reverts commit
ae2f68d8a5868e90583765aca86c501f27664ef9.
Dmitry Stogov [Fri, 2 Dec 2016 08:58:25 +0000 (11:58 +0300)]
Revert "Fix a few valgrind warnings with undefing result"
This reverts commit
8f4e100f21b06e745e56f55ce49c248442f8e642.
Bob Weinand [Thu, 1 Dec 2016 14:22:03 +0000 (15:22 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Thu, 1 Dec 2016 14:21:49 +0000 (15:21 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Thu, 1 Dec 2016 14:21:28 +0000 (15:21 +0100)]
Fix valgrind issue when throwing due to yield from aborted generator
Anatol Belski [Thu, 1 Dec 2016 13:54:21 +0000 (14:54 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fork tests
Anatol Belski [Thu, 1 Dec 2016 13:53:22 +0000 (14:53 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fork tests
Anatol Belski [Thu, 1 Dec 2016 13:52:18 +0000 (14:52 +0100)]
fork tests
Dmitry Stogov [Thu, 1 Dec 2016 13:22:32 +0000 (16:22 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bad merge
Dmitry Stogov [Thu, 1 Dec 2016 13:22:23 +0000 (16:22 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bad merge
Dmitry Stogov [Thu, 1 Dec 2016 13:21:57 +0000 (16:21 +0300)]
Fixed bad merge
Dmitry Stogov [Thu, 1 Dec 2016 12:51:16 +0000 (15:51 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Workaround for GCC-4.9.2 bug
oops, changed in wrong place
Dmitry Stogov [Thu, 1 Dec 2016 12:50:19 +0000 (15:50 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Workaround for GCC-4.9.2 bug
oops, changed in wrong place
Dmitry Stogov [Thu, 1 Dec 2016 12:50:05 +0000 (15:50 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Workaround for GCC-4.9.2 bug
oops, changed in wrong place
Dmitry Stogov [Thu, 1 Dec 2016 12:46:52 +0000 (15:46 +0300)]
Workaround for GCC-4.9.2 bug
Anatol Belski [Thu, 1 Dec 2016 12:34:20 +0000 (13:34 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix condition
improve skipif
Anatol Belski [Thu, 1 Dec 2016 12:33:42 +0000 (13:33 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
improve skipif
Anatol Belski [Thu, 1 Dec 2016 12:33:27 +0000 (13:33 +0100)]
fix condition
Anatol Belski [Thu, 1 Dec 2016 12:32:10 +0000 (13:32 +0100)]
improve skipif
Anatol Belski [Thu, 1 Dec 2016 12:26:09 +0000 (13:26 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
improve skipif
Anatol Belski [Thu, 1 Dec 2016 12:25:28 +0000 (13:25 +0100)]
improve skipif
Dmitry Stogov [Thu, 1 Dec 2016 10:26:26 +0000 (13:26 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed access to uninitialized value
Dmitry Stogov [Thu, 1 Dec 2016 10:25:50 +0000 (13:25 +0300)]
Fixed access to uninitialized value
Bob Weinand [Thu, 1 Dec 2016 09:15:07 +0000 (10:15 +0100)]
Fix a few valgrind warnings with undefing result
Dmitry Stogov [Thu, 1 Dec 2016 07:34:18 +0000 (10:34 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Simpler overflow check
fix gcov coverage
Dmitry Stogov [Thu, 1 Dec 2016 07:34:09 +0000 (10:34 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Simpler overflow check
fix gcov coverage
Dmitry Stogov [Thu, 1 Dec 2016 07:30:02 +0000 (10:30 +0300)]
Simpler overflow check
Anatol Belski [Thu, 1 Dec 2016 00:37:24 +0000 (01:37 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix dir separator
Update NEWS for the build
Anatol Belski [Thu, 1 Dec 2016 00:36:29 +0000 (01:36 +0100)]
fix dir separator
Davey Shafik [Wed, 30 Nov 2016 23:05:45 +0000 (15:05 -0800)]
Update NEWS for the build
Bob Weinand [Wed, 30 Nov 2016 22:57:22 +0000 (23:57 +0100)]
Fix accidental zval_ptr_dtor()ing of object
Nuno Lopes [Wed, 30 Nov 2016 19:41:26 +0000 (14:41 -0500)]
Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0
Bob Weinand [Mon, 28 Nov 2016 22:16:24 +0000 (23:16 +0100)]
Fix memory leaks with FE_RESET upon empty iterator
Solved by manually freeing and jumping to the opcode *after* FE_FREE
Bob Weinand [Mon, 28 Nov 2016 22:14:38 +0000 (23:14 +0100)]
Fix return value memory leaks upon exceptions in opcode operand freeing
Bob Weinand [Wed, 30 Nov 2016 10:45:36 +0000 (11:45 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Wed, 30 Nov 2016 10:45:18 +0000 (11:45 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Wed, 30 Nov 2016 10:44:10 +0000 (11:44 +0100)]
Fix run-tests.php to always include TEST_PHPDBG_EXECUTABLE if phpdbg available
Anatol Belski [Wed, 30 Nov 2016 10:09:15 +0000 (11:09 +0100)]
add skipif
Bob Weinand [Wed, 30 Nov 2016 01:57:34 +0000 (02:57 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Wed, 30 Nov 2016 01:57:16 +0000 (02:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
projects / php / log