]>
granicus.if.org Git - php/log
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.
Stanislav Malyshev [Tue, 30 Apr 2019 05:09:10 +0000 (22:09 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77821: Potential heap corruption in TSendMail()
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:45 +0000 (17:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77943: imageantialias($image, false); does not work
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:29 +0000 (16:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add tests for bug77943
Christoph M. Becker [Mon, 29 Apr 2019 14:29:08 +0000 (16:29 +0200)]
Add tests for bug77943
Christoph M. Becker [Mon, 29 Apr 2019 14:17:58 +0000 (16:17 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77943: imageantialias($image, false); does not work
Christoph M. Becker [Mon, 29 Apr 2019 14:14:26 +0000 (16:14 +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.
Nikita Popov [Mon, 29 Apr 2019 11:53:21 +0000 (13:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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:05:04 +0000 (09:05 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests
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:49:19 +0000 (23:49 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Make MySQLPDOTest::extractVersion() more liberal
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:51:18 +0000 (00:51 +0200)]
Update NEWS
Peter Kokot [Sat, 27 Apr 2019 22:50:54 +0000 (00:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Fix #77024: SplFileObject::__toString() may return array
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:22:10 +0000 (19:22 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
PHP, meet MySQL
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:57 +0000 (18:46 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77944: Wrong meta pdo_type for bigint on LLP64
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:29:03 +0000 (23:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77940: test using outdated mon_thousands_sep for Swedish
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:40:05 +0000 (19:40 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77940: test using outdated mon_thousands_sep for Swedish
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:59:09 +0000 (08:59 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77940: test using outdated mon_thousands_sep for Swedish
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:04:37 +0000 (00:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77938: socket_get_option error
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:46:06 +0000 (09:46 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
news entry for litespeed
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:22 +0000 (12:43 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 23 Apr 2019 10:43:07 +0000 (12:43 +0200)]
Fixed bug #77843
Nikita Popov [Tue, 23 Apr 2019 09:40:13 +0000 (11:40 +0200)]
Fixed bug #77931
George Wang [Sun, 21 Apr 2019 19:59:07 +0000 (15:59 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
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.