]>
granicus.if.org Git - php/log
Joe Watkins [Tue, 28 May 2019 07:54:15 +0000 (09:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
bump version after release
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:05 +0000 (21:36 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
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:25 +0000 (17:28 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
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:21:23 +0000 (17:21 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix function name
Stanislav Malyshev [Tue, 28 May 2019 00:20:56 +0000 (17:20 -0700)]
Fix function name
Stanislav Malyshev [Mon, 27 May 2019 23:49:25 +0000 (16:49 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
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: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.
Nikita Popov [Mon, 27 May 2019 15:42:50 +0000 (17:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Michael Maroszek [Mon, 27 May 2019 15:42:20 +0000 (17:42 +0200)]
Fixed bug #76345
Nikita Popov [Mon, 27 May 2019 14:09:58 +0000 (16:09 +0200)]
Func info: Fix calls to zero-arg varargs
The num_args does not include variadics, so a "zero-arg" function
may accept additional arguments through that. No functions seem
to be affected right now, but they will be after #4175.
Jakub Zelenka [Sun, 26 May 2019 17:49:52 +0000 (18:49 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
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 10:29:08 +0000 (12:29 +0200)]
Fix bug #77955
Free metadata before freeing the arena. I don't have a repro script,
but the added assertion fails for many existing tests prior to this
change.
Nikita Popov [Thu, 23 May 2019 09:12:34 +0000 (11:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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:21:04 +0000 (00:21 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed race condition in opcache restart
Dmitry Stogov [Wed, 22 May 2019 21:20:35 +0000 (00:20 +0300)]
Fixed race condition in opcache restart
Dmitry Stogov [Wed, 22 May 2019 19:59:40 +0000 (22:59 +0300)]
Fixed dump of constant flags
Nikita Popov [Wed, 22 May 2019 10:45:05 +0000 (12:45 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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:02:03 +0000 (12:02 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test case for cURL 7.65.0
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:43:26 +0000 (11:43 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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:46:24 +0000 (14:46 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
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
Nikita Popov [Tue, 21 May 2019 15:35:03 +0000 (17:35 +0200)]
Don't evaluate functions with partial array arguments
Nikita Popov [Tue, 21 May 2019 15:15:07 +0000 (17:15 +0200)]
Fix null check in sccp add_array_elem chain handling
We need to check result_use rather than result_def for a null zval.
Previously we were later assuming that the null zval is really a
partial array, which does not go well.
Nikita Popov [Tue, 21 May 2019 14:59:27 +0000 (16:59 +0200)]
Fix partial array handling in FE_RESET edge feasibility
Nikita Popov [Tue, 21 May 2019 14:51:35 +0000 (16:51 +0200)]
Handle partial arrays in zend_is_true() checks
Nikita Popov [Tue, 21 May 2019 14:43:41 +0000 (16:43 +0200)]
Extract ct_eval_binary_op()
And use it in more places, though some of them are currently not
reachable by partial arrays to the best of my knowledge.
Nikita Popov [Tue, 21 May 2019 14:40:18 +0000 (16:40 +0200)]
Improve SCCP debug code
In particular properly dump partial arrays when tracing execution.
Christoph M. Becker [Tue, 21 May 2019 09:18:32 +0000 (11:18 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Prevent test case failure
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.
Nikita Popov [Tue, 21 May 2019 08:04:51 +0000 (10:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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.
Christoph M. Becker [Tue, 21 May 2019 07:03:01 +0000 (09:03 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
use {TMP} placeholder in phpt tests
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:08:03 +0000 (00:08 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Prevent race condition in opcache_reset()
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:10:20 +0000 (11:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test wrt. opcache.error_log
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:52 +0000 (13:31 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78025: segfault when accessing properties of DOMDocumentType
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 12:35:31 +0000 (14:35 +0200)]
Fixed bug #78015
Don't try to evaluate various operations with partial array operands.
We could evaluate some of these, but let's be conservative for now...
Nikita Popov [Wed, 15 May 2019 10:48:25 +0000 (12:48 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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.
Christoph M. Becker [Wed, 15 May 2019 09:31:53 +0000 (11:31 +0200)]
Update NEWS regarding re-tagging 7.3.6RC1
Sara Golemon [Wed, 15 May 2019 00:23:25 +0000 (20:23 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump for 7.2.20
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:55:28 +0000 (14:55 +0300)]
Moved NEWS entry
Dmitry Stogov [Tue, 14 May 2019 11:54:30 +0000 (14:54 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed possible crashes, because of inconsistent PCRE cache and opcache SHM reset
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 09:44:58 +0000 (11:44 +0200)]
Prepare 7.3.7-dev
Christoph M. Becker [Tue, 14 May 2019 08:25:02 +0000 (10:25 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test case
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:51:05 +0000 (18:51 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Mon, 13 May 2019 17:47:43 +0000 (18:47 +0100)]
Add ping to the fpm test for bug #77934
Christoph M. Becker [Mon, 13 May 2019 11:10:24 +0000 (13:10 +0200)]
Fix #78003: strip_tags output change since PHP 7.3
A refactoring of the strip tags state machine[1] missed the special
treatment of `depth > 0` when a `>` is encountered in state 2 or 3. We
re-add it for BC reasons.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
5cf64742773ddbf9af69d962a4d12b567fcf0084 >
Nikita Popov [Mon, 13 May 2019 09:06:14 +0000 (11:06 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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:53:31 +0000 (03:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Convert CRLF to LF
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:08:57 +0000 (20:08 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
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:15:08 +0000 (17:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Convert CRLF to LF in *.wsdl files
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:44:47 +0000 (18:44 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix typo
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:14:11 +0000 (18:14 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
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:55:35 +0000 (16:55 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix erroneous assertions
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:34:46 +0000 (12:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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:32 +0000 (12:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix log_verbosity_bug.phpt
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 17:22:21 +0000 (19:22 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add {TMP} placeholder for PHPT INI sections
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:37:49 +0000 (11:37 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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...
Peter Kokot [Tue, 7 May 2019 02:34:37 +0000 (04:34 +0200)]
Convert CRLF line endings to LF
This patch simplifies line endings tracked in the Git repository and
syncs them to all include the LF style instead of the CRLF files.
Newline characters:
- LF (\n) (*nix and Mac)
- CRLF (\r\n) (Windows)
- CR (\r) (old Mac, obsolete)
To see which line endings are in the index and in the working copy the
following command can be used:
`git ls-files --eol`
Git additionally provides `.gitattributes` file to specify if some files
need to have specific line endings on all platforms (either CRLF or LF).
Changed files shouldn't cause issues on modern Windows platforms because
also Git can do output conversion is core.autocrlf=true is set on
Windows and use CRLF newlines in all files in the working tree.
Unless CRLF files are tracked specifically, Git by default tracks all
files in the index using LF newlines.
Jakub Zelenka [Sun, 5 May 2019 20:05:55 +0000 (21:05 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
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
Javier Spagnoletti [Fri, 3 May 2019 01:32:37 +0000 (22:32 -0300)]
Update `NEWS` with changes made at #4093
Javier Spagnoletti [Tue, 30 Apr 2019 17:12:39 +0000 (14:12 -0300)]
Add more missing CURL_VERSION_* constants
And also check for CURL_VERSION_* constants in the sync-constants.php
script.
Related to request #72189: Add missing `CURL_VERSION_*` constants.
Christoph M. Becker [Tue, 30 Apr 2019 07:35:12 +0000 (09:35 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS wrt. sec fixes
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:43 +0000 (00:05 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
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.