]>
granicus.if.org Git - php/log
Joe Watkins [Tue, 28 May 2019 07:53:32 +0000 (09:53 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
bump version after release
Joe Watkins [Tue, 28 May 2019 07:52:52 +0000 (09:52 +0200)]
bump version after release
Stanislav Malyshev [Tue, 28 May 2019 04:36:00 +0000 (21:36 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
Stanislav Malyshev [Tue, 28 May 2019 01:04:00 +0000 (18:04 -0700)]
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
Stanislav Malyshev [Tue, 28 May 2019 00:28:20 +0000 (17:28 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
Stanislav Malyshev [Tue, 28 May 2019 00:16:29 +0000 (17:16 -0700)]
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
Stanislav Malyshev [Tue, 28 May 2019 00:20:56 +0000 (17:20 -0700)]
Fix function name
Stanislav Malyshev [Mon, 27 May 2019 23:49:19 +0000 (16:49 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Fix #77973: Uninitialized read in gdImageCreateFromXbm
Stanislav Malyshev [Mon, 27 May 2019 23:48:32 +0000 (16:48 -0700)]
Update NEWS
Stanislav Malyshev [Mon, 27 May 2019 23:32:42 +0000 (16:32 -0700)]
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Christoph M. Becker [Mon, 6 May 2019 08:18:51 +0000 (10:18 +0200)]
Fix #77973: Uninitialized read in gdImageCreateFromXbm
We have to ensure that `sscanf()` does indeed read a hex value here,
and bail out otherwise.
Michael Maroszek [Mon, 27 May 2019 15:42:20 +0000 (17:42 +0200)]
Fixed bug #76345
Jakub Zelenka [Sun, 26 May 2019 17:47:22 +0000 (18:47 +0100)]
Add fpmi to the opcache supported sapis
Nikita Popov [Thu, 23 May 2019 09:11:54 +0000 (11:11 +0200)]
Fixed bug #78038 socket_select with references
Dmitry Stogov [Wed, 22 May 2019 21:20:35 +0000 (00:20 +0300)]
Fixed race condition in opcache restart
Sjon Hortensius [Sat, 18 May 2019 15:14:21 +0000 (17:14 +0200)]
Fix #77956 - When mysqli.allow_local_infile = Off, return a client error
Christoph M. Becker [Wed, 22 May 2019 10:00:06 +0000 (12:00 +0200)]
Fix test case for cURL 7.65.0
Reported and patch provided by @Jan-E.
Nikita Popov [Wed, 22 May 2019 09:41:51 +0000 (11:41 +0200)]
Use a different URL in bug44811.phpt
Rasmus Lerdorf [Tue, 21 May 2019 21:44:11 +0000 (14:44 -0700)]
Fix precedence issue causing sub-second timeouts to be 0 in
curl_multi_select
Christoph M. Becker [Tue, 21 May 2019 09:17:28 +0000 (11:17 +0200)]
Prevent test case failure
If opcache.log_verbosity_level is greater than 1, opcache will raise
warnings, which will be written to stderr in the default case. These
warnings are actually to be expected, but would break the test, so we
make sure that the log_verbosity_level is 1 when running this test.
Vincent JARDIN [Tue, 23 Apr 2019 21:10:38 +0000 (23:10 +0200)]
Support content_type stream context option in soap
Allows overriding the HTTP header using the HTTP context:
$client = new SoapClient('http://url.wsdl&v=latest', [
'stream_context' => stream_context_create([
'http' => [
'content_type' => 'foobarX',
],
]),
]);
This is a backport of
c55af3c65ac116bbd935bd3d695869d88056c49c
to the PHP 7.2 branch.
Holly Li (WIPRO LIMITED) [Tue, 21 May 2019 05:53:08 +0000 (07:53 +0200)]
use {TMP} placeholder in phpt tests
Dmitry Stogov [Mon, 20 May 2019 21:07:17 +0000 (00:07 +0300)]
Prevent race condition in opcache_reset()
Christoph M. Becker [Mon, 20 May 2019 09:09:44 +0000 (11:09 +0200)]
Fix test wrt. opcache.error_log
Since the test expects log messages to be written to stderr, we have to
make sure that opcache.error_log is set correctly when running the
test.
Christoph M. Becker [Fri, 17 May 2019 11:31:18 +0000 (13:31 +0200)]
Fix #78025: segfault when accessing properties of DOMDocumentType
Instead of following the NULL pointer, we return an empty string.
Nikita Popov [Wed, 15 May 2019 10:46:23 +0000 (12:46 +0200)]
Fixed bug #76980
If we perform a class fetch that is not marked as exception safe,
convert exceptions thrown by autoloaders into a fatal error.
Ideally fetching the interfaces would be exception safe, but as it
isn't right now, we must abort at this point.
Sara Golemon [Wed, 15 May 2019 00:22:00 +0000 (20:22 -0400)]
Bump for 7.2.20
Dmitry Stogov [Tue, 14 May 2019 11:53:52 +0000 (14:53 +0300)]
Fixed possible crashes, because of inconsistent PCRE cache and opcache SHM reset
Christoph M. Becker [Tue, 14 May 2019 08:23:58 +0000 (10:23 +0200)]
Fix test case
stderr is supposed to be redirected to NUL (which is roughly equivalent
to /dev/null on POSIX), but actually was redirected to a file.
Jakub Zelenka [Mon, 13 May 2019 17:47:43 +0000 (18:47 +0100)]
Add ping to the fpm test for bug #77934
Theodore Brown [Thu, 9 May 2019 19:19:52 +0000 (14:19 -0500)]
Fix #77993: Wrong parse error for invalid hex literal on Windows
If a PHP file contains an invalid hex literal such as `0x_10`, the expected error
is `Parse error: syntax error, unexpected 'x_10' (T_STRING) in %s on line %d`.
This already worked correctly on Linux, but on Windows prior to this patch a different
error was produced: `Parse error: Invalid numeric literal in %s on line %d`.
Peter Kokot [Mon, 13 May 2019 01:51:00 +0000 (03:51 +0200)]
Convert CRLF to LF
These files are tracked with CRLF line endings in Git and can be
converted to LF. Neither are parts of tests or code itself.
Jakub Zelenka [Sat, 11 May 2019 19:07:39 +0000 (20:07 +0100)]
Fix bug #77934 (php-fpm kill -USR2 not working)
Peter Kokot [Sat, 11 May 2019 15:12:28 +0000 (17:12 +0200)]
Convert CRLF to LF in *.wsdl files
These EOL types are part of different environments and not part of the
tests themselves.
Christoph M. Becker [Fri, 10 May 2019 16:43:40 +0000 (18:43 +0200)]
Fix typo
Since opcache.enable defaults to 1 anyway, this change is only
cosmetic.
George Wang [Thu, 9 May 2019 22:13:25 +0000 (18:13 -0400)]
Updated LiteSpeed SAPI to 7.3.2 to allow request header value length up to 64K.
Christoph M. Becker [Thu, 9 May 2019 14:54:11 +0000 (16:54 +0200)]
Fix erroneous assertions
Since PHP strings are binary safe (i.e. they may contain NUL bytes), we
must not assume that strlen()/wcslen() actually return the length of
the string. Only if the given in_len is zero, it is safe to assert
this.
Nikita Popov [Thu, 9 May 2019 10:29:33 +0000 (12:29 +0200)]
Fixed bug #75186
Christoph M. Becker [Thu, 9 May 2019 10:15:00 +0000 (12:15 +0200)]
Fix log_verbosity_bug.phpt
This test may fail on Windows due to the file cache fallback. We
ensure that this will not happen.
Christoph M. Becker [Wed, 8 May 2019 15:54:02 +0000 (17:54 +0200)]
Add {TMP} placeholder for PHPT INI sections
Several tests use `/tmp` in the `--INI--` section, but this is not
portable. We therefore introduce the `{TMP}` placeholder which
evaluates to the system's temporary directory using
`sys_get_temp_dir()`.
We also remove the doubtful `strpos()` optimization.
Nikita Popov [Wed, 8 May 2019 09:33:13 +0000 (11:33 +0200)]
Fix resolution of "parent" during inheritance check
We can't assume that the method we're checking against is part of
the parent class...
Jakub Zelenka [Sun, 5 May 2019 20:04:28 +0000 (21:04 +0100)]
Fix OpenSSL online test for ca context
The php.net is redirected to https so use nginx.org
Christoph M. Becker [Tue, 30 Apr 2019 07:34:53 +0000 (09:34 +0200)]
Update NEWS wrt. sec fixes
Stanislav Malyshev [Tue, 30 Apr 2019 07:05:32 +0000 (00:05 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
Stanislav Malyshev [Tue, 30 Apr 2019 06:38:12 +0000 (23:38 -0700)]
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
I do not completely understand what is going on there, but I am pretty
sure dir_entry <= offset_base if not a normal situation, so we better not
to rely on such dir_entry.
Stanislav Malyshev [Tue, 30 Apr 2019 05:09:04 +0000 (22:09 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #77821: Potential heap corruption in TSendMail()
Christoph M. Becker [Fri, 29 Mar 2019 10:12:09 +0000 (11:12 +0100)]
Fix #77821: Potential heap corruption in TSendMail()
`zend_string_tolower()` returns a copy (not a duplicate) of the given
string, if it is already in lower case. In this case we must not not
`zend_string_free()` both strings. The cleanest solution is to call
` zend_string_release()` on both strings, which properly handles the
refcount.
Christoph M. Becker [Mon, 29 Apr 2019 15:23:16 +0000 (17:23 +0200)]
Fix #77943: imageantialias($image, false); does not work
Firstly, we must not call `gdImageSetAntiAliased()` (which sets the
color to anti-alias), but rather modify the `gdImage.AA` flag.
Furthermore, we have to actually use the supplied boolean value.
We also make sure that we don't attempt to enable anti-aliasing for
palette images.
Christoph M. Becker [Mon, 29 Apr 2019 14:29:08 +0000 (16:29 +0200)]
Add tests for bug77943
Nikita Popov [Mon, 29 Apr 2019 11:51:26 +0000 (13:51 +0200)]
Fixed bug #77945
Make sure that we proper distinguish between empty string key and
no key during SDL serialization.
Christoph M. Becker [Mon, 29 Apr 2019 07:02:13 +0000 (09:02 +0200)]
Fix tests
These tests are obviously meant to test successful and failing uri:
DSNs, but did not pass proper file:// URIs, so actually ended up
testing for invalid data source URIs twice. We fix this, and adjust
the expectations accordingly.
We also unfork the -win32 variant, since both test cases are almost
identical, and the expected error message may be either one.
Christoph M. Becker [Sun, 28 Apr 2019 21:48:27 +0000 (23:48 +0200)]
Make MySQLPDOTest::extractVersion() more liberal
MySQL/MariaDB version strings may have suffixes which may contain dots;
for instance, Debian stretch has 5.5.5-10.1.37-MariaDB-0+deb9u1 or
such. Therefore, we make the version extraction more liberal, and only
require that there are at least three parts separated by dot, and
ignore additional parts.
We also fix an erroneous test expectation, which would be triggered on
CI now, right away. This patch has been provided by petk@.
Peter Kokot [Sat, 27 Apr 2019 22:50:40 +0000 (00:50 +0200)]
Update NEWS
Craig Duncan [Sat, 27 Apr 2019 22:44:48 +0000 (00:44 +0200)]
Fix #77024: SplFileObject::__toString() may return array
- Correct the behaviour of casting spl files to strings
- Add a test for Bug 77024
Christoph M. Becker [Sat, 27 Apr 2019 17:21:51 +0000 (19:21 +0200)]
PHP, meet MySQL
All pdo_mysql tests are skipped on AppVeyor because "No such host is
known". We change the DSN to use semicolons instead of spaces to fix
that.
Christoph M. Becker [Sat, 27 Apr 2019 16:46:27 +0000 (18:46 +0200)]
Fix #77944: Wrong meta pdo_type for bigint on LLP64
When actually fetching the data, bigint (unsigned) column values are
returned as integers on LLP64 architectures, so their pdo_type has to
be PDO::PARAM_INT accordingly.
Christoph M. Becker [Thu, 25 Apr 2019 21:28:41 +0000 (23:28 +0200)]
Fix #77940: test using outdated mon_thousands_sep for Swedish
Of course, we should expect a comma, not a period.
Christoph M. Becker [Thu, 25 Apr 2019 17:39:42 +0000 (19:39 +0200)]
Fix #77940: test using outdated mon_thousands_sep for Swedish
This time so that it works for all Windows 10 versions (hopefully).
Christoph M. Becker [Thu, 25 Apr 2019 06:58:13 +0000 (08:58 +0200)]
Fix #77940: test using outdated mon_thousands_sep for Swedish
Christoph M. Becker [Wed, 24 Apr 2019 22:03:45 +0000 (00:03 +0200)]
Fix #77938: socket_get_option error
Since tcp_socket/ssl streams are not representable, we suppress the
redirect to fix the test case.
Remi Collet [Wed, 24 Apr 2019 07:45:48 +0000 (09:45 +0200)]
news entry for litespeed
Nikita Popov [Tue, 23 Apr 2019 10:43:07 +0000 (12:43 +0200)]
Fixed bug #77843
George Wang [Sun, 21 Apr 2019 19:04:54 +0000 (15:04 -0400)]
Improved LSAPI_End_Response_r() .
George Wang [Sun, 21 Apr 2019 18:59:51 +0000 (14:59 -0400)]
Fixed bug in litespeed_finish_request(), disable fastcgi_finish_request() alias for now.
Peter Kokot [Sat, 20 Apr 2019 17:12:17 +0000 (19:12 +0200)]
Update changelog
Peter Kokot [Sat, 20 Apr 2019 17:00:51 +0000 (19:00 +0200)]
Fix #77921: static.php.net doesn't work anymore
This embeds the PHP logo image in the FPM status HTML page instead of
using remote location. The phpinfo() output also uses such approach
and browser compatibility looks decent [1].
1: https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
Peter Kokot [Fri, 19 Apr 2019 19:09:46 +0000 (21:09 +0200)]
Update Git repository for Windows build tool kit
Christoph M. Becker [Thu, 18 Apr 2019 14:51:10 +0000 (16:51 +0200)]
Use php-sdk-2.2.0beta5 on AppVeyor
Christoph M. Becker [Wed, 17 Apr 2019 15:23:23 +0000 (17:23 +0200)]
Fix #77911: Wrong warning for session.sid_bits_per_character
Ignace Nyamagana Butera [Mon, 25 Mar 2019 19:30:02 +0000 (20:30 +0100)]
Fixed bug #77909: DatePeriod::__construct() with invalid recurrence count value
Improve error message on invalid reccurence count
Adding test when reccurence is -1
Christoph M. Becker [Wed, 17 Apr 2019 07:54:01 +0000 (09:54 +0200)]
Fix tests for non English environments
Remi Collet [Tue, 16 Apr 2019 11:11:23 +0000 (13:11 +0200)]
next is 7.2.19
Nikita Popov [Mon, 15 Apr 2019 13:26:58 +0000 (15:26 +0200)]
Fixed bug #77895
Nikita Popov [Mon, 15 Apr 2019 12:59:05 +0000 (14:59 +0200)]
Zero sockaddr struct
in6 has a bunch of extra fields that we're leaving uninitialized. I
don't see them locally, but there's valgrind warnings on gcov.
Nikita Popov [Mon, 15 Apr 2019 08:53:33 +0000 (10:53 +0200)]
Fix uninitialized cert_captured
This is a legimitimate bug and also shows up under valgrind.
Nikita Popov [Mon, 15 Apr 2019 08:22:40 +0000 (10:22 +0200)]
Fixed bug #77882
George Wang [Fri, 12 Apr 2019 21:43:45 +0000 (17:43 -0400)]
LiteSpeed SAPI 7.3, better process management, new API function litespeed_finish_request().
Christoph M. Becker [Fri, 12 Apr 2019 11:05:16 +0000 (13:05 +0200)]
Fix tests wrt. internationalization
Nikita Popov [Fri, 12 Apr 2019 08:36:26 +0000 (10:36 +0200)]
Fix key leaks in mb_convert_encoding()
Anatol Belski [Thu, 11 Apr 2019 16:17:03 +0000 (18:17 +0200)]
Fix potential OPcache file cache related issues
To solve issues detected during testing, we backport the following
commits to PHP 7.2:
129c5c1181bf344b37e13fd6dc5dfe76c13d7208
9ac133a0b3863ca4d9659140154ee237e5f4669a
ce72bc6b658c335dd37393d0beb28584e6805e97
Anatol Belski [Wed, 10 Apr 2019 12:55:15 +0000 (14:55 +0200)]
Fix phar:// include handling with file cache
Nikita Popov [Wed, 10 Apr 2019 11:06:02 +0000 (13:06 +0200)]
Fix 29nb_async_connect.phpt
Intermediate states are unreliable across versions (I think), make
sure we go through the whole connect procedure.
Nikita Popov [Wed, 10 Apr 2019 10:18:57 +0000 (12:18 +0200)]
Fix pgsql use after free trying to reuse closed connection
When a connection is closed, we also need to remove the hash entry
from the regular_list, as it now points to freed memory. To do this
store a reverse mapping from the connection to the hash string.
It would be nicer to introduce a wrapping structure for the pgsql
link resource that could store the hash (and notices), but that would
require large changes to the extension, so I'm going for a more
minimal fix here.
Nikita Popov [Wed, 10 Apr 2019 08:36:11 +0000 (10:36 +0200)]
Fix use after free on pg_close() of default connection
Dmitry Stogov [Mon, 8 Apr 2019 21:41:11 +0000 (00:41 +0300)]
Repare SWITCH VM
twosee [Mon, 8 Apr 2019 10:58:46 +0000 (12:58 +0200)]
Preserve keys in emulate_read_fd_set()
Keys are already preserved in the non-emulated case.
Nikita Popov [Mon, 8 Apr 2019 09:40:50 +0000 (11:40 +0200)]
Fixed bug #77853
Nikita Popov [Mon, 8 Apr 2019 09:11:58 +0000 (11:11 +0200)]
Fixed bug #77844
We should probably return an integer result from the operation in
typed mode, right now the result is always a string.
Stanislav Malyshev [Sun, 7 Apr 2019 02:05:37 +0000 (19:05 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Always use ZEND_SECURE_ZERO() when cleaning up data
bump versions after release
Stanislav Malyshev [Sun, 7 Apr 2019 01:15:42 +0000 (18:15 -0700)]
Always use ZEND_SECURE_ZERO() when cleaning up data
Optimizing compilers have an annoying tendency to throw out
memsets over data that they think aren't used anymore. Apply secure
zero-out in cases where this has potential to happen.
Joe Watkins [Fri, 5 Apr 2019 23:26:47 +0000 (01:26 +0200)]
Follow up #77849 PDOStatement objects in undefined state after clone
Cameron Porter [Fri, 5 Apr 2019 18:42:04 +0000 (13:42 -0500)]
Fix bug #77849 Disable cloning of PDO handle/connection objects to avoid segfault
Christoph M. Becker [Fri, 5 Apr 2019 21:15:22 +0000 (23:15 +0200)]
Update Appveyor CI to php-sdk-2.2.0beta4
Alessandro Chitolina [Tue, 2 Apr 2019 12:36:59 +0000 (14:36 +0200)]
Ref #76801 remove old file source from file_sources hash in case of file included more than once
Dmitry Stogov [Wed, 3 Apr 2019 00:09:03 +0000 (03:09 +0300)]
Fixed CFG construction for SWITCH opcodes
Joe Watkins [Tue, 2 Apr 2019 14:50:20 +0000 (16:50 +0200)]
bump versions after release
Remi Collet [Tue, 2 Apr 2019 09:05:39 +0000 (11:05 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
fix paste issue
Remi Collet [Tue, 2 Apr 2019 09:03:40 +0000 (11:03 +0200)]
fix paste issue
Christoph M. Becker [Tue, 2 Apr 2019 08:40:56 +0000 (10:40 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Pointer arithmetic on void pointers is illegal
Christoph M. Becker [Tue, 2 Apr 2019 08:37:40 +0000 (10:37 +0200)]
Pointer arithmetic on void pointers is illegal
We quick-fix this by casting to char*; it might be more appropriate to
use char pointers in the first place.