]>
granicus.if.org Git - php/log
Anatol Belski [Sun, 11 Dec 2016 01:52:02 +0000 (02:52 +0100)]
fix leaking streams and memory mapped files
(cherry picked from commit
f1ff23095b1a4fe6d6a65331dda7832ae02eb1a1 )
Nikita Popov [Fri, 16 Dec 2016 19:55:08 +0000 (20:55 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 15 Dec 2016 21:16:44 +0000 (22:16 +0100)]
Fix stack management in ini scanner
Anatol Belski [Fri, 16 Dec 2016 15:49:18 +0000 (16:49 +0100)]
chance CLI codepage, only when SAPI is initialized
This finally solves issues with DBSC console codepages, and in
general improves the console codepage switching. When
module_initialized, all the possible encoding INI settings with
regard to possible modifications are set, and that's the
right moment to switch the console codepage in regard to I/O.
CJK glyphs might take more than 1 cell, so then visual issues
can occur, when switching console codepage back and forth. Users
are free to use ini_set(), but any visual issues are then up to
the user responsibility.
Xinchen Hui [Fri, 16 Dec 2016 03:09:22 +0000 (11:09 +0800)]
Add an assertion
Xinchen Hui [Fri, 16 Dec 2016 03:06:27 +0000 (11:06 +0800)]
Fixed bug #73746 (Method that returns string returns UNKNOWN:0 instead)
Anatol Belski [Thu, 15 Dec 2016 11:32:35 +0000 (12:32 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
make timing check more forgiving in these tests
Anatol Belski [Thu, 15 Dec 2016 11:20:37 +0000 (12:20 +0100)]
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.
Matteo Beccati [Thu, 15 Dec 2016 08:32:04 +0000 (09:32 +0100)]
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.
Matteo Beccati [Thu, 15 Dec 2016 08:31:54 +0000 (09:31 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Skip tests when secure_file_priv dir not writable
Matteo Beccati [Thu, 15 Dec 2016 08:31:00 +0000 (09:31 +0100)]
Skip tests when secure_file_priv dir not writable
Yasuo Ohgaki [Thu, 15 Dec 2016 07:16:45 +0000 (16:16 +0900)]
Add missing UPGRADING entry. Manual is updated before 7.0 release.
Anatol Belski [Wed, 14 Dec 2016 18:56:19 +0000 (19:56 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
extend skip section
Anatol Belski [Wed, 14 Dec 2016 18:53:55 +0000 (19:53 +0100)]
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.
Nikita Popov [Wed, 14 Dec 2016 17:11:43 +0000 (18:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 14 Dec 2016 17:10:36 +0000 (18:10 +0100)]
Partially fix bug #70492
The libmagic portion is missing.
Nikita Popov [Wed, 14 Dec 2016 16:56:31 +0000 (17:56 +0100)]
Fixed bug #73727
Error introduced when refactoring zend_alloc code into zend_bitset.
Anatol Belski [Wed, 14 Dec 2016 11:34:14 +0000 (12:34 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
cleanup temporary data
Anatol Belski [Wed, 14 Dec 2016 11:33:13 +0000 (12:33 +0100)]
cleanup temporary data
Anatol Belski [Wed, 14 Dec 2016 01:51:29 +0000 (02:51 +0100)]
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.
Nikita Popov [Tue, 13 Dec 2016 16:57:14 +0000 (17:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 13 Dec 2016 16:54:30 +0000 (17:54 +0100)]
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.
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: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: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: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.
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:50:15 +0000 (01:50 +0100)]
adapt patch for 7.1
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
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:25:48 +0000 (17:25 +0100)]
improve fix for bug #73679 with new capabilities available
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: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 [Sat, 10 Dec 2016 10:17:07 +0000 (11:17 +0100)]
extend errno mapping
Xinchen Hui [Sat, 10 Dec 2016 08:43:17 +0000 (16:43 +0800)]
Fixed tests
Xinchen Hui [Fri, 9 Dec 2016 14:39:42 +0000 (22:39 +0800)]
Update NEWS
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:37:22 +0000 (16:37 +0800)]
Refix bug #73686
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: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: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:04:43 +0000 (22:04 +0800)]
Fixed possible false assertion failure
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
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: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: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: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: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:05 +0000 (17:50 +0100)]
Install ext/json headers
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: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: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.
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: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: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: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: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: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: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: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:01:18 +0000 (10:01 +0300)]
Micro optimizations
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: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: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:39:45 +0000 (20:39 +0100)]
Fix bug #73654
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).