1
0
mirror of https://github.com/php/php-src.git synced 2026-03-29 19:52:20 +02:00
Commit Graph

99254 Commits

Author SHA1 Message Date
Andrey Hristov
3836c2faac Merge branch 'PHP-7.0' into PHP-7.1 2016-12-12 21:52:59 +02:00
Andrey Hristov
13fc1b92ca Add a bit more test cases (edge cases) to the BIT test case 2016-12-12 21:52:36 +02:00
Andrey Hristov
d494e19701 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-12 21:29:06 +02:00
Andrey Hristov
a881ea7d86 Add a test case to test fetching of multiple rows with bit values. 2016-12-12 21:28:33 +02:00
Andrey Hristov
2819a28ac3 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-12 21:12:44 +02:00
Andrey Hristov
e15c418c4c 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.
2016-12-12 21:11:02 +02:00
Anatol Belski
d9fc5ea6ec Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  better way to get ACP
2016-12-12 01:56:44 +01:00
Anatol Belski
7a8774ade4 better way to get ACP 2016-12-12 01:54:22 +01:00
Anatol Belski
8199e5a7e9 adapt patch for 7.1 2016-12-12 01:50:15 +01:00
Anatol Belski
e53f967ed7 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix datatype for zpp, yet a followup on bug #73679
2016-12-12 01:29:23 +01:00
Anatol Belski
3473b519c0 fix datatype for zpp, yet a followup on bug #73679 2016-12-12 01:26:06 +01:00
Anatol Belski
ae91cfacdb update NEWS 2016-12-11 17:40:22 +01:00
Anatol Belski
8f6b975130 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
2016-12-11 17:39:54 +01:00
Anatol Belski
ee2625e252 update NEWS 2016-12-11 17:39:08 +01:00
Anatol Belski
e6e5f06c78 improve fix for bug #73679 with new capabilities available 2016-12-11 17:25:48 +01:00
Anatol Belski
fb92116a5a Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #73679 DOTNET read access violation using invalid codepage
2016-12-11 17:07:57 +01:00
Anatol Belski
1d80fb2cdb Fixed bug #73679 DOTNET read access violation using invalid codepage 2016-12-11 17:06:55 +01:00
Nikita Popov
2c70581338 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.
2016-12-11 13:33:25 +01:00
Anatol Belski
8b82e2c2fe extend errno mapping 2016-12-10 11:17:07 +01:00
Xinchen Hui
0ad804ec9b Fixed tests 2016-12-10 16:43:17 +08:00
Xinchen Hui
4eb4ec2cb1 Update NEWS 2016-12-09 22:39:42 +08:00
Xinchen Hui
09b36113b0 Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest) 2016-12-09 22:30:24 +08:00
Xinchen Hui
6812721ef2 Revert "Refix bug #73686"
This reverts commit 4589386026.
2016-12-09 22:22:59 +08:00
Xinchen Hui
4589386026 Refix bug #73686 2016-12-09 16:37:22 +08:00
Xinchen Hui
6a43c61bcd Fixed bug #73646 (mb_ereg_search_init null pointer dereference) 2016-12-09 15:55:07 +08:00
Xinchen Hui
4faa540b45 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
2016-12-09 11:41:26 +08:00
Xinchen Hui
68bdd6d018 Fixed bug #73686 (Adding settype()ed values to ArrayObject results in references) 2016-12-09 11:41:08 +08:00
Anatol Belski
d46972b6ae Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix uninitialized member
2016-12-08 17:16:48 +01:00
Anatol Belski
66ad7918b8 fix uninitialized member 2016-12-08 17:15:06 +01:00
Xinchen Hui
8250b3fca1 Fixed possible false assertion failure 2016-12-08 22:04:43 +08:00
Ferenc Kovacs
f8ea3e3e4c Merge branch 'PHP-7.0' into PHP-7.1 2016-12-08 07:11:11 +01:00
Ferenc Kovacs
a4d6d16b3b Merge branch 'PHP-5.6' into PHP-7.0 2016-12-08 07:09:41 +01:00
Ferenc Kovacs
60da307c61 update NEWS 2016-12-08 07:05:32 +01:00
Anatol Belski
394a3593cc Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  git clean section
2016-12-08 03:24:59 +01:00
Anatol Belski
ff6565462e git clean section 2016-12-08 03:24:18 +01:00
Nikita Popov
60249f4390 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.
2016-12-07 23:14:46 +01:00
Adam Baratz
5a20d83be8 Remove noop param hook 2016-12-07 17:09:09 -05:00
Adam Baratz
e133a2dd78 Clean up tabs and whitespace 2016-12-07 17:08:51 -05:00
Anatol Belski
8e40fdd37c update NEWS 2016-12-07 21:24:16 +01:00
Anatol Belski
68d119bcdb Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
2016-12-07 21:23:37 +01:00
Anatol Belski
73fb2192d2 update NEWS 2016-12-07 21:22:34 +01:00
Anatol Belski
67b7c5055c 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
2016-12-07 21:07:14 +01:00
Dorin Marcoci
13ffa88e1f Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement 2016-12-07 21:06:11 +01:00
Johannes Schlüter
54f526be89 Install ext/json headers 2016-12-07 17:50:05 +01:00
Anatol Belski
5b3e36fe78 fix test compat with MySQL 5.7 2016-12-07 16:04:47 +01:00
Christoph M. Becker
00ee42e385 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-07 13:45:18 +01:00
Markus Staab
dd77116fb0 Fixed typo in skipif error message 2016-12-07 13:35:58 +01:00
Dmitry Stogov
ee15891c35 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Check if PHP is in execution state.
2016-12-07 15:12:48 +03:00
Dmitry Stogov
3c8c347fa7 Check if PHP is in execution state. 2016-12-07 15:12:18 +03:00
Nikita Popov
76c4a3db08 Fix bug #73668
Not bothering to implement special handling to get an accurate
range for this case.
2016-12-06 22:25:35 +01:00