]>
granicus.if.org Git - php/log
Sara Golemon [Tue, 13 Dec 2016 05:44:07 +0000 (21:44 -0800)]
Include unistd.h for getpid()
Sara Golemon [Tue, 13 Dec 2016 05:35:05 +0000 (21:35 -0800)]
Compilation warning fix
u_strFromUTF8() argument dst_len should be int32_t, not uint32_t
Andrey Hristov [Mon, 12 Dec 2016 20:00:30 +0000 (22:00 +0200)]
Merge branch 'PHP-7.1'
Andrey Hristov [Mon, 12 Dec 2016 19:59:29 +0000 (21:59 +0200)]
Optimized memory handling of BIT fields. Less memory copies and less
memory usage.
Andrey Hristov [Mon, 12 Dec 2016 19:53:05 +0000 (21:53 +0200)]
Merge branch 'PHP-7.1'
Andrey Hristov [Mon, 12 Dec 2016 19:52:59 +0000 (21:52 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrey Hristov [Mon, 12 Dec 2016 19:52:36 +0000 (21:52 +0200)]
Add a bit more test cases (edge cases) to the BIT test case
Andrey Hristov [Mon, 12 Dec 2016 19:29:12 +0000 (21:29 +0200)]
Merge branch 'PHP-7.1'
Andrey Hristov [Mon, 12 Dec 2016 19:29:06 +0000 (21:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrey Hristov [Mon, 12 Dec 2016 19:28:33 +0000 (21:28 +0200)]
Add a test case to test fetching of multiple rows with bit values.
Andrey Hristov [Mon, 12 Dec 2016 19:17:25 +0000 (21:17 +0200)]
Merge branch 'PHP-7.1'
Andrey Hristov [Mon, 12 Dec 2016 19:12:44 +0000 (21:12 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrey Hristov [Mon, 12 Dec 2016 19:11:02 +0000 (21:11 +0200)]
Fix off by 1 problem.
The problem was manifestated only with BIT columns and only when more than
one row was fetched. The problem was coming from the fact that in pre-7.0
times mysqlnd was using a no-copy optimization. This optimization kept the
strings (and also the BIT mask equivalents as strings) in the packet and the
zval referred to them. 7.0+ zvals cannot use no-copy and always copy. Because
of this the allocated memory for the packet was reduced by 1 by the person who
ported the driver, but the starting address of the bit area wasn't reduced.
Because of this the bit_area started at wrong address and the length decoded
wrong.
Leigh [Mon, 12 Dec 2016 16:17:45 +0000 (16:17 +0000)]
Merge PR #2154 - Remove ext/mcrypt
Remi Collet [Mon, 12 Dec 2016 15:27:37 +0000 (16:27 +0100)]
Minor fix macro value
[] results in /**/ which can break some test
e.g. https://github.com/m6w6/ext-http/commit/
d9ba7726f77858e626d67d758a87c9caa6f38d2b
Remi Collet [Mon, 12 Dec 2016 15:26:48 +0000 (16:26 +0100)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src: (165 commits)
Add missing NEWS entry
Increased number of reserved resources (from 4 to 6)
Fixed compilation error
Improved VM stack unwinding on exception. Now zend_throw_exception_hook() is going to be called only when exception is actually thrown and not going to be recalled for each unwinded finction.
better way to get ACP
adapt patch for 7.1
fix datatype for zpp, yet a followup on bug #73679
Update to SQLite 3.15.2
update NEWS
update NEWS
improve fix for bug #73679 with new capabilities available
Fixed bug #73679 DOTNET read access violation using invalid codepage
Fix T_NUM_STRING negation
fix leaking streams and memory mapped files
extend errno mapping
Fixed tests
Update NEWS
Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)
Revert "Refix bug #73686"
Refix bug #73686
...
Leigh [Mon, 12 Dec 2016 12:23:50 +0000 (12:23 +0000)]
Merge branch 'master' into remove-mcrypt
Christoph M. Becker [Mon, 12 Dec 2016 11:31:09 +0000 (12:31 +0100)]
Add missing NEWS entry
Dmitry Stogov [Mon, 12 Dec 2016 08:51:12 +0000 (11:51 +0300)]
Increased number of reserved resources (from 4 to 6)
Dmitry Stogov [Mon, 12 Dec 2016 08:19:04 +0000 (11:19 +0300)]
Fixed compilation error
Dmitry Stogov [Mon, 12 Dec 2016 07:55:32 +0000 (10:55 +0300)]
Improved VM stack unwinding on exception.
Now zend_throw_exception_hook() is going to be called only when exception is actually thrown and not going to be recalled for each unwinded finction.
Anatol Belski [Mon, 12 Dec 2016 00:57:31 +0000 (01:57 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
better way to get ACP
Anatol Belski [Mon, 12 Dec 2016 00:56:44 +0000 (01:56 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
better way to get ACP
Anatol Belski [Mon, 12 Dec 2016 00:54:22 +0000 (01:54 +0100)]
better way to get ACP
Anatol Belski [Mon, 12 Dec 2016 00:51:17 +0000 (01:51 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
adapt patch for 7.1
Anatol Belski [Mon, 12 Dec 2016 00:50:15 +0000 (01:50 +0100)]
adapt patch for 7.1
Anatol Belski [Mon, 12 Dec 2016 00:29:59 +0000 (01:29 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix datatype for zpp, yet a followup on bug #73679
Anatol Belski [Mon, 12 Dec 2016 00:29:23 +0000 (01:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix datatype for zpp, yet a followup on bug #73679
Anatol Belski [Mon, 12 Dec 2016 00:26:06 +0000 (01:26 +0100)]
fix datatype for zpp, yet a followup on bug #73679
Christoph M. Becker [Sun, 11 Dec 2016 17:48:05 +0000 (18:48 +0100)]
Update to SQLite 3.15.2
Anatol Belski [Sun, 11 Dec 2016 16:40:54 +0000 (17:40 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS
Anatol Belski [Sun, 11 Dec 2016 16:40:22 +0000 (17:40 +0100)]
update NEWS
Anatol Belski [Sun, 11 Dec 2016 16:39:54 +0000 (17:39 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Sun, 11 Dec 2016 16:39:08 +0000 (17:39 +0100)]
update NEWS
Anatol Belski [Sun, 11 Dec 2016 16:27:11 +0000 (17:27 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
improve fix for bug #73679 with new capabilities available
Anatol Belski [Sun, 11 Dec 2016 16:25:48 +0000 (17:25 +0100)]
improve fix for bug #73679 with new capabilities available
Anatol Belski [Sun, 11 Dec 2016 16:09:04 +0000 (17:09 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73679 DOTNET read access violation using invalid codepage
Anatol Belski [Sun, 11 Dec 2016 16:07:57 +0000 (17:07 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73679 DOTNET read access violation using invalid codepage
Anatol Belski [Sun, 11 Dec 2016 16:06:55 +0000 (17:06 +0100)]
Fixed bug #73679 DOTNET read access violation using invalid codepage
Nikita Popov [Sun, 11 Dec 2016 12:34:28 +0000 (13:34 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 11 Dec 2016 12:31:37 +0000 (13:31 +0100)]
Fix T_NUM_STRING negation
T_NUM_STRING follows the rules of symtable numeric string
conversion. If the offset isn't an integer under those rules, it
is treated as a string. This should apply to negated T_NUM_STRINGs
as well.
Anatol Belski [Sun, 11 Dec 2016 01:52:02 +0000 (02:52 +0100)]
fix leaking streams and memory mapped files
Anatol Belski [Sat, 10 Dec 2016 10:18:34 +0000 (11:18 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
extend errno mapping
Anatol Belski [Sat, 10 Dec 2016 10:17:07 +0000 (11:17 +0100)]
extend errno mapping
Xinchen Hui [Sat, 10 Dec 2016 08:43:38 +0000 (16:43 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed tests
Xinchen Hui [Sat, 10 Dec 2016 08:43:17 +0000 (16:43 +0800)]
Fixed tests
Xinchen Hui [Fri, 9 Dec 2016 14:39:51 +0000 (22:39 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Xinchen Hui [Fri, 9 Dec 2016 14:39:42 +0000 (22:39 +0800)]
Update NEWS
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'