Nikita Popov
b394654c1e
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-23 11:12:59 +02:00
Nikita Popov
9a74b23297
Fixed bug #78038 socket_select with references
2019-05-23 11:12:15 +02:00
Dmitry Stogov
d4867e099e
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed race condition in opcache restart
2019-05-23 00:21:04 +03:00
Dmitry Stogov
fa6a4483e6
Fixed race condition in opcache restart
2019-05-23 00:20:35 +03:00
Dmitry Stogov
aa9c76d027
Fixed dump of constant flags
2019-05-22 22:59:40 +03:00
Nikita Popov
f308aa4e1e
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-22 12:45:16 +02:00
Sjon Hortensius
96404eb8e2
Fix #77956 - When mysqli.allow_local_infile = Off, return a client error
2019-05-22 12:44:55 +02:00
Christoph M. Becker
69c634a56d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test case for cURL 7.65.0
2019-05-22 12:02:03 +02:00
Christoph M. Becker
62fe6ba20c
Fix test case for cURL 7.65.0
...
Reported and patch provided by @Jan-E.
2019-05-22 12:01:23 +02:00
Nikita Popov
3a719696bc
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-22 11:43:26 +02:00
Nikita Popov
3a0de243c3
Use a different URL in bug44811.phpt
2019-05-22 11:41:51 +02:00
Rasmus Lerdorf
2d29263a9f
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
2019-05-21 14:46:24 -07:00
Rasmus Lerdorf
7b42cdf95e
Fix precedence issue causing sub-second timeouts to be 0 in
...
curl_multi_select
2019-05-21 14:44:11 -07:00
Nikita Popov
97ba6b0d8b
Don't evaluate functions with partial array arguments
2019-05-21 17:35:03 +02:00
Nikita Popov
30f1b17262
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.
2019-05-21 17:15:07 +02:00
Nikita Popov
fc4836b193
Fix partial array handling in FE_RESET edge feasibility
2019-05-21 16:59:27 +02:00
Nikita Popov
cd188d0398
Handle partial arrays in zend_is_true() checks
2019-05-21 16:53:34 +02:00
Nikita Popov
bdce5849b7
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.
2019-05-21 16:43:41 +02:00
Nikita Popov
367788cbc3
Improve SCCP debug code
...
In particular properly dump partial arrays when tracing execution.
2019-05-21 16:42:13 +02:00
Christoph M. Becker
d23bc33dc1
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Prevent test case failure
2019-05-21 11:18:32 +02:00
Christoph M. Becker
e6a191de1b
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.
2019-05-21 11:17:51 +02:00
Nikita Popov
4ebd9a5366
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-21 10:04:51 +02:00
Vincent JARDIN
5f8c22d415
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 c55af3c65a
to the PHP 7.2 branch.
2019-05-21 10:04:15 +02:00
Christoph M. Becker
11740abd6b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
use {TMP} placeholder in phpt tests
2019-05-21 09:03:01 +02:00
Holly Li (WIPRO LIMITED)
202e6936d6
use {TMP} placeholder in phpt tests
2019-05-21 09:02:37 +02:00
Dmitry Stogov
354a76bb80
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Prevent race condition in opcache_reset()
2019-05-21 00:08:03 +03:00
Dmitry Stogov
a8a019d68a
Prevent race condition in opcache_reset()
2019-05-21 00:07:17 +03:00
Christoph M. Becker
db8ef71353
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test wrt. opcache.error_log
2019-05-20 11:10:20 +02:00
Christoph M. Becker
64ec9f4dbe
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.
2019-05-20 11:09:44 +02:00
Christoph M. Becker
fd607635a4
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78025 : segfault when accessing properties of DOMDocumentType
2019-05-17 13:32:13 +02:00
Christoph M. Becker
e246dea9fe
Fix #78025 : segfault when accessing properties of DOMDocumentType
...
Instead of following the NULL pointer, we return an empty string.
2019-05-17 13:31:18 +02:00
Nikita Popov
9d76fbd0c4
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...
2019-05-15 14:35:31 +02:00
Nikita Popov
5846119e50
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-15 12:48:35 +02:00
Nikita Popov
35353dc49a
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.
2019-05-15 12:46:23 +02:00
Christoph M. Becker
714d2d8ae1
Update NEWS regarding re-tagging 7.3.6RC1
2019-05-15 11:31:53 +02:00
Sara Golemon
8511c204c3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Bump for 7.2.20
2019-05-14 20:23:25 -04:00
Sara Golemon
4fa32d67bf
Bump for 7.2.20
2019-05-14 20:22:00 -04:00
Dmitry Stogov
bb7ecb8704
Moved NEWS entry
2019-05-14 14:55:28 +03:00
Dmitry Stogov
a43678aa12
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed possible crashes, because of inconsistent PCRE cache and opcache SHM reset
2019-05-14 14:54:30 +03:00
Dmitry Stogov
5c4d125d4c
Fixed possible crashes, because of inconsistent PCRE cache and opcache SHM reset
2019-05-14 14:53:52 +03:00
Christoph M. Becker
2d93cce03a
Prepare 7.3.7-dev
2019-05-14 11:44:58 +02:00
Christoph M. Becker
1a98878bfe
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test case
2019-05-14 10:25:02 +02:00
Christoph M. Becker
704a0ab0c9
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.
2019-05-14 10:23:58 +02:00
Jakub Zelenka
aa74c30466
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-13 18:51:05 +01:00
Jakub Zelenka
ad63bd169b
Add ping to the fpm test for bug #77934
2019-05-13 18:50:24 +01:00
Christoph M. Becker
69bab6e5a5
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 >
2019-05-13 13:10:24 +02:00
Nikita Popov
bec68d59a2
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-13 11:06:14 +02:00
Theodore Brown
b6b15fc65c
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`.
2019-05-13 11:04:56 +02:00
Peter Kokot
43e6fd1e2b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Convert CRLF to LF
2019-05-13 03:53:31 +02:00
Peter Kokot
f95b27c6f6
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.
2019-05-13 03:51:00 +02:00