3836c2faac
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-12 21:52:59 +02:00
13fc1b92ca
Add a bit more test cases (edge cases) to the BIT test case
2016-12-12 21:52:36 +02:00
d494e19701
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-12 21:29:06 +02:00
a881ea7d86
Add a test case to test fetching of multiple rows with bit values.
2016-12-12 21:28:33 +02:00
2819a28ac3
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-12 21:12:44 +02:00
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
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
7a8774ade4
better way to get ACP
2016-12-12 01:54:22 +01:00
8199e5a7e9
adapt patch for 7.1
2016-12-12 01:50:15 +01:00
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
3473b519c0
fix datatype for zpp, yet a followup on bug #73679
2016-12-12 01:26:06 +01:00
e6e5f06c78
improve fix for bug #73679 with new capabilities available
2016-12-11 17:25:48 +01:00
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
1d80fb2cdb
Fixed bug #73679 DOTNET read access violation using invalid codepage
2016-12-11 17:06:55 +01:00
0ad804ec9b
Fixed tests
2016-12-10 16:43:17 +08:00
09b36113b0
Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)
2016-12-09 22:30:24 +08:00
6812721ef2
Revert "Refix bug #73686 "
...
This reverts commit 4589386026
2016-12-09 22:22:59 +08:00
4589386026
Refix bug #73686
2016-12-09 16:37:22 +08:00
6a43c61bcd
Fixed bug #73646 (mb_ereg_search_init null pointer dereference)
2016-12-09 15:55:07 +08:00
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
68bdd6d018
Fixed bug #73686 (Adding settype()ed values to ArrayObject results in references)
2016-12-09 11:41:08 +08:00
d46972b6ae
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix uninitialized member
2016-12-08 17:16:48 +01:00
66ad7918b8
fix uninitialized member
2016-12-08 17:15:06 +01:00
8250b3fca1
Fixed possible false assertion failure
2016-12-08 22:04:43 +08:00
394a3593cc
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
git clean section
2016-12-08 03:24:59 +01:00
ff6565462e
git clean section
2016-12-08 03:24:18 +01:00
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
5a20d83be8
Remove noop param hook
2016-12-07 17:09:09 -05:00
e133a2dd78
Clean up tabs and whitespace
2016-12-07 17:08:51 -05:00
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
13ffa88e1f
Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement
2016-12-07 21:06:11 +01:00
54f526be89
Install ext/json headers
2016-12-07 17:50:05 +01:00
5b3e36fe78
fix test compat with MySQL 5.7
2016-12-07 16:04:47 +01:00
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
d7e7f74b24
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.
2016-12-06 22:09:44 +01:00
4e3f728701
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix leak, take on 7.x
2016-12-06 14:44:04 +01:00
9b1430140a
fix leak, take on 7.x
2016-12-06 14:42:59 +01:00
28fc49a53f
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 :(
2016-12-05 22:33:42 -08:00
183b4d78aa
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 :(
2016-12-05 22:33:33 -08:00
d7ce944cf1
This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
2016-12-05 22:32:59 -08:00
619a691c7c
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #73645 - int/size_t confusion
2016-12-05 22:16:42 -08:00
1d59ed7524
Fix bug #73645 - int/size_t confusion
2016-12-05 22:16:00 -08:00
4ae4ca45aa
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
2016-12-05 21:59:10 -08:00
6292fe84d3
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
2016-12-05 21:58:55 -08:00
266ecb6d0a
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
2016-12-05 21:40:55 -08:00
3b79f8f408
Fix bug #73654
2016-12-05 20:41:14 +01:00
8ad9043aa3
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix test
2016-12-04 22:45:31 +01:00
eddca73ad2
fix test
...
This test depends on connection flags modifable from teh env,
that can affect the exact function called.
2016-12-04 22:42:39 +01:00
b6f5fcfc3a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix test
2016-12-04 22:28:34 +01:00
1eb3f01c68
fix test
...
On Windows, either doubled backslashes or forward slashes are supported
on the server side.
2016-12-04 22:27:17 +01:00
Andrey Hristov