]>
granicus.if.org Git - php/log
Joe Watkins [Wed, 5 Jun 2019 14:35:43 +0000 (16:35 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix flaky posix test
Joe Watkins [Wed, 5 Jun 2019 14:34:50 +0000 (16:34 +0200)]
fix flaky posix test
Nikita Popov [Tue, 4 Jun 2019 14:27:45 +0000 (16:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Jun 2019 13:08:16 +0000 (15:08 +0200)]
Fixed bug #78050
This is a backport of
a9821255612a99f9773c3601ff1914de4e7a7e32 .
Nikita Popov [Tue, 4 Jun 2019 14:14:14 +0000 (16:14 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Jun 2019 13:23:10 +0000 (15:23 +0200)]
Reload tsrmls_id in release builds as well
If TSRM is shut down and started again (something that phpdbg does),
then tsrmls_id needs to be reloaded everywhere. As tsrmls_id
update is a rare operation, doing that shouldn't be a problem.
Remi Collet [Tue, 4 Jun 2019 05:19:29 +0000 (07:19 +0200)]
this was in 7.3.5, not 7.3.6
Nikita Popov [Mon, 3 Jun 2019 13:15:07 +0000 (15:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 3 Jun 2019 13:14:01 +0000 (15:14 +0200)]
Clear errors after SSL_CTX_load_verify_locations()
We report our own errors here. Make sure these don't clog up the
error queue.
Jakub Zelenka [Sun, 2 Jun 2019 18:13:18 +0000 (19:13 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 2 Jun 2019 18:10:56 +0000 (19:10 +0100)]
Fix bug #78079 (openssl_encrypt_ccm.phpt fails with OpenSSL 1.1.1c)
It also fixes invalid setting of tag length
Anatol Belski [Sat, 1 Jun 2019 12:49:57 +0000 (14:49 +0200)]
Fix expect section
Anatol Belski [Sat, 1 Jun 2019 11:44:10 +0000 (13:44 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update SDK version for AppVeyor
Anatol Belski [Sat, 1 Jun 2019 11:43:31 +0000 (13:43 +0200)]
Update SDK version for AppVeyor
Anatol Belski [Sat, 1 Jun 2019 00:26:07 +0000 (02:26 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Change ZPP only if compiled with ICU >= 64
Update tests for ICU 64
Anatol Belski [Sat, 1 Jun 2019 00:18:56 +0000 (02:18 +0200)]
Change ZPP only if compiled with ICU >= 64
Nikita Popov [Fri, 31 May 2019 13:39:03 +0000 (15:39 +0200)]
Update tests for ICU 64
(cherry picked from commit
8a8bc5c4529223ecf4f421b1bed03618f7394335 )
Anatol Belski [Fri, 31 May 2019 18:50:17 +0000 (20:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix var name
Anatol Belski [Fri, 31 May 2019 18:49:42 +0000 (20:49 +0200)]
Fix var name
Craig Duncan [Thu, 30 May 2019 17:55:55 +0000 (18:55 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add a test for bug #65672
Ensure the internal properties cannot be overwritten
Craig Duncan [Tue, 20 Feb 2018 21:12:43 +0000 (21:12 +0000)]
Add a test for bug #65672
Craig Duncan [Tue, 20 Feb 2018 21:11:03 +0000 (21:11 +0000)]
Ensure the internal properties cannot be overwritten
Nikita Popov [Wed, 29 May 2019 14:47:19 +0000 (16:47 +0200)]
SCCP: Fix leak when determining TYPE_CHECK from type info
As TYPE_CHECK is the only opcode where we do something like this,
I'm adding this hack.
Nikita Popov [Wed, 29 May 2019 07:47:43 +0000 (09:47 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Craig Duncan [Tue, 28 May 2019 19:49:14 +0000 (20:49 +0100)]
Add tests for DatePeriod properties
Christoph M. Becker [Wed, 29 May 2019 07:27:23 +0000 (09:27 +0200)]
Update NEWS for 7.3.6
Remi Collet [Wed, 29 May 2019 06:53:42 +0000 (08:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add NEWS entries for sec fix
Remi Collet [Wed, 29 May 2019 06:53:23 +0000 (08:53 +0200)]
add NEWS entries for sec fix
Joe Watkins [Wed, 29 May 2019 06:30:41 +0000 (08:30 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
disabled functions must not have return type
Joe Watkins [Wed, 29 May 2019 06:30:08 +0000 (08:30 +0200)]
disabled functions must not have return type
Craig Duncan [Tue, 28 May 2019 20:51:26 +0000 (21:51 +0100)]
Restore the execute bit for run-tests.php
It looks like this was accidentally removed in
03f15f705ad30ce2dde7f7b2ab087a132b859ba0
Nikita Popov [Tue, 28 May 2019 14:41:08 +0000 (16:41 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 28 May 2019 14:39:49 +0000 (16:39 +0200)]
Fix type inference of SEND_UNPACK with empty array
An empty array will not be turned into an array of references.
This violated the invariant than an array has values iff it has
keys.
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