]>
granicus.if.org Git - php/log
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
Anatol Belski [Tue, 3 Apr 2018 09:29:38 +0000 (11:29 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 3 Apr 2018 09:29:08 +0000 (11:29 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Tue, 3 Apr 2018 09:28:19 +0000 (11:28 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 3 Apr 2018 08:44:01 +0000 (10:44 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix shared ext/intl compilation
Better explanation for the opcache.max_wasted_percentage ini setting since it was pretty confusing before
Anatol Belski [Tue, 3 Apr 2018 08:43:17 +0000 (10:43 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix shared ext/intl compilation
Anatol Belski [Tue, 3 Apr 2018 08:42:14 +0000 (10:42 +0200)]
Fix shared ext/intl compilation
Christoph M. Becker [Mon, 2 Apr 2018 21:20:20 +0000 (23:20 +0200)]
Update bundled libsqlite to 3.23.0
Dmitry Stogov [Mon, 2 Apr 2018 20:43:37 +0000 (23:43 +0300)]
Prefer reloading key->h
Dmitry Stogov [Mon, 2 Apr 2018 19:16:58 +0000 (22:16 +0300)]
Dereference child1 only after NULL check
Anatol Belski [Sat, 31 Mar 2018 23:03:40 +0000 (01:03 +0200)]
Simplify namespace access
The icu namespace is an alias which resolves to the real namespace.
Anatol Belski [Sat, 31 Mar 2018 16:51:03 +0000 (18:51 +0200)]
Utilize the recommended way to handle the icu namespace
Anatol Belski [Fri, 30 Mar 2018 04:44:25 +0000 (06:44 +0200)]
Revert the automatic namespace addition
Rasmus Lerdorf [Fri, 30 Mar 2018 20:24:17 +0000 (13:24 -0700)]
Better explanation for the opcache.max_wasted_percentage ini setting
since it was pretty confusing before
Rasmus Lerdorf [Fri, 30 Mar 2018 20:24:17 +0000 (13:24 -0700)]
Better explanation for the opcache.max_wasted_percentage ini setting
since it was pretty confusing before
Christoph M. Becker [Fri, 30 Mar 2018 17:39:44 +0000 (19:39 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #52070: imagedashedline() - dashed line sometimes is not visible
Christoph M. Becker [Fri, 30 Mar 2018 17:26:07 +0000 (19:26 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #52070: imagedashedline() - dashed line sometimes is not visible
Christoph M. Becker [Fri, 30 Mar 2018 17:22:23 +0000 (19:22 +0200)]
Fix #52070: imagedashedline() - dashed line sometimes is not visible
We finally remove the inadvertent leftover from the synchronization
with GD 2.0.12.
Jakub Zelenka [Fri, 30 Mar 2018 17:02:07 +0000 (18:02 +0100)]
Merge branch 'PHP-7.2'
Jakub Zelenka [Fri, 30 Mar 2018 16:58:29 +0000 (17:58 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Fri, 30 Mar 2018 16:56:17 +0000 (17:56 +0100)]
Update NEWS with FPM fixes
Jakub Zelenka [Sun, 18 Mar 2018 19:16:30 +0000 (19:16 +0000)]
Prevent modifying of getenv result
Jacob Hipps [Mon, 26 Feb 2018 15:25:24 +0000 (10:25 -0500)]
68440: ensure backwards compatibility with FPM_SOCKETS var; fix sockname size
Jacob Hipps [Fri, 23 Feb 2018 16:36:59 +0000 (11:36 -0500)]
Fix bug #68440: [sapi/fpm] use multiple FPM_SOCKETS env vars to prevent hitting MAX_ARG_STRLEN with a large number of pools
Dmitry Stogov [Fri, 30 Mar 2018 13:41:02 +0000 (16:41 +0300)]
Cache negative defined() results
Anatol Belski [Fri, 30 Mar 2018 12:17:34 +0000 (14:17 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix clang build, ref buf #76153
Anatol Belski [Fri, 30 Mar 2018 12:16:44 +0000 (14:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix clang build, ref buf #76153
Anatol Belski [Fri, 30 Mar 2018 12:14:35 +0000 (14:14 +0200)]
Fix clang build, ref buf #76153
Clang only allows -std=c++11 for C++ source.
Anatol Belski [Thu, 29 Mar 2018 16:31:17 +0000 (18:31 +0200)]
Switch to PostgreSQL 10 for AppVeyor tests
Anatol Belski [Thu, 29 Mar 2018 15:01:27 +0000 (17:01 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update binary SDK version for AppVeyor
Anatol Belski [Thu, 29 Mar 2018 15:00:47 +0000 (17:00 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update binary SDK version for AppVeyor
Anatol Belski [Thu, 29 Mar 2018 14:59:42 +0000 (16:59 +0200)]
Update binary SDK version for AppVeyor
Anatol Belski [Thu, 29 Mar 2018 12:14:29 +0000 (14:14 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Adjust tests for ICU 61.1 compatibility
Anatol Belski [Thu, 29 Mar 2018 12:13:48 +0000 (14:13 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Adjust tests for ICU 61.1 compatibility
Anatol Belski [Thu, 29 Mar 2018 12:12:19 +0000 (14:12 +0200)]
Adjust tests for ICU 61.1 compatibility
Dmitry Stogov [Thu, 29 Mar 2018 08:13:17 +0000 (11:13 +0300)]
Merge identical handlers
Ferenc Kovacs [Wed, 28 Mar 2018 21:23:06 +0000 (23:23 +0200)]
Merge branch 'PHP-7.2'
Ferenc Kovacs [Wed, 28 Mar 2018 21:21:04 +0000 (23:21 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2