]>
granicus.if.org Git - php/log
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
George Wang [Tue, 10 Apr 2018 20:57:49 +0000 (16:57 -0400)]
Merge branch 'PHP-7.2'
George Wang [Tue, 10 Apr 2018 20:49:29 +0000 (16:49 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
George Wang [Tue, 10 Apr 2018 20:48:04 +0000 (16:48 -0400)]
Updated LiteSpeed SAPI to 7.1 .
Xinchen Hui [Tue, 10 Apr 2018 08:33:51 +0000 (16:33 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite)
Xinchen Hui [Tue, 10 Apr 2018 08:33:31 +0000 (16:33 +0800)]
Update NEWS
Xinchen Hui [Tue, 10 Apr 2018 08:32:28 +0000 (16:32 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite)
Xinchen Hui [Tue, 10 Apr 2018 08:32:08 +0000 (16:32 +0800)]
Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite)
Anatol Belski [Fri, 6 Apr 2018 19:33:13 +0000 (21:33 +0200)]
Rethink conditions
Raise the requirement to ICU 56. Mixing both old and new normalizer APIs
would create too much complexity. Therefore go by the recommended ICU
version where all the normalizer API became stable. For the older ICU,
the deprecated normalizer API is used.
Anatol Belski [Fri, 6 Apr 2018 16:14:11 +0000 (18:14 +0200)]
Expose functionality for NFKC_Casefold normalization
Anatol Belski [Fri, 6 Apr 2018 09:13:15 +0000 (11:13 +0200)]
Sync normalizer_get_raw_decomposition() to allow passing form
as it is the case with the other Normalizer methods.
Anatol Belski [Fri, 6 Apr 2018 08:10:17 +0000 (10:10 +0200)]
Replace the deprecated API by the newer one available with ICU 56+
Khan M Rashedun-Naby [Tue, 3 Apr 2018 16:52:49 +0000 (22:52 +0600)]
Author Name Character Fix
Anatol Belski [Thu, 5 Apr 2018 16:08:49 +0000 (18:08 +0200)]
Check feature availability as ICU < 49 is still supported
Anatol Belski [Thu, 5 Apr 2018 15:22:44 +0000 (17:22 +0200)]
Use recommended way to handle utf*.h headers and obsolete symbols
Anatol Belski [Thu, 5 Apr 2018 14:46:34 +0000 (16:46 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Group common flags
Anatol Belski [Thu, 5 Apr 2018 14:45:41 +0000 (16:45 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Group common flags
Anatol Belski [Thu, 5 Apr 2018 14:44:12 +0000 (16:44 +0200)]
Group common flags
Anatol Belski [Thu, 5 Apr 2018 12:56:45 +0000 (14:56 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Rename var
Anatol Belski [Thu, 5 Apr 2018 12:54:14 +0000 (14:54 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Rename var
Anatol Belski [Thu, 5 Apr 2018 12:52:40 +0000 (14:52 +0200)]
Rename var
Anatol Belski [Thu, 5 Apr 2018 12:22:38 +0000 (14:22 +0200)]
Fix comparison
Anatol Belski [Thu, 5 Apr 2018 11:58:03 +0000 (13:58 +0200)]
Move to non deprecated API on suitable ICU versions
Anatol Belski [Thu, 5 Apr 2018 10:53:24 +0000 (12:53 +0200)]
Use recommended options for explicit UnicodeString constructors
Christoph M. Becker [Wed, 4 Apr 2018 12:11:37 +0000 (14:11 +0200)]
[ci skip] Update UPGRADING
5c5bd3033997583887bd990e54c68adb2934bbdb removed support for `--with-libmbfl`.
Dmitry Stogov [Tue, 3 Apr 2018 23:12:26 +0000 (02:12 +0300)]
Eliminate useless checks
Dmitry Stogov [Tue, 3 Apr 2018 22:12:59 +0000 (01:12 +0300)]
Use "fastcall" calling convention
George Wang [Tue, 3 Apr 2018 15:48:00 +0000 (11:48 -0400)]
Merge branch 'PHP-7.2'
George Wang [Tue, 3 Apr 2018 15:47:41 +0000 (11:47 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
George Wang [Tue, 3 Apr 2018 15:46:24 +0000 (11:46 -0400)]
[BUGFIX] allow php_admin_value to override value set in php.ini without restriction, like adding an extra directory to open_basedir.
Anatol Belski [Tue, 3 Apr 2018 15:25:52 +0000 (17:25 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Sync fix for bug #72498 for 32-bit
Anatol Belski [Tue, 3 Apr 2018 15:25:13 +0000 (17:25 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync fix for bug #72498 for 32-bit
Anatol Belski [Tue, 3 Apr 2018 15:24:13 +0000 (17:24 +0200)]
Sync fix for bug #72498 for 32-bit
Chris Wright [Thu, 29 Mar 2018 11:41:50 +0000 (12:41 +0100)]
Remove warnings from inet_pton()/inet_ntop()
Anatol Belski [Tue, 3 Apr 2018 09:30:14 +0000 (11:30 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS