]>
granicus.if.org Git - php/log
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.
Peter Kokot [Sat, 20 Apr 2019 17:13:06 +0000 (19:13 +0200)]
Update changelog
Peter Kokot [Sat, 20 Apr 2019 17:12:31 +0000 (19:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update changelog
Fix #77921: static.php.net doesn't work anymore
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:11:01 +0000 (21:11 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update Git repository for Windows build tool kit
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:38 +0000 (16:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Use php-sdk-2.2.0beta5 on AppVeyor
Christoph M. Becker [Thu, 18 Apr 2019 14:51:10 +0000 (16:51 +0200)]
Use php-sdk-2.2.0beta5 on AppVeyor
Dmitry Stogov [Thu, 18 Apr 2019 11:26:15 +0000 (14:26 +0300)]
Check assert only when RC_DEBUG is enabled
Nikita Popov [Thu, 18 Apr 2019 10:24:34 +0000 (12:24 +0200)]
Add a dl() test to Travis
Compile the zend_test extension as shared and try loading it with dl()
to test for obvious issues. Doing this as a standalone call because this
is very specific to the CI setup.
Nikita Popov [Thu, 18 Apr 2019 10:08:09 +0000 (12:08 +0200)]
Fix more dl() interned string assertions
Dmitry Stogov [Wed, 17 Apr 2019 18:57:17 +0000 (21:57 +0300)]
It's safe to keep old string if it's stored not in SHM.
Dmitry Stogov [Wed, 17 Apr 2019 16:31:28 +0000 (19:31 +0300)]
Fixed dl() function. It failed in DEBUG build without opcache because of assert during string interning.
Christoph M. Becker [Wed, 17 Apr 2019 15:23:42 +0000 (17:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77911: Wrong warning for session.sid_bits_per_character
Christoph M. Becker [Wed, 17 Apr 2019 15:23:23 +0000 (17:23 +0200)]
Fix #77911: Wrong warning for session.sid_bits_per_character
Derick Rethans [Wed, 17 Apr 2019 08:39:18 +0000 (09:39 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
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:57:37 +0000 (09:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests for non English environments
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:12:33 +0000 (13:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
next is 7.2.19
Remi Collet [Tue, 16 Apr 2019 11:11:23 +0000 (13:11 +0200)]
next is 7.2.19
Nikita Popov [Tue, 16 Apr 2019 09:47:41 +0000 (11:47 +0200)]
Fix HT flags copying wrt iterator count
HT_FLAGS() includes the full flag word, including the iterator
count. When we're fully reassigning it, we need to make sure that
we either really do want to copy the iterator count (as in some
cases in array.c) or we need to mask only the actual flag byte.
Add an assert to hash_iterators_del() to make sure the iterator
count is non-zero (which is how I ran into this) and make sure that
the iterator count is correctly preserved during array splicing.
Christoph M. Becker [Tue, 16 Apr 2019 09:56:03 +0000 (11:56 +0200)]
Prepare main branch for PHP 7.3.6
Nikita Popov [Tue, 16 Apr 2019 08:38:20 +0000 (10:38 +0200)]
Fix second part of bug #77903
When a HT iterator is one past the end and we rehash, we need to make
sure that it is move to the new one past the end position, to make
sure that newly inserted elements are picked up.
Nikita Popov [Tue, 16 Apr 2019 08:20:19 +0000 (10:20 +0200)]
Partial fix for bug #77903
In the hash position APIs, make sure we always advance to the next
non-undef element and not just when the position is 0 (similar to
what foreach does). This can happen when the position of an
ArrayIterator is one past its current end and a new element is
inserted not directly at that position because the array is packed.
There is still a bug here (as shown in the tests), but this is a
separate issue that also affects plain array iteration in foreach.
Nikita Popov [Mon, 15 Apr 2019 13:27:19 +0000 (15:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 13:26:58 +0000 (15:26 +0200)]
Fixed bug #77895
Nikita Popov [Mon, 15 Apr 2019 13:00:49 +0000 (15:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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:54:31 +0000 (10:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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:25:00 +0000 (10:25 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 08:22:40 +0000 (10:22 +0200)]
Fixed bug #77882
Côme Chilliet [Mon, 15 Apr 2019 08:19:19 +0000 (10:19 +0200)]
Updated NEWS
Côme Chilliet [Mon, 15 Apr 2019 08:16:29 +0000 (10:16 +0200)]
Fix a NULL dereferencing crash in php-ldap
This happens when parsing a control response to a VLV request which does
not contain a "context" string.
See bug #77869
George Wang [Fri, 12 Apr 2019 21:44:32 +0000 (17:44 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
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:08:13 +0000 (13:08 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests wrt. internationalization
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:37:08 +0000 (10:37 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 12 Apr 2019 08:36:26 +0000 (10:36 +0200)]
Fix key leaks in mb_convert_encoding()
Christoph M. Becker [Thu, 11 Apr 2019 16:30:27 +0000 (18:30 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix potential OPcache file cache related issues
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
Nikita Popov [Thu, 11 Apr 2019 10:34:18 +0000 (12:34 +0200)]
Avoid onig match param unused variable warning
Anatol Belski [Wed, 10 Apr 2019 13:20:36 +0000 (15:20 +0200)]
Ensure double slashes are replaced by the path normalization
Anatol Belski [Wed, 10 Apr 2019 12:56:29 +0000 (14:56 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix phar:// include handling with file cache
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:55 +0000 (13:06 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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.