]>
granicus.if.org Git - php/log
Xinchen Hui [Fri, 9 Dec 2016 14:30:41 +0000 (22:30 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)
Revert "Refix bug #73686"
Xinchen Hui [Fri, 9 Dec 2016 14:30:24 +0000 (22:30 +0800)]
Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)
Xinchen Hui [Fri, 9 Dec 2016 14:22:59 +0000 (22:22 +0800)]
Revert "Refix bug #73686"
This reverts commit
4589386026dbf15d980ba0c7c92dc587cead15e8.
Xinchen Hui [Fri, 9 Dec 2016 08:43:45 +0000 (16:43 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Refix bug #73686
Xinchen Hui [Fri, 9 Dec 2016 08:37:22 +0000 (16:37 +0800)]
Refix bug #73686
Xinchen Hui [Fri, 9 Dec 2016 07:56:41 +0000 (15:56 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73646 (mb_ereg_search_init null pointer dereference)
Xinchen Hui [Fri, 9 Dec 2016 07:55:07 +0000 (15:55 +0800)]
Fixed bug #73646 (mb_ereg_search_init null pointer dereference)
Xinchen Hui [Fri, 9 Dec 2016 03:42:11 +0000 (11:42 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73686 (Adding settype()ed values to ArrayObject results in references)
Xinchen Hui [Fri, 9 Dec 2016 03:41:26 +0000 (11:41 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
fix uninitialized member
Xinchen Hui [Fri, 9 Dec 2016 03:41:08 +0000 (11:41 +0800)]
Fixed bug #73686 (Adding settype()ed values to ArrayObject results in references)
Anatol Belski [Thu, 8 Dec 2016 16:18:06 +0000 (17:18 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix uninitialized member
Anatol Belski [Thu, 8 Dec 2016 16:16:48 +0000 (17:16 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix uninitialized member
Anatol Belski [Thu, 8 Dec 2016 16:15:06 +0000 (17:15 +0100)]
fix uninitialized member
Xinchen Hui [Thu, 8 Dec 2016 14:05:17 +0000 (22:05 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed possible false assertion failure
Xinchen Hui [Thu, 8 Dec 2016 14:04:43 +0000 (22:04 +0800)]
Fixed possible false assertion failure
Dmitry Stogov [Thu, 8 Dec 2016 10:37:57 +0000 (13:37 +0300)]
Regenerated zend_vm_execute.h (fixed white spaces)
Ferenc Kovacs [Thu, 8 Dec 2016 06:12:07 +0000 (07:12 +0100)]
Merge branch 'PHP-7.1'
Ferenc Kovacs [Thu, 8 Dec 2016 06:11:11 +0000 (07:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Thu, 8 Dec 2016 06:09:41 +0000 (07:09 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 8 Dec 2016 06:05:32 +0000 (07:05 +0100)]
update NEWS
Kalle Sommer Nielsen [Thu, 8 Dec 2016 02:50:31 +0000 (03:50 +0100)]
Disable C4101 warnings entirely on Windows
Anatol Belski [Thu, 8 Dec 2016 02:25:40 +0000 (03:25 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
git clean section
Anatol Belski [Thu, 8 Dec 2016 02:24:59 +0000 (03:24 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
git clean section
Anatol Belski [Thu, 8 Dec 2016 02:24:18 +0000 (03:24 +0100)]
git clean section
Nikita Popov [Wed, 7 Dec 2016 22:15:02 +0000 (23:15 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 7 Dec 2016 22:12:13 +0000 (23:12 +0100)]
Fix propagation of QM_ASSIGN into VERIFY_RETURN_TYPE
VERIFY_RETURN_TYPE uses different formats for the CONST/non-CONST
cases. If we progate a CONST operand into op1, op1 should be
moved to result.
Adam Baratz [Wed, 7 Dec 2016 22:10:36 +0000 (17:10 -0500)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Remove noop param hook
Clean up tabs and whitespace
Adam Baratz [Wed, 7 Dec 2016 22:02:50 +0000 (17:02 -0500)]
Remove noop param hook
Adam Baratz [Wed, 7 Dec 2016 22:01:37 +0000 (17:01 -0500)]
Clean up tabs and whitespace
Anatol Belski [Wed, 7 Dec 2016 20:24:56 +0000 (21:24 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS
Anatol Belski [Wed, 7 Dec 2016 20:24:16 +0000 (21:24 +0100)]
update NEWS
Anatol Belski [Wed, 7 Dec 2016 20:23:37 +0000 (21:23 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Wed, 7 Dec 2016 20:22:34 +0000 (21:22 +0100)]
update NEWS
Anatol Belski [Wed, 7 Dec 2016 20:18:42 +0000 (21:18 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement
Anatol Belski [Wed, 7 Dec 2016 20:07:14 +0000 (21:07 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement
Dorin Marcoci [Wed, 7 Dec 2016 20:06:11 +0000 (21:06 +0100)]
Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement
Johannes Schlüter [Wed, 7 Dec 2016 16:50:40 +0000 (17:50 +0100)]
Merge branch 'PHP-7.1'
Johannes Schlüter [Wed, 7 Dec 2016 16:50:05 +0000 (17:50 +0100)]
Install ext/json headers
Anatol Belski [Wed, 7 Dec 2016 15:05:43 +0000 (16:05 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix test compat with MySQL 5.7
Anatol Belski [Wed, 7 Dec 2016 15:04:47 +0000 (16:04 +0100)]
fix test compat with MySQL 5.7
Christoph M. Becker [Wed, 7 Dec 2016 12:50:11 +0000 (13:50 +0100)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Wed, 7 Dec 2016 12:45:18 +0000 (13:45 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Markus Staab [Mon, 5 Dec 2016 19:57:03 +0000 (20:57 +0100)]
Fixed typo in skipif error message
Dmitry Stogov [Wed, 7 Dec 2016 12:13:00 +0000 (15:13 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Check if PHP is in execution state.
Dmitry Stogov [Wed, 7 Dec 2016 12:12:48 +0000 (15:12 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Check if PHP is in execution state.
Dmitry Stogov [Wed, 7 Dec 2016 12:10:59 +0000 (15:10 +0300)]
Check if PHP is in execution state.
Dmitry Stogov [Wed, 7 Dec 2016 11:20:43 +0000 (14:20 +0300)]
Fixed memory leaks caused by exceptions thrown from destructors (fixed test).
Dmitry Stogov [Tue, 6 Dec 2016 22:43:13 +0000 (01:43 +0300)]
Fixed memory leaks caused by exceptions thrown from destructors (one more case).
Dmitry Stogov [Tue, 6 Dec 2016 21:41:07 +0000 (00:41 +0300)]
Fixed memory leaks caused by exceptions thrown from destructors.
Nikita Popov [Tue, 6 Dec 2016 21:26:36 +0000 (22:26 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 6 Dec 2016 21:25:35 +0000 (22:25 +0100)]
Fix bug #73668
Not bothering to implement special handling to get an accurate
range for this case.
Nikita Popov [Tue, 6 Dec 2016 21:12:01 +0000 (22:12 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 6 Dec 2016 21:09:44 +0000 (22:09 +0100)]
Factor out common binary op code in range inference
Instead of repeating the same code for binary ops and their
compound assignment variants, factor the range computation out
into a separate function.
Anatol Belski [Tue, 6 Dec 2016 19:27:54 +0000 (20:27 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
Anatol Belski [Tue, 6 Dec 2016 19:26:40 +0000 (20:26 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Tue, 6 Dec 2016 19:25:27 +0000 (20:25 +0100)]
update NEWS
Bob Weinand [Tue, 6 Dec 2016 17:30:50 +0000 (18:30 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Tue, 6 Dec 2016 17:30:37 +0000 (18:30 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Tue, 6 Dec 2016 17:27:31 +0000 (18:27 +0100)]
Fixed issue getting executable lines from custom wrappers
See also krakjoe/phpdbg#161
Anatol Belski [Tue, 6 Dec 2016 15:20:14 +0000 (16:20 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix leak, take 2
Anatol Belski [Tue, 6 Dec 2016 15:18:54 +0000 (16:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak, take 2
Anatol Belski [Tue, 6 Dec 2016 15:17:28 +0000 (16:17 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak, take 2
Anatol Belski [Tue, 6 Dec 2016 15:12:39 +0000 (16:12 +0100)]
fix leak, take 2
Anatol Belski [Tue, 6 Dec 2016 13:46:15 +0000 (14:46 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix leak, take on 7.x
Anatol Belski [Tue, 6 Dec 2016 13:44:04 +0000 (14:44 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak, take on 7.x
Anatol Belski [Tue, 6 Dec 2016 13:42:59 +0000 (14:42 +0100)]
fix leak, take on 7.x
Anatol Belski [Tue, 6 Dec 2016 13:39:00 +0000 (14:39 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix leak, take on 5.6
Anatol Belski [Tue, 6 Dec 2016 13:37:58 +0000 (14:37 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak, take on 5.6
Anatol Belski [Tue, 6 Dec 2016 13:36:52 +0000 (14:36 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak, take on 5.6
Anatol Belski [Tue, 6 Dec 2016 13:34:27 +0000 (14:34 +0100)]
fix leak, take on 5.6
Xinchen Hui [Tue, 6 Dec 2016 09:33:27 +0000 (17:33 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
Xinchen Hui [Tue, 6 Dec 2016 09:33:15 +0000 (17:33 +0800)]
Update NEWS
Xinchen Hui [Tue, 6 Dec 2016 09:32:48 +0000 (17:32 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
Xinchen Hui [Tue, 6 Dec 2016 09:17:59 +0000 (17:17 +0800)]
Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
Dmitry Stogov [Tue, 6 Dec 2016 07:21:44 +0000 (10:21 +0300)]
COALESCE can't throw exception
Dmitry Stogov [Tue, 6 Dec 2016 07:01:38 +0000 (10:01 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Micro optimizations
Dmitry Stogov [Tue, 6 Dec 2016 07:01:18 +0000 (10:01 +0300)]
Micro optimizations
Stanislav Malyshev [Tue, 6 Dec 2016 06:33:47 +0000 (22:33 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
Stanislav Malyshev [Tue, 6 Dec 2016 06:33:42 +0000 (22:33 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
Stanislav Malyshev [Tue, 6 Dec 2016 06:33:33 +0000 (22:33 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
Stanislav Malyshev [Tue, 6 Dec 2016 06:32:59 +0000 (22:32 -0800)]
This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
Stanislav Malyshev [Tue, 6 Dec 2016 06:16:48 +0000 (22:16 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #73645 - int/size_t confusion
Stanislav Malyshev [Tue, 6 Dec 2016 06:16:42 +0000 (22:16 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #73645 - int/size_t confusion
Stanislav Malyshev [Tue, 6 Dec 2016 06:16:00 +0000 (22:16 -0800)]
Fix bug #73645 - int/size_t confusion
Stanislav Malyshev [Tue, 6 Dec 2016 05:59:17 +0000 (21:59 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
Stanislav Malyshev [Tue, 6 Dec 2016 05:59:10 +0000 (21:59 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
Stanislav Malyshev [Tue, 6 Dec 2016 05:58:55 +0000 (21:58 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
Stanislav Malyshev [Tue, 6 Dec 2016 05:40:55 +0000 (21:40 -0800)]
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
Nikita Popov [Mon, 5 Dec 2016 19:41:21 +0000 (20:41 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Mon, 5 Dec 2016 19:39:45 +0000 (20:39 +0100)]
Fix bug #73654
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.
projects / php / log