]>
granicus.if.org Git - php/log
Christoph M. Becker [Mon, 8 Feb 2021 22:12:49 +0000 (23:12 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Avoid C4090 level 1 warning
Christoph M. Becker [Mon, 8 Feb 2021 22:11:37 +0000 (23:11 +0100)]
Avoid C4090 level 1 warning
This breaks the build for PHP 8 by default.
Christoph M. Becker [Mon, 8 Feb 2021 18:00:37 +0000 (19:00 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix locale dependent parsing of PostgreSQL version number
Christoph M. Becker [Fri, 5 Feb 2021 11:53:25 +0000 (12:53 +0100)]
Fix locale dependent parsing of PostgreSQL version number
Version numbers are not supposed to be localized, so we must not apply
locale dependent parsing with `atof()`.
Using `php_version_compare()` might even be better.
Closes GH-6668.
Christoph M. Becker [Mon, 8 Feb 2021 17:43:36 +0000 (18:43 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80706: mail(): Headers after Bcc headers may be ignored
Christoph M. Becker [Thu, 4 Feb 2021 16:43:53 +0000 (17:43 +0100)]
Fix #80706: mail(): Headers after Bcc headers may be ignored
We need to handle the case where a CRLF after a Bcc header is not the
beginning of a folding marker, because in that case the Bcc header was
not the last "thing".
Closes GH-6666.
Nikita Popov [Sun, 7 Feb 2021 16:34:01 +0000 (17:34 +0100)]
Restore Laravel test workaround
I accidentally dropped this during a merge, making the Laravel
job fail.
Tyson Andre [Sat, 6 Feb 2021 19:13:22 +0000 (14:13 -0500)]
Properly render 2+ namespaces functions in build/gen_stub.php
Affects ZEND_NS_FE
Add test cases of the global function
Backported to php 8.0 from GH-6664
Christoph M. Becker [Fri, 5 Feb 2021 13:55:26 +0000 (14:55 +0100)]
Fix test expectation for PHP 8.0
Since float to string conversion is no longer locale dependent, we have
to expect a dot as decimal separator.
Christoph M. Becker [Fri, 5 Feb 2021 13:54:25 +0000 (14:54 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Use ST_Y() instead of the deprecated/removed Y() in test
Christoph M. Becker [Fri, 5 Feb 2021 13:53:19 +0000 (14:53 +0100)]
Use ST_Y() instead of the deprecated/removed Y() in test
Christoph M. Becker [Fri, 5 Feb 2021 12:11:22 +0000 (13:11 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #74779: x() and y() truncating floats to integers
Christoph M. Becker [Thu, 4 Feb 2021 13:43:17 +0000 (14:43 +0100)]
Fix #74779: x() and y() truncating floats to integers
We must not use the locale dependent `atof()`, but instead use the
(hopefully) locale independent `zend_strtod()`, when converting string
representations of floating point numbers which are sent by the server.
Closes GH-6665.
Nikita Popov [Thu, 4 Feb 2021 16:07:30 +0000 (17:07 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Try SIGTERM before SIGKILL in opcache restart
Nikita Popov [Mon, 7 Dec 2020 11:57:30 +0000 (12:57 +0100)]
Try SIGTERM before SIGKILL in opcache restart
SIGTERM is subject to HANDLE_BLOCK_INTERRUPTIONS(), which will
allow code to exit critical sections before it gets terminated.
Closes GH-6493.
Nikita Popov [Thu, 4 Feb 2021 14:18:45 +0000 (15:18 +0100)]
Fix CLI server worker support
If we create separate listening sockets in each worker using
SO_REUSEADDR, then an incoming connection may be load-balanced
to a process that is already busy, either due to a long-running
request, or because it is a recursive request (in which case we
would deadlock).
Instead, only create one listening socket, and only create worker
forks afterwards. This way the incoming request will be served
by one of the workers that is currently listening for an incoming
connection.
Christoph M. Becker [Wed, 3 Feb 2021 11:44:52 +0000 (12:44 +0100)]
[ci skip] Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix newly introduced compiler warning
Christoph M. Becker [Wed, 3 Feb 2021 11:43:15 +0000 (12:43 +0100)]
[ci skip] Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix newly introduced compiler warning
Nikita Popov [Mon, 1 Feb 2021 08:46:17 +0000 (09:46 +0100)]
Fix newly introduced compiler warning
(cherry picked from commit
ab8177de2c89672e63a7a1ccef4df8f7bf34fbd2 )
Christoph M. Becker [Wed, 3 Feb 2021 10:23:59 +0000 (11:23 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #53467: Phar cannot compress large archives
Christoph M. Becker [Tue, 26 Jan 2021 16:46:32 +0000 (17:46 +0100)]
Fix #53467: Phar cannot compress large archives
When Phars are flushed, a new temporary file is created for each entry
which should be compressed, and the `compressed_filesize` is retrieved.
Afterwards, the Phar manifest is written, and only after that the files
are copied to the actual Phar. So for each such entry there is an open
temp file, what easily exceeds the limit.
Therefore, we use a single temporary file for all entries, and store
the start offset in the otherwise unused `header_offset` member. We
ensure that the `cfp` members are properly set to NULL even if flushing
fails, to avoid use after free scenarios.
This solution is based on a suggestion by @lserni[1].
Closes GH-6643.
[1] <https://github.com/box-project/box2/issues/80#issuecomment-
77147371 >
Benjamin Eberlei [Mon, 1 Feb 2021 20:11:12 +0000 (21:11 +0100)]
Fix bug #80600 DOMChildNode::remove does not work on DOMCharacterData.
Closes GH-6660
Christoph M. Becker [Tue, 2 Feb 2021 16:08:00 +0000 (17:08 +0100)]
[ci skip] Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
7.3.28 is next
Christoph M. Becker [Tue, 2 Feb 2021 16:03:05 +0000 (17:03 +0100)]
[ci skip] Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
7.3.28 is next
Christoph M. Becker [Tue, 2 Feb 2021 16:01:55 +0000 (17:01 +0100)]
7.3.28 is next
Nikita Popov [Tue, 2 Feb 2021 15:46:52 +0000 (16:46 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Update year to 2021
Peter Kokot [Sun, 24 Jan 2021 11:23:20 +0000 (12:23 +0100)]
Update year to 2021
Closes GH-6636.
Nikita Popov [Tue, 2 Feb 2021 15:43:43 +0000 (16:43 +0100)]
Remove unnecessary cast in snmp_set_oid_output_format
This cast isn't needed, and could result in the ValueError being
skipped due to truncation.
Nikita Popov [Tue, 2 Feb 2021 09:32:11 +0000 (10:32 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Add missing derefs in CurlFile
Nikita Popov [Tue, 2 Feb 2021 09:31:16 +0000 (10:31 +0100)]
Add missing derefs in CurlFile
As pointed out on GH-6456.
Nikita Popov [Tue, 2 Feb 2021 09:07:04 +0000 (10:07 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix persistent leak on load_wsdl_ex failure
Nikita Popov [Tue, 2 Feb 2021 09:05:35 +0000 (10:05 +0100)]
Fix persistent leak on load_wsdl_ex failure
Move the load_wsdl_ex call into the zend_try that destroys the
docs hash table. The wsdl will be inserted into docs early on,
and will thus be released on subsequent bailout.
Christoph M. Becker [Mon, 1 Feb 2021 12:43:57 +0000 (13:43 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Revert "Updated to version 2021.1 (2021a)"
Christoph M. Becker [Mon, 1 Feb 2021 12:42:43 +0000 (13:42 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Revert "Updated to version 2021.1 (2021a)"
Christoph M. Becker [Mon, 1 Feb 2021 12:41:32 +0000 (13:41 +0100)]
Revert "Updated to version 2021.1 (2021a)"
This reverts commit
491488d21707062fa8e9b9187db3585fb0d347da , since
PHP-7.3 is in security mode, and this does not look security related.
Christoph M. Becker [Mon, 1 Feb 2021 11:59:22 +0000 (12:59 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80654: file_get_contents() maxlen fails above (2**31)-1 bytes
Christoph M. Becker [Thu, 28 Jan 2021 16:00:16 +0000 (17:00 +0100)]
Fix #80654: file_get_contents() maxlen fails above (2**31)-1 bytes
We remove the arbitrary restriction to `INT_MAX`; it is superfluous on
32bit systems where `ZEND_LONG_MAX == INT_MAX` anyway, and not useful
on 64bit systems, where larger files should be readable, if the
`memory_limit` is large enough.
Closes GH-6648.
Nikita Popov [Mon, 1 Feb 2021 09:24:00 +0000 (10:24 +0100)]
XFAIL observer_error_05.phpt test
Nikita Popov [Mon, 1 Feb 2021 08:49:13 +0000 (09:49 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix Laravel build on community job
Nikita Popov [Thu, 28 Jan 2021 09:24:48 +0000 (10:24 +0100)]
Fix Laravel build on community job
Now requires PHP 7.4, so use php7.4 to run composer everywhere.
Nikita Popov [Mon, 1 Feb 2021 08:46:27 +0000 (09:46 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix build
Nikita Popov [Mon, 1 Feb 2021 08:46:17 +0000 (09:46 +0100)]
Fix build
David CARLIER [Sat, 30 Jan 2021 09:45:01 +0000 (09:45 +0000)]
crc32 mac build fix
Closes GH-6651.
Stanislav Malyshev [Mon, 1 Feb 2021 05:42:48 +0000 (21:42 -0800)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix bug #80672 - Null Dereference in SoapClient
Stanislav Malyshev [Mon, 1 Feb 2021 05:42:41 +0000 (21:42 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #80672 - Null Dereference in SoapClient
Stanislav Malyshev [Mon, 1 Feb 2021 05:15:23 +0000 (21:15 -0800)]
Fix bug #80672 - Null Dereference in SoapClient
Christoph M. Becker [Thu, 28 Jan 2021 18:01:20 +0000 (19:01 +0100)]
Add missing stub for SodiumException
Closes GH-6649.
Remi Collet [Thu, 28 Jan 2021 15:26:46 +0000 (16:26 +0100)]
NEWS
Remi Collet [Thu, 28 Jan 2021 15:26:26 +0000 (16:26 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
NEWS
Fix #80682 opcache doesn't honour pcre.jit option
Remi Collet [Thu, 28 Jan 2021 15:25:35 +0000 (16:25 +0100)]
NEWS
Remi Collet [Thu, 28 Jan 2021 15:24:39 +0000 (16:24 +0100)]
Fix #80682 opcache doesn't honour pcre.jit option
Michael Voříšek [Wed, 27 Jan 2021 12:54:15 +0000 (13:54 +0100)]
Fix stub for Serializable::serialize()
This method may also return null.
Sammy Kaye Powers [Fri, 15 Jan 2021 18:07:40 +0000 (10:07 -0800)]
Observe fake closures
Closes GH-6607.
Stanislav Malyshev [Wed, 27 Jan 2021 08:18:49 +0000 (00:18 -0800)]
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 08:15:43 +0000 (00:15 -0800)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 08:15:13 +0000 (00:15 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 08:13:43 +0000 (00:13 -0800)]
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 06:55:16 +0000 (22:55 -0800)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Alternative fix for bug 77423
Stanislav Malyshev [Wed, 27 Jan 2021 06:55:10 +0000 (22:55 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Alternative fix for bug 77423
Christoph M. Becker [Tue, 19 Jan 2021 10:23:25 +0000 (11:23 +0100)]
Alternative fix for bug 77423
That bug report originally was about `parse_url()` misbehaving, but the
security aspect was actually only regarding `FILTER_VALIDATE_URL`.
Since the changes to `parse_url_ex()` apparently affect userland code
which is relying on the sloppy URL parsing[1], this alternative
restores the old parsing behavior, but ensures that the userinfo is
checked for correctness for `FILTER_VALIDATE_URL`.
[1] <https://github.com/php/php-src/commit/
5174de7cd33c3d4fa591c9c93859ff9989b07e8c #commitcomment-
45967652 >
Dmitry Stogov [Tue, 26 Jan 2021 18:31:15 +0000 (21:31 +0300)]
Fixed observer API and JIT compatibility
Christoph M. Becker [Tue, 26 Jan 2021 18:15:00 +0000 (19:15 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #70091: Phar does not mark UTF-8 filenames in ZIP archives
Christoph M. Becker [Tue, 26 Jan 2021 15:50:04 +0000 (16:50 +0100)]
Fix #70091: Phar does not mark UTF-8 filenames in ZIP archives
The default encoding of filenames in a ZIP archive is IBM Code Page
437. Phar, however, only supports UTF-8 filenames. Therefore we have
to mark filenames as being stored in UTF-8 by setting the general
purpose bit 11 (the language encoding flag).
The effect of not setting this bit for non ASCII filenames can be seen
in popular tools like 7-Zip and UnZip, but not when extracting the
archives via ext/phar (which is agnostic to the filename encoding), or
via ext/zip (which guesses the encoding). Thus we add a somewhat
brittle low-level test case.
Closes GH-6630.
Christoph M. Becker [Tue, 26 Jan 2021 18:09:35 +0000 (19:09 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Update version
Christoph M. Becker [Tue, 26 Jan 2021 18:07:57 +0000 (19:07 +0100)]
Update version
That appears to have been forgotten for a while.
Dmitry Stogov [Tue, 26 Jan 2021 16:23:13 +0000 (19:23 +0300)]
Allow observer handlers disabling optimization in RETURN opcode handler, that may cause loss value of returned local variable.
Dmitry Stogov [Tue, 26 Jan 2021 15:41:26 +0000 (18:41 +0300)]
Skip dummy frames allocated on CPU stack of zend_call_function().
(Usage of "current_observed_frame" varible looks unsafe to me).
Nikita Popov [Tue, 26 Jan 2021 14:15:18 +0000 (15:15 +0100)]
Fix VAR return type verification
We should also set retval_ref when de-indirecting. Otherwise the
retval_ref != retval_ptr comparison below may incorrect assume
that we're returning a reference.
I don't have a reliable reproducer for this issue, but it sometimes
appears in certain configurations in arrow_functions/007.phpt in
conjunction with other changes.
Christoph M. Becker [Mon, 25 Jan 2021 17:48:35 +0000 (18:48 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #75850: Unclear error message wrt. __halt_compiler() w/o semicolon
Christoph M. Becker [Mon, 25 Jan 2021 16:12:48 +0000 (17:12 +0100)]
Fix #75850: Unclear error message wrt. __halt_compiler() w/o semicolon
We add the failure reason to the error message.
Closes GH-6638.
Nikita Popov [Mon, 25 Jan 2021 15:17:14 +0000 (16:17 +0100)]
Improve switch continue warning
Don't suggest "continue N+1" if there is no wrapping loop. The
resulting code would be illegal.
Christoph M. Becker [Fri, 22 Jan 2021 12:08:51 +0000 (13:08 +0100)]
Fix #53251: bindtextdomain with null dir doesn't return old value
Apparently, users expect `bindtextdomain` and `bind_textdomain_codeset`
with `null` as second argument to work like their C counterparts,
namely to return the previously set value. Thus, we support that.
Closes GH-6631.
Alex Samorukov [Fri, 8 Jan 2021 18:09:09 +0000 (19:09 +0100)]
Fix opcache phpize build on FreeBSD
Closes GH-6589.
Derick Rethans [Mon, 25 Jan 2021 10:44:06 +0000 (10:44 +0000)]
Updated to version 2021.1 (2021a)
Derick Rethans [Mon, 25 Jan 2021 10:44:06 +0000 (10:44 +0000)]
Empty merge
Derick Rethans [Mon, 25 Jan 2021 10:44:05 +0000 (10:44 +0000)]
Updated to version 2021.1 (2021a)
Derick Rethans [Mon, 25 Jan 2021 10:44:05 +0000 (10:44 +0000)]
Empty merge
Derick Rethans [Mon, 25 Jan 2021 10:44:04 +0000 (10:44 +0000)]
Updated to version 2021.1 (2021a)
Christoph M. Becker [Sun, 24 Jan 2021 16:58:26 +0000 (17:58 +0100)]
Add missing stub for SNMPException
Christoph M. Becker [Sun, 24 Jan 2021 15:06:49 +0000 (16:06 +0100)]
Add missing stub for com_exception
Christoph M. Becker [Thu, 21 Jan 2021 16:28:41 +0000 (17:28 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Add missing SKIPIF clause for recently introduced test case
Christoph M. Becker [Thu, 21 Jan 2021 16:16:54 +0000 (17:16 +0100)]
Add missing SKIPIF clause for recently introduced test case
Christoph M. Becker [Wed, 20 Jan 2021 15:24:53 +0000 (16:24 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80648: Fix for bug 79296 should be based on runtime version
Christoph M. Becker [Wed, 20 Jan 2021 14:24:47 +0000 (15:24 +0100)]
Fix #80648: Fix for bug 79296 should be based on runtime version
Instead of checking for actually affected libzip versions, we now always
`ZIP_TRUNCATE` empty files unless `ZIP_RDONLY` is set.
Closes GH-6625.
Christoph M. Becker [Wed, 20 Jan 2021 10:04:48 +0000 (11:04 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Add missing SKIPIF clauses to new test cases
Christoph M. Becker [Wed, 20 Jan 2021 09:59:37 +0000 (10:59 +0100)]
Add missing SKIPIF clauses to new test cases
Nikita Popov [Wed, 20 Jan 2021 09:09:31 +0000 (10:09 +0100)]
Skip preloading test on windows
Dmitry Stogov [Wed, 20 Jan 2021 08:03:37 +0000 (11:03 +0300)]
Fixed bug #80634 (write_property handler of internal classes is skipped on preloaded JITted code)
Gabriel Caruso [Tue, 19 Jan 2021 16:00:48 +0000 (13:00 -0300)]
Next is 8.0.3
Gabriel Caruso [Tue, 19 Jan 2021 15:32:17 +0000 (12:32 -0300)]
Fix NEWS placeholder for the next version
This aligns with the PHP-7.4 and PHP-7.3 branches, and should
fix the `sgolemon/php-release` script run for releasing 8.0.2.
Derick Rethans [Tue, 19 Jan 2021 14:59:19 +0000 (14:59 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0
Derick Rethans [Tue, 19 Jan 2021 14:58:38 +0000 (14:58 +0000)]
Update NEWS and version
Derick Rethans [Tue, 19 Jan 2021 14:44:32 +0000 (14:44 +0000)]
Update NEWS for PHP 7.4.15RC1
Nikita Popov [Tue, 19 Jan 2021 10:11:40 +0000 (11:11 +0100)]
Fix observer tests on Windows
Use %e instead of a hardcoded forward slash.
Nikita Popov [Tue, 19 Jan 2021 14:20:01 +0000 (15:20 +0100)]
Fixed bug #80644: ResourceBundle::get() doesn't reset error state
Nikita Popov [Tue, 19 Jan 2021 10:44:22 +0000 (11:44 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fixed bug #42560
sj-i [Sun, 20 Dec 2020 06:57:54 +0000 (15:57 +0900)]
Fixed bug #42560
Check open_basedir after the fallback to the system's temporary
directory in tempnam().
In order to preserve the current behavior of upload_tmp_dir
(do not check explicitly specified dir, but check fallback),
new flags are added to check open_basedir for explicit dir
and for fallback.
Closes GH-6526.
Christoph M. Becker [Mon, 18 Jan 2021 22:39:42 +0000 (23:39 +0100)]
ldap_search() and friends can return array
See the description of <https://www.php.net/ldap-search>, and also the
implementation.
Closes GH-6620.
Christoph M. Becker [Tue, 19 Jan 2021 09:30:06 +0000 (10:30 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #69279: Compressed ZIP Phar extractTo() creates garbage files
Christoph M. Becker [Fri, 18 Dec 2020 17:05:52 +0000 (18:05 +0100)]
Fix #69279: Compressed ZIP Phar extractTo() creates garbage files
When extracting compressed files from an uncompressed Phar, we must not
use the direct file pointer, but rather get an uncompressed file
pointer.
We also add a test to show that deflated and stored entries are
properly extracted.
This also fixes #79912, which appears to be a duplicate of #69279.
Co-authored-by: Anna Filina <afilina@gmail.com>
Closes GH-6599.