]>
granicus.if.org Git - php/log
Julien Pauli [Mon, 5 Sep 2016 15:03:51 +0000 (17:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Fixes #72590: Opcache restart with kill_all_lockers does not work
Julien Pauli [Mon, 5 Sep 2016 15:03:29 +0000 (17:03 +0200)]
Updated NEWS
Keyur [Wed, 13 Jul 2016 02:47:46 +0000 (02:47 +0000)]
Fixes #72590: Opcache restart with kill_all_lockers does not work
ACCEL_LOG_ERROR is special and causes a zend_bailout() and the code
never gets to call kill() in the next line after the logging. Change
the log level to WARNING.
Nikita Popov [Mon, 5 Sep 2016 12:22:29 +0000 (14:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
[ci skip]
Nikita Popov [Mon, 5 Sep 2016 12:21:43 +0000 (14:21 +0200)]
Limit editorconfig to C code
PHPT files do not follow this.
[ci skip]
Julien Pauli [Mon, 5 Sep 2016 08:18:39 +0000 (10:18 +0200)]
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:18:08 +0000 (10:18 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:17:56 +0000 (10:17 +0200)]
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:12:49 +0000 (10:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
Julien Pauli [Thu, 1 Sep 2016 08:36:58 +0000 (10:36 +0200)]
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
Stanislav Malyshev [Mon, 5 Sep 2016 07:41:23 +0000 (00:41 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Added editorconfig file
Richard Fussenegger [Sun, 26 Jun 2016 15:51:44 +0000 (17:51 +0200)]
Added editorconfig file
Stanislav Malyshev [Mon, 5 Sep 2016 07:38:57 +0000 (00:38 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Implement #47456: Missing PCRE option 'J'
Christoph M. Becker [Thu, 21 Jul 2016 13:36:42 +0000 (15:36 +0200)]
Implement #47456: Missing PCRE option 'J'
While it is possible to force the same behavior by setting the internal
option (?J), having a dedicated modifier appears to be useful. After all,
J is even listed on the "Pattern Modifiers" man page[1], but the description
referrs to (?J).
[1] <http://php.net/manual/en/reference.pcre.pattern.modifiers.php>
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:18 +0000 (00:29 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Recognize TDS versions 7.3 and 7.4
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:11 +0000 (00:29 -0700)]
Merge branch 'pull-request/2061' into PHP-5.6
* pull-request/2061:
Recognize TDS versions 7.3 and 7.4
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:26 +0000 (00:19 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Use integer placeholders, since values can vary with the TDS version
Adam Baratz [Wed, 24 Aug 2016 22:44:55 +0000 (18:44 -0400)]
Use integer placeholders, since values can vary with the TDS version
David Carlier [Tue, 28 Jun 2016 06:48:58 +0000 (07:48 +0100)]
phpdbg: couple of network function return checks. Possible
overflow when copy the socket_path configuration.
Stanislav Malyshev [Mon, 5 Sep 2016 03:57:46 +0000 (20:57 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Same issue as #72926 in another place.
Stanislav Malyshev [Mon, 5 Sep 2016 03:49:34 +0000 (20:49 -0700)]
Same issue as #72926 in another place.
Stanislav Malyshev [Mon, 5 Sep 2016 02:15:30 +0000 (19:15 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Sync fix for bug #72910 with current upstream
Stanislav Malyshev [Mon, 5 Sep 2016 02:13:22 +0000 (19:13 -0700)]
Sync fix for bug #72910 with current upstream
Christoph M. Becker [Sun, 4 Sep 2016 14:39:45 +0000 (16:39 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 4 Sep 2016 14:37:06 +0000 (16:37 +0200)]
Fix #72994: mbc_to_code() out of bounds read
We're backporting commit
999a3553 to the still supported PHP 5.6.
Nikita Popov [Sat, 3 Sep 2016 21:30:23 +0000 (23:30 +0200)]
Fix bug #72996
Christoph M. Becker [Sat, 3 Sep 2016 17:52:19 +0000 (19:52 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 3 Sep 2016 17:46:38 +0000 (19:46 +0200)]
Fix #67325: imagetruecolortopalette: white is duplicated in palette
gdImageTrueColorToPalette() is sometimes wasteful by putting multiple white
color entries into the palette. This is caused by an obvious typo, where
to avoid a division by zero when `total` is zero, `count` is checked instead
of `total`.
We fix this issue to improve the quality of the color quantization.
Cf. <https://github.com/libgd/libgd/commit/
24b4550f >
Anatol Belski [Sat, 3 Sep 2016 15:03:55 +0000 (17:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak and error check order
Anatol Belski [Sat, 3 Sep 2016 14:59:17 +0000 (16:59 +0200)]
fix leak and error check order
Christoph M. Becker [Sat, 3 Sep 2016 11:46:03 +0000 (13:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 3 Sep 2016 11:31:13 +0000 (13:31 +0200)]
Fix proto comment
While we're at it, we also change a related comment to use American English
consistently.
Christoph M. Becker [Fri, 2 Sep 2016 22:30:05 +0000 (00:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 2 Sep 2016 22:18:19 +0000 (00:18 +0200)]
Make test case more resilient
When ran from a root directory the test case failed, because the open_basedir
restriction for "../[…]" won't kick in. Therefore we change the current
working directory to the test case's directory, as discussed on internals,
see <http://news.php.net/php.internals/95585>.
Anatol Belski [Fri, 2 Sep 2016 22:05:02 +0000 (00:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix double free
Anatol Belski [Fri, 2 Sep 2016 22:01:04 +0000 (00:01 +0200)]
fix double free
Julien Pauli [Fri, 2 Sep 2016 15:01:52 +0000 (17:01 +0200)]
Fix warning about sign-mismatch comparisons
Stanislav Malyshev [Fri, 2 Sep 2016 06:28:44 +0000 (23:28 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #72910
5.6.27 will be next
Stanislav Malyshev [Fri, 2 Sep 2016 06:27:06 +0000 (23:27 -0700)]
Fix bug #72910
Merge upstream patch from https://github.com/kkos/oniguruma/commit/
65bdf2a0d160d06556415e5f396a75f6b11bad5c
Ferenc Kovacs [Thu, 1 Sep 2016 18:27:19 +0000 (20:27 +0200)]
5.6.27 will be next
Xinchen Hui [Thu, 1 Sep 2016 04:10:38 +0000 (12:10 +0800)]
Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
Yasuo Ohgaki [Wed, 31 Aug 2016 22:47:04 +0000 (07:47 +0900)]
Fix bug #72940 properly. Reduce needless branches
Christoph M. Becker [Wed, 31 Aug 2016 14:38:38 +0000 (16:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 31 Aug 2016 14:33:14 +0000 (16:33 +0200)]
Fix #71882 amendment 2: Negative ftruncate() on php://memory exhausts memory
Christoph M. Becker [Wed, 31 Aug 2016 12:53:53 +0000 (14:53 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 31 Aug 2016 12:51:37 +0000 (14:51 +0200)]
Fix #71882 amendment: Negative ftruncate() on php://memory exhausts memory
To avoid BC breaks, we do not raise a warning for now.
Yasuo Ohgaki [Wed, 31 Aug 2016 12:09:56 +0000 (21:09 +0900)]
Update NEWS
Yasuo Ohgaki [Wed, 31 Aug 2016 12:06:19 +0000 (21:06 +0900)]
Update NEWS
Nikita Popov [Tue, 30 Aug 2016 16:06:18 +0000 (18:06 +0200)]
Fix bug #71711
Also handle another case of bug #71996.
Nikita Popov [Tue, 30 Aug 2016 15:19:19 +0000 (17:19 +0200)]
Fixed bug #71996
Christoph M. Becker [Tue, 30 Aug 2016 12:54:44 +0000 (14:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 30 Aug 2016 12:48:24 +0000 (14:48 +0200)]
Fix #66797: mb_substr only takes 32-bit signed integer
`from` and `len` are `long`, but get passed to mbfl_substr() which expects
`int`s. Therefore we clamp the values to avoid the undefined conversion
behavior.
Anatol Belski [Tue, 30 Aug 2016 12:11:47 +0000 (14:11 +0200)]
fix typo
Anatol Belski [Tue, 30 Aug 2016 12:10:54 +0000 (14:10 +0200)]
prepare for next
Nikita Popov [Tue, 30 Aug 2016 11:44:59 +0000 (13:44 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ville Hukkamäki [Fri, 19 Aug 2016 22:05:04 +0000 (22:05 +0000)]
Test case for bug #72771
Nikita Popov [Tue, 30 Aug 2016 11:05:53 +0000 (13:05 +0200)]
Fix bug #72957
Nikita Popov [Tue, 30 Aug 2016 10:43:41 +0000 (12:43 +0200)]
Followup for bug #72971
Property writes did not respect the namespace either. This is an
incomplete fix in that it only handles the case where an existing
child element is modified, not when a new one is created.
Nikita Popov [Tue, 30 Aug 2016 08:54:31 +0000 (10:54 +0200)]
Fix bug #72971
Yasuo Ohgaki [Tue, 30 Aug 2016 06:56:06 +0000 (15:56 +0900)]
Fixed bug #72940 SID always return "name=ID", even if session cookie exist
Christoph M. Becker [Tue, 30 Aug 2016 00:08:50 +0000 (02:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 29 Aug 2016 23:53:27 +0000 (01:53 +0200)]
Fix #71882: Negative ftruncate() on php://memory exhausts memory
We must not pass negative sizes to a size_t parameter.
Christoph M. Becker [Mon, 29 Aug 2016 23:07:20 +0000 (01:07 +0200)]
Merge branch 'pull-request/2043' into PHP-7.0
Anatol Belski [Mon, 29 Aug 2016 19:47:54 +0000 (21:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix HANDLE leak
Anatol Belski [Mon, 29 Aug 2016 19:45:39 +0000 (21:45 +0200)]
fix HANDLE leak
Anatol Belski [Mon, 29 Aug 2016 19:23:20 +0000 (21:23 +0200)]
update NEWS
Anatol Belski [Mon, 29 Aug 2016 19:22:43 +0000 (21:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Mon, 29 Aug 2016 19:20:36 +0000 (21:20 +0200)]
update NEWS
Anatol Belski [Mon, 29 Aug 2016 19:13:39 +0000 (21:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
ensure null termination
Anatol Belski [Mon, 29 Aug 2016 19:03:03 +0000 (21:03 +0200)]
ensure null termination
Anatol Belski [Mon, 29 Aug 2016 18:32:55 +0000 (20:32 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
Anatol Belski [Mon, 29 Aug 2016 18:25:34 +0000 (20:25 +0200)]
Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
Anatol Belski [Mon, 29 Aug 2016 17:33:22 +0000 (19:33 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix double free
Anatol Belski [Mon, 29 Aug 2016 17:27:47 +0000 (19:27 +0200)]
fix double free
Anatol Belski [Mon, 29 Aug 2016 16:56:25 +0000 (18:56 +0200)]
fix double free
Anatol Belski [Mon, 29 Aug 2016 16:05:47 +0000 (18:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak
Anatol Belski [Mon, 29 Aug 2016 16:01:21 +0000 (18:01 +0200)]
fix leak
Anatol Belski [Mon, 29 Aug 2016 13:43:10 +0000 (15:43 +0200)]
fix leak
Anatol Belski [Mon, 29 Aug 2016 13:28:09 +0000 (15:28 +0200)]
fix possible memory leak
Anatol Belski [Mon, 29 Aug 2016 00:45:37 +0000 (02:45 +0200)]
fix dealloc mismatch
Dmitry Stogov [Mon, 29 Aug 2016 09:02:50 +0000 (12:02 +0300)]
Fixed bug #72944 (Null pointer deref in zval_delref_p).
George Wang [Mon, 29 Aug 2016 02:23:28 +0000 (22:23 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
sapi/litespeed/lsapi_main.c
George Wang [Mon, 29 Aug 2016 01:49:30 +0000 (21:49 -0400)]
Added .user.ini support.
Added LSPHPRC support.
update LiteSpeed SAPI version to 6.10 .
Xinchen Hui [Sun, 28 Aug 2016 16:10:31 +0000 (00:10 +0800)]
Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with '\0')
Christoph M. Becker [Fri, 26 Aug 2016 23:13:32 +0000 (01:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 26 Aug 2016 23:02:58 +0000 (01:02 +0200)]
Fix #65550: get_browser() incorrectly parsers entries with "+" sign
+ signs in the browscap patterns are meant to be literal characters, so we
have to escape them for the regex matching.
Christoph M. Becker [Fri, 26 Aug 2016 16:50:30 +0000 (18:50 +0200)]
Fix #72949: Typo in opcache error message
Xinchen Hui [Fri, 26 Aug 2016 10:30:08 +0000 (18:30 +0800)]
Fixed bug #72943 (assign_dim on string doesn't reset hval)
Anatol Belski [Thu, 25 Aug 2016 17:43:39 +0000 (19:43 +0200)]
update NEWS
Alexander Zhuravlev [Mon, 4 Jul 2016 09:47:18 +0000 (12:47 +0300)]
pdo_dblib: stringify uniqidentifier field
Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE
pdo_dblib: Stringify uniqidentifier field
Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE
Tests added.
pdo_dblib: Stringify uniqidentifier field
Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE
Tests fix.
pdo_dblib: Stringify uniqueidentifier field Added separate PDO::DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER attribute instead of PDO::ATTR_STRINGIFY_FETCHES.
pdo_dblib: Stringify uniqueidentifier field Added `getAttribute` support for PDO::DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER.
Simplify storage of stringify_uniqueidentifier attribute
Christoph M. Becker [Thu, 25 Aug 2016 16:19:43 +0000 (18:19 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 25 Aug 2016 16:10:38 +0000 (18:10 +0200)]
Fix #70825: Cannot fetch multiple values with group in ini file
If we have the position already from the last fetch, we also have to preset
the current group, because it won't be read again.
Anatol Belski [Thu, 25 Aug 2016 16:06:47 +0000 (18:06 +0200)]
fix check for args by ref
Christoph M. Becker [Thu, 25 Aug 2016 14:22:57 +0000 (16:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 25 Aug 2016 14:20:30 +0000 (16:20 +0200)]
Fix #71514: Bad dba_replace condition because of wrong API usage
We're backporting commit
9e309a2d to PHP-5.6, because it is a bugfix.
Anatol Belski [Thu, 25 Aug 2016 10:52:29 +0000 (12:52 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
backport relevant part from bug #72858 patch in 7.0
Anatol Belski [Thu, 25 Aug 2016 10:46:28 +0000 (12:46 +0200)]
backport relevant part from bug #72858 patch in 7.0
Anatol Belski [Thu, 25 Aug 2016 10:12:45 +0000 (12:12 +0200)]
Fixed bug #72922 COM called from PHP does not return out parameters
Christoph M. Becker [Sun, 21 Aug 2016 17:43:17 +0000 (19:43 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 21 Aug 2016 17:39:58 +0000 (19:39 +0200)]
Fix #68716: possible resource leaks in _php_image_convert()
We properly clean up after ourselves wrt. to closing opened file pointers
and created images.