Commit Graph

99272 Commits

Author SHA1 Message Date
Xinchen Hui
7cef66c635 Fixed bug #73746 (Method that returns string returns UNKNOWN:0 instead) 2016-12-16 11:06:27 +08:00
Anatol Belski
b441ff6cf9 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  make timing check more forgiving in these tests
2016-12-15 12:32:35 +01:00
Anatol Belski
8bc3f179ce make timing check more forgiving in these tests
Particularly on slower VMs, the sporadic fails can still happen.
The timing is kept in an uncritical range, but allows the tests
pass there. Mayby, it'd make sense to introduce a new group for
this kind of tests, so tests requiring exact time measurement
can be avoided on unsuitable environments.
2016-12-15 12:20:37 +01:00
Matteo Beccati
72fb941bd4 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Skip tests when secure_file_priv dir not writable
  Add missing UPGRADING entry. Manual is updated before 7.0 release.
2016-12-15 09:32:04 +01:00
Matteo Beccati
7c696fa886 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Skip tests when secure_file_priv dir not writable
2016-12-15 09:31:54 +01:00
Matteo Beccati
0c9324ea9b Skip tests when secure_file_priv dir not writable 2016-12-15 09:31:00 +01:00
Yasuo Ohgaki
577b081a20 Add missing UPGRADING entry. Manual is updated before 7.0 release. 2016-12-15 16:16:45 +09:00
Anatol Belski
382ec5cf9e Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  extend skip section
2016-12-14 19:56:19 +01:00
Anatol Belski
5136048064 extend skip section
The day light offset is calculated based on the system TZ, so with
an unsuitable one there's no way to workaround the false positives.
2016-12-14 19:53:55 +01:00
Nikita Popov
33e96c9d63 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-14 18:11:43 +01:00
Nikita Popov
f99bf70360 Partially fix bug #70492
The libmagic portion is missing.
2016-12-14 18:11:27 +01:00
Nikita Popov
2f438342ec Fixed bug #73727
Error introduced when refactoring zend_alloc code into zend_bitset.
2016-12-14 17:56:31 +01:00
Anatol Belski
1820f4b9d1 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  cleanup temporary data
2016-12-14 12:34:14 +01:00
Anatol Belski
d663296e3b cleanup temporary data 2016-12-14 12:33:13 +01:00
Anatol Belski
e33ec61f9c Care about intput and output encoding, as per default encoding RFC
If PHP CLI is used with programs with no Unicode support, the default
PHP console codepage might cause backward incompatible behaviors. This
is solved with this patch by separating the handling of I/O codepage.
As per https://wiki.php.net/rfc/default_encoding input_encodnig and
output_encoding are centralized INI settings, so they're used for the
purpose of adjusting the codepage. This gives user the ability to use
UTF-8 internally, while letting the system API to convert the output
to a compatible codepage. This also might solve the font issues on
systems without good true type support.

Note, that there no change to the default behavior - if input and
output encoding are not set, which is the default case, the default
charset applies to both console input and output. The patch is just
a compilment to the backward compatibility, not more and not less.
2016-12-14 02:51:29 +01:00
Nikita Popov
b344832b80 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-13 17:57:14 +01:00
Nikita Popov
4b2cc62e26 More fixes for bug #73089
Insert a lot more DEREFs. Some may not be necessary, but better
safe than sorry. I'm thinking the soap_hash_str_find_deref function
should become part of the zend_hash API -- we need this in many
places.
2016-12-13 17:56:38 +01:00
Andrey Hristov
9eca4dca73 Optimized memory handling of BIT fields. Less memory copies and less
memory usage.
2016-12-12 21:59:29 +02:00
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