]>
granicus.if.org Git - php/log
Adam Baratz [Mon, 12 Sep 2016 21:32:50 +0000 (17:32 -0400)]
Never quote values as raw binary data
This reverts
a1a18fca6e2a1690ea113dc2ebe0e7d22fdc71a0 which was intended to fix
bug #52885. That commit introduced a BC break which wasn't universally
desirable. The issue of quoting binary data (or NVARCHAR strings, or other
nonstandard types) will have to be addressed separately.
Christoph M. Becker [Mon, 12 Sep 2016 11:27:57 +0000 (13:27 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 12 Sep 2016 11:21:34 +0000 (13:21 +0200)]
Skip regression test for issue that has not yet been released in libgd
<https://github.com/libgd/libgd/issues/177> has been assessed as enhancement,
so most likely it will be released with GD 2.3.
Christoph M. Becker [Mon, 12 Sep 2016 10:39:14 +0000 (12:39 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 12 Sep 2016 10:34:11 +0000 (12:34 +0200)]
Skip test for external GD because of not yet published bugfix
Christoph M. Becker [Sun, 11 Sep 2016 21:51:32 +0000 (23:51 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 11 Sep 2016 21:49:09 +0000 (23:49 +0200)]
Skip tests for unpatched external libgd regarding libvpx
Some issues have never been fixed in the external libgd's libvpx binding,
so we skip the respective tests.
Andrea Faulds [Sun, 11 Sep 2016 21:44:46 +0000 (22:44 +0100)]
Remove zpp fallback code (always use Fast ZPP)
Squashed commit of the following:
commit
3e27fbb3d22b42d181e15c345f1c59a007b6b58c
Author: Andrea Faulds <ajf@ajf.me>
Date: Sun Sep 11 19:14:37 2016 +0100
Keep dummy FAST_ZPP macro for compatibility
commit
8a7cfd00deaa4a3c5026c97580c49c886c72a5b4
Author: Andrea Faulds <ajf@ajf.me>
Date: Mon Sep 5 22:36:03 2016 +0100
Remove FAST_ZPP macro and plain zpp fallback code
Christoph M. Becker [Sun, 11 Sep 2016 17:32:54 +0000 (19:32 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 11 Sep 2016 17:30:55 +0000 (19:30 +0200)]
Split test for bundled vs. external libgd
The behavior of imagecropauto($im, IMG_CROP_DEFAULT) is rather different
for the bundled and an external libgd, see
<https://github.com/libgd/libgd/issues/298>.
Therefore we split the test for now.
Christoph M. Becker [Sun, 11 Sep 2016 16:35:11 +0000 (18:35 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 11 Sep 2016 16:29:27 +0000 (18:29 +0200)]
Make test case more resilient
This test case fails with external libgd, because libgd < 2.2.4 converts
palette images to truecolor (<https://github.com/libgd/libgd/issues/297>).
However, even if there happens no truecolor conversion, it is not guaranteed
that the palette indexes of the original and the cropped image are identical
(this is, for instance, not the case with current libgd master where the bug
has been fixed). Therefore we check for the expected RGBA value instead of
the palette index.
Christoph M. Becker [Sun, 11 Sep 2016 11:26:30 +0000 (13:26 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Sun, 11 Sep 2016 11:20:25 +0000 (13:20 +0200)]
fix bug category
Anatol Belski [Sun, 11 Sep 2016 11:05:07 +0000 (13:05 +0200)]
update NEWS
Christoph M. Becker [Sun, 19 Jun 2016 12:29:27 +0000 (14:29 +0200)]
A picture is worth a thousand message digests
The bundled GD test suites makes heavy use of md5() to verify the result
of drawing operations. This leads to fragile tests (even a slight change
in a PNG header would cause failure, and of course there is the
possibility of collisions), and even worse, eventual test failures are
rather unrevealing.
Therefore we replace all md5() verification with a simplistic
test_image_equals_file(), which is basically a simplified port of libgd's
gdTestImageCompareToFile(), adapted to the needs of PHPTs.
In the long run better tests helpers should be introduced (see also
<http://news.php.net/php.internals/94081>), but for now this solution
is preferable over the former.
(cherry picked from commit
24f9e96792518ec2a75f26b1eb2471dd7694f2b7 )
Christoph M. Becker [Sat, 10 Sep 2016 22:09:23 +0000 (00:09 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 10 Sep 2016 22:06:45 +0000 (00:06 +0200)]
Add regression test for bug #73053
The test succeeds with libxml < 2.9.4, and is supposed to succeed with
libxml > 2.9.4. Unfortunately, we can't conditionally mark a test case
as XFAIL, so we're simply skipping the test for libxml 2.9.4 instead.
Anatol Belski [Sat, 10 Sep 2016 09:04:00 +0000 (11:04 +0200)]
update NEWS
Anatol Belski [Sat, 10 Sep 2016 09:03:39 +0000 (11:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Sat, 10 Sep 2016 09:02:17 +0000 (11:02 +0200)]
update NEWS
Anatol Belski [Sat, 10 Sep 2016 00:44:21 +0000 (02:44 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Bug #73058 crypt broken when salt is 'too' long
Anatol Belski [Sat, 10 Sep 2016 00:39:28 +0000 (02:39 +0200)]
Bug #73058 crypt broken when salt is 'too' long
Nikita Popov [Fri, 9 Sep 2016 14:36:26 +0000 (16:36 +0200)]
Don't optimize (string) cast on arrays
Otherwise we throw a notice during pass1_5 optimization.
Christoph M. Becker [Fri, 9 Sep 2016 14:30:26 +0000 (16:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 9 Sep 2016 14:27:50 +0000 (16:27 +0200)]
Remove ignored --FAIL-- section from test case
This is just confusing.
Nikita Popov [Fri, 9 Sep 2016 13:58:36 +0000 (15:58 +0200)]
Fix some block_pass bugs
Christoph M. Becker [Fri, 9 Sep 2016 12:33:01 +0000 (14:33 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 9 Sep 2016 12:30:24 +0000 (14:30 +0200)]
Fix #73054: default option ignored when object passed to int filter
If an object that can't be converted to string is validated, we must not
bail out early, but rather check for a requested default value.
Christoph M. Becker [Fri, 9 Sep 2016 10:47:23 +0000 (12:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Levi Morrison [Thu, 3 Sep 2015 00:23:26 +0000 (18:23 -0600)]
Partially fix bug #67167 - Wrong return value...
...from FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE
The remainer of the fix would require the filter functions to only
convert to string when it makes sense for that particular filter.
(cherry picked from commit
432dc527adcbc3bf4809f6315350300d42c16c52 )
Yasuo Ohgaki [Fri, 9 Sep 2016 02:34:34 +0000 (11:34 +0900)]
Update NEWS
Yasuo Ohgaki [Fri, 9 Sep 2016 02:32:20 +0000 (11:32 +0900)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed Bug #68015 Session does not report invalid uid for files save handler
Yasuo Ohgaki [Fri, 9 Sep 2016 02:30:33 +0000 (11:30 +0900)]
Fixed Bug #68015 Session does not report invalid uid for files save handler
Anatol Belski [Thu, 8 Sep 2016 15:49:47 +0000 (17:49 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
backport
59444347 and
3d7343f6
Anatol Belski [Thu, 8 Sep 2016 15:46:53 +0000 (17:46 +0200)]
Yasuo Ohgaki [Thu, 8 Sep 2016 05:10:21 +0000 (14:10 +0900)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug26639.phpt
Yasuo Ohgaki [Thu, 8 Sep 2016 05:07:57 +0000 (14:07 +0900)]
Fix bug26639.phpt
Yasuo Ohgaki [Thu, 8 Sep 2016 04:35:35 +0000 (13:35 +0900)]
Update NEWS
Yasuo Ohgaki [Thu, 8 Sep 2016 04:35:30 +0000 (13:35 +0900)]
Update NEWS
Yasuo Ohgaki [Thu, 8 Sep 2016 04:32:31 +0000 (13:32 +0900)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
Yasuo Ohgaki [Thu, 8 Sep 2016 04:16:50 +0000 (13:16 +0900)]
Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
Christoph M. Becker [Tue, 6 Sep 2016 10:10:38 +0000 (12:10 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 6 Sep 2016 10:05:22 +0000 (12:05 +0200)]
Fix #73025: Heap Buffer Overflow in virtual_popen of zend_virtual_cwd.c
`command_length` is retrieved via strlen() and later passed to emalloc()
and memcpy(), so the appropriate type is `size_t`.
We don't add a regression test, because that would need to allocate a string
of at least 2 GiB.
Yasuo Ohgaki [Tue, 6 Sep 2016 09:29:20 +0000 (18:29 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 6 Sep 2016 09:28:45 +0000 (18:28 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 6 Sep 2016 07:41:52 +0000 (16:41 +0900)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed Bug #66964 mb_convert_variables() cannot detect recursion
Yasuo Ohgaki [Tue, 6 Sep 2016 07:05:34 +0000 (16:05 +0900)]
Fixed Bug #66964 mb_convert_variables() cannot detect recursion
Christoph M. Becker [Mon, 5 Sep 2016 23:07:15 +0000 (01:07 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 5 Sep 2016 22:28:28 +0000 (00:28 +0200)]
Fix #70752: Depacking with wrong password leaves 0 length files
We should not open the output stream before we have tried to open the
archive entry, as failing the latter could leave an empty file behind.
Andrea Faulds [Mon, 5 Sep 2016 21:12:26 +0000 (22:12 +0100)]
Unbreak FAST_ZPP dead code
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.