]>
granicus.if.org Git - php/log
Dmitry Stogov [Sat, 28 Apr 2018 10:26:32 +0000 (13:26 +0300)]
Revert "Merge branch 'PHP-7.2'"
This reverts commit
f75b8a44cc078045b4e4a0a7dfe7e3ad3a8176e0 , reversing
changes made to
aeb734910ae396d87989005edcc956e8fcb4253c .
Dmitry Stogov [Fri, 27 Apr 2018 22:20:49 +0000 (01:20 +0300)]
Don't store values of PHP_SAPI and PHP_BINARY in file cache, because it may be used by different SAPI.
Dmitry Stogov [Fri, 27 Apr 2018 21:28:01 +0000 (00:28 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp).
Dmitry Stogov [Fri, 27 Apr 2018 21:24:56 +0000 (00:24 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp).
Dmitry Stogov [Fri, 27 Apr 2018 21:19:53 +0000 (00:19 +0300)]
Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp).
Nikita Popov [Fri, 27 Apr 2018 20:24:36 +0000 (22:24 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Fri, 27 Apr 2018 20:23:55 +0000 (22:23 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 27 Apr 2018 20:17:59 +0000 (22:17 +0200)]
Fix bug #76281
Make sure we keep the smart-branch inhibiting NOP even if there
are multiple NOPs in sequence.
Nikita Popov [Fri, 27 Apr 2018 15:02:40 +0000 (17:02 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Fri, 27 Apr 2018 15:01:49 +0000 (17:01 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 27 Apr 2018 14:58:30 +0000 (16:58 +0200)]
Fixed bug #76275
* Adjust IS_SERIALIZED() check to account for potential empty
allocations at the end of the memory region.
* Deallocate empty allocation if all try/catch elements have been
removed in the block pass (similar to what we do if all live
ranges have been eliminated).
Thomas Punt [Thu, 26 Apr 2018 20:09:34 +0000 (21:09 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Allocate default ini values into persistent memory
Thomas Punt [Thu, 26 Apr 2018 20:09:08 +0000 (21:09 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Allocate default ini values into persistent memory
Thomas Punt [Thu, 26 Apr 2018 20:08:19 +0000 (21:08 +0100)]
Allocate default ini values into persistent memory
Thomas Punt [Thu, 26 Apr 2018 15:44:02 +0000 (16:44 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix memory leak when phpdbg fails to start up
Thomas Punt [Thu, 26 Apr 2018 15:42:21 +0000 (16:42 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix memory leak when phpdbg fails to start up
Thomas Punt [Thu, 26 Apr 2018 15:39:52 +0000 (16:39 +0100)]
Fix memory leak when phpdbg fails to start up
Nikita Popov [Thu, 26 Apr 2018 14:53:58 +0000 (16:53 +0200)]
Fix unused variable warnings
David Carlier [Wed, 4 Apr 2018 22:06:26 +0000 (23:06 +0100)]
Avoid using _N in SSE code
The _N constant is already defined in OpenSSL. Instead use some
more explicit variable names.
Nikita Popov [Thu, 26 Apr 2018 14:17:23 +0000 (16:17 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Thu, 26 Apr 2018 14:17:13 +0000 (16:17 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
shiguangqi2008@gmail.com [Thu, 26 Apr 2018 10:16:30 +0000 (18:16 +0800)]
Fix memory leak in zend_disable_class()
Anatol Belski [Thu, 26 Apr 2018 12:20:36 +0000 (14:20 +0200)]
Switch to more robust config for external pcre2
For the standard layout the first option is pkg-config. Otherwise,
pcre2-config is used, which is produced by a manual installation into a
prefix. This removes the most of the hackish pieces like checking for
the lib filenames and parsing headers.
Anatol Belski [Wed, 25 Apr 2018 14:30:10 +0000 (16:30 +0200)]
Fix regex
Anatol Belski [Wed, 25 Apr 2018 14:15:28 +0000 (16:15 +0200)]
Revamp pcre config for build with external lib
- support multiarch in addition to the usual lib path
- fix symbol checks
- fix jit availability check
- exit early on unsupported version
Scott Arciszewski [Tue, 24 Apr 2018 20:21:22 +0000 (16:21 -0400)]
Update NEWS
Add whitespace in NEWS file
Ferenc Kovacs [Tue, 24 Apr 2018 22:18:24 +0000 (00:18 +0200)]
Merge branch 'PHP-7.2'
Ferenc Kovacs [Tue, 24 Apr 2018 22:16:12 +0000 (00:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Tue, 24 Apr 2018 22:14:33 +0000 (00:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Tue, 24 Apr 2018 22:13:11 +0000 (00:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Tue, 24 Apr 2018 21:23:14 +0000 (23:23 +0200)]
5.6.37 will be next
Remi Collet [Tue, 24 Apr 2018 15:28:25 +0000 (17:28 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
update NEWS for 7.2.5
Remi Collet [Tue, 24 Apr 2018 15:28:05 +0000 (17:28 +0200)]
update NEWS for 7.2.5
Anatol Belski [Tue, 24 Apr 2018 15:06:04 +0000 (17:06 +0200)]
Fix lib names for build with external libpcre2
Anatol Belski [Tue, 24 Apr 2018 09:38:14 +0000 (11:38 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
7.0.31 next
Anatol Belski [Tue, 24 Apr 2018 09:37:57 +0000 (11:37 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
7.0.31 next
Anatol Belski [Tue, 24 Apr 2018 09:37:10 +0000 (11:37 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
7.0.31 next
Anatol Belski [Tue, 24 Apr 2018 09:36:12 +0000 (11:36 +0200)]
7.0.31 next
Anatol Belski [Tue, 24 Apr 2018 09:26:27 +0000 (11:26 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update NEWS
Anatol Belski [Tue, 24 Apr 2018 09:24:10 +0000 (11:24 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Tue, 24 Apr 2018 09:21:44 +0000 (11:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Update NEWS
Anatol Belski [Tue, 24 Apr 2018 09:21:03 +0000 (11:21 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 24 Apr 2018 08:49:34 +0000 (10:49 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix test portability
Anatol Belski [Tue, 24 Apr 2018 08:49:15 +0000 (10:49 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix test portability
Anatol Belski [Tue, 24 Apr 2018 08:48:49 +0000 (10:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix test portability
Anatol Belski [Tue, 24 Apr 2018 08:48:22 +0000 (10:48 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix test portability
Anatol Belski [Tue, 24 Apr 2018 08:47:32 +0000 (10:47 +0200)]
Fix test portability
Stanislav Malyshev [Tue, 24 Apr 2018 05:04:22 +0000 (22:04 -0700)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 24 Apr 2018 05:03:33 +0000 (22:03 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 24 Apr 2018 05:00:24 +0000 (22:00 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 24 Apr 2018 04:59:50 +0000 (21:59 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Mon, 23 Apr 2018 23:48:27 +0000 (16:48 -0700)]
Fix tsrm_ls
Stanislav Malyshev [Mon, 23 Apr 2018 20:44:19 +0000 (13:44 -0700)]
Merge remote-tracking branch 'security/bug76249' into PHP-5.6
* security/bug76249:
Fix test
Fix bug #76249 - fail on invalid sequences
Stanislav Malyshev [Mon, 23 Apr 2018 20:44:12 +0000 (13:44 -0700)]
Merge remote-tracking branch 'security/bug76248' into PHP-5.6
* security/bug76248:
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Stanislav Malyshev [Wed, 28 Mar 2018 04:22:28 +0000 (21:22 -0700)]
Fix #76129 - remove more potential unfiltered outputs for phar
Stanislav Malyshev [Mon, 23 Apr 2018 20:42:51 +0000 (13:42 -0700)]
Merge remote-tracking branch 'security/PHP-5.6' into PHP-5.6
* security/PHP-5.6:
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Mon, 23 Apr 2018 05:19:51 +0000 (22:19 -0700)]
Fix test
Stanislav Malyshev [Mon, 23 Apr 2018 05:01:35 +0000 (22:01 -0700)]
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Stanislav Malyshev [Mon, 23 Apr 2018 04:26:06 +0000 (21:26 -0700)]
Fix bug #76249 - fail on invalid sequences
Stanislav Malyshev [Mon, 23 Apr 2018 03:28:44 +0000 (20:28 -0700)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Add a bit of defensive conding for bug #76155
Stanislav Malyshev [Mon, 23 Apr 2018 03:28:35 +0000 (20:28 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add a bit of defensive conding for bug #76155
Stanislav Malyshev [Mon, 23 Apr 2018 03:27:42 +0000 (20:27 -0700)]
Add a bit of defensive conding for bug #76155
Even though it should not be ever negative, since strlen() is size_t
better to be safe than sorry.
Christoph M. Becker [Tue, 27 Mar 2018 16:42:55 +0000 (18:42 +0200)]
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
The MakerNote is not necessarily null-terminated, so we must not use
`strlen()` to avoid OOB reads. Instead `php_strnlen()` is the proper
way to handle this.
Anatol Belski [Fri, 20 Apr 2018 09:19:16 +0000 (11:19 +0200)]
Implement output verbosity seting for nmakefile
Anatol Belski [Thu, 19 Apr 2018 11:28:24 +0000 (13:28 +0200)]
Avoid strlen calls for regexes
Anatol Belski [Tue, 17 Apr 2018 13:09:31 +0000 (15:09 +0200)]
Move to unsigned types in phar
Preventing integer overflows in principle, which allows to avoid additional
range checks. The phar format is based on 32-bit lengths, so the storage
sizes was kept same.
Jakub Zelenka [Sun, 15 Apr 2018 19:43:17 +0000 (20:43 +0100)]
Merge branch 'PHP-7.2'
Jakub Zelenka [Sun, 15 Apr 2018 19:42:28 +0000 (20:42 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Sun, 15 Apr 2018 19:41:23 +0000 (20:41 +0100)]
Make openssl_error_string test work in OpenSSL 1.1.1
It was the only failing test
Mark Seuffert [Wed, 4 Apr 2018 22:56:48 +0000 (00:56 +0200)]
No Content-Type header if MIME type is unknown
Levi Morrison [Sun, 8 Apr 2018 18:19:14 +0000 (12:19 -0600)]
Fix bug #76198
Nikita Popov [Sat, 14 Apr 2018 11:06:13 +0000 (13:06 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Sat, 14 Apr 2018 11:06:00 +0000 (13:06 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Aron Rotteveel [Mon, 26 Mar 2018 12:39:36 +0000 (14:39 +0200)]
reset imap_errorstack after outputting it
This happens in `imap_errors` as well, but seems to be omitted in the `shutdown` routine.
Thomas Punt [Fri, 15 Sep 2017 13:07:59 +0000 (14:07 +0100)]
Implement flexible heredoc/nowdoc syntax
RFC: https://wiki.php.net/rfc/flexible_heredoc_nowdoc_syntaxes
* The ending label no longer has to be followed by a semicolon or
newline. Any non-label character is fine.
* The ending label may be indented. The indentation will be stripped
from all lines in the heredoc/nowdoc string.
Lexing of heredoc strings performs a scan-ahead to determine the
indentation of the ending label, so that the correct amount of
indentation can be removed when calculting the semantic values for
use by the parser. This makes the implementation quite a bit more
complicated than we would like :/
Jakub Zelenka [Fri, 13 Apr 2018 19:18:50 +0000 (20:18 +0100)]
Merge branch 'PHP-7.2'
Jakub Zelenka [Fri, 13 Apr 2018 19:17:52 +0000 (20:17 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Fri, 13 Apr 2018 19:17:24 +0000 (20:17 +0100)]
[ci skip] Update NEWS with fpm acl fix
Jakub Zelenka [Fri, 13 Apr 2018 19:13:18 +0000 (20:13 +0100)]
Merge branch 'PHP-7.2'
Jakub Zelenka [Fri, 13 Apr 2018 19:12:03 +0000 (20:12 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Michał Górny [Fri, 2 Mar 2018 15:19:34 +0000 (16:19 +0100)]
Support using acl_* functions on *BSD
The *BSD systems have ACL routines built-in in libc rather than
in separate libacl. Update the configure check to detect that and enable
ACL support without adding 'acl' library.
Christoph M. Becker [Fri, 13 Apr 2018 13:36:15 +0000 (15:36 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix arginfo for array_replace(_recursive) and array_merge(_recursive)
Christoph M. Becker [Fri, 13 Apr 2018 13:27:59 +0000 (15:27 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix arginfo for array_replace(_recursive) and array_merge(_recursive)
Gabriel Caruso [Sun, 25 Mar 2018 17:53:57 +0000 (14:53 -0300)]
Fix arginfo for array_replace(_recursive) and array_merge(_recursive)
Christoph M. Becker [Thu, 12 Apr 2018 21:02:07 +0000 (23:02 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #76164: exif_read_data zend_mm_heap corrupted
Christoph M. Becker [Thu, 12 Apr 2018 21:00:37 +0000 (23:00 +0200)]
Fix #76164: exif_read_data zend_mm_heap corrupted
We must not release parsed parameters ourselves, since this is already
done by the engine.
Christoph M. Becker [Thu, 12 Apr 2018 16:58:56 +0000 (18:58 +0200)]
[ci skip] Update UPGRADING
Cf.
ce1d69a1f6dcf15d43029301059c25e5bc09a577 and
fef879a2d63899ed25f39b4581c16682afdd0a8f , respectively.
Patch provided by Gabriel Caruso.
Anatol Belski [Thu, 12 Apr 2018 16:26:31 +0000 (18:26 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix memory leak
Anatol Belski [Thu, 12 Apr 2018 16:25:58 +0000 (18:25 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix memory leak
Anatol Belski [Thu, 12 Apr 2018 16:25:27 +0000 (18:25 +0200)]
Fix memory leak
Anatol Belski [Thu, 12 Apr 2018 16:24:11 +0000 (18:24 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
bump versions
Anatol Belski [Thu, 12 Apr 2018 16:23:23 +0000 (18:23 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
bump versions
Christoph M. Becker [Thu, 12 Apr 2018 16:12:41 +0000 (18:12 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update NEWS
Christoph M. Becker [Thu, 12 Apr 2018 16:11:41 +0000 (18:11 +0200)]
Christoph M. Becker [Thu, 12 Apr 2018 15:43:23 +0000 (17:43 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed #74892 - Fixed URL rewriting for urls started with #
Andrew Nester [Tue, 11 Jul 2017 18:50:38 +0000 (21:50 +0300)]
Fixed #74892 - Fixed URL rewriting for urls started with #
(cherry picked from commit
6c32d271d238a18cfc19d98877cdead1ab38f417 )
This should have already been merged via
9cd82df0bbb1f9a1407ffb749292576be1b91c07 , but that merge went wrong.
Joe Watkins [Wed, 11 Apr 2018 06:08:52 +0000 (08:08 +0200)]
bump versions
Remi Collet [Wed, 11 Apr 2018 05:54:31 +0000 (07:54 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
next is 7.2.6
Remi Collet [Wed, 11 Apr 2018 05:53:53 +0000 (07:53 +0200)]
next is 7.2.6
Christoph M. Becker [Tue, 10 Apr 2018 21:20:21 +0000 (23:20 +0200)]
Update bundled libsqlite to 3.23.1