]>
granicus.if.org Git - php/log
Sara Golemon [Tue, 19 Mar 2019 18:33:30 +0000 (14:33 -0400)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Bump versions for 7.2.18
Sara Golemon [Tue, 19 Mar 2019 18:33:13 +0000 (14:33 -0400)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Bump versions for 7.2.18
Sara Golemon [Tue, 19 Mar 2019 18:32:28 +0000 (14:32 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump versions for 7.2.18
Sara Golemon [Tue, 19 Mar 2019 18:31:01 +0000 (14:31 -0400)]
Bump versions for 7.2.18
Remi Collet [Tue, 19 Mar 2019 15:28:22 +0000 (16:28 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
comment out sqlite3.defensive = 1 follow common practice, this is the default value
Remi Collet [Tue, 19 Mar 2019 15:28:10 +0000 (16:28 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
comment out sqlite3.defensive = 1 follow common practice, this is the default value
Remi Collet [Tue, 19 Mar 2019 15:27:57 +0000 (16:27 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
comment out sqlite3.defensive = 1 follow common practice, this is the default value
Remi Collet [Tue, 19 Mar 2019 15:26:26 +0000 (16:26 +0100)]
comment out sqlite3.defensive = 1
follow common practice, this is the default value
Christoph M. Becker [Tue, 19 Mar 2019 15:22:53 +0000 (16:22 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prepare main branch for PHP 7.3.5
Christoph M. Becker [Tue, 19 Mar 2019 15:22:12 +0000 (16:22 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Prepare main branch for PHP 7.3.5
Christoph M. Becker [Tue, 19 Mar 2019 15:20:55 +0000 (16:20 +0100)]
Prepare main branch for PHP 7.3.5
Remi Collet [Tue, 19 Mar 2019 15:16:26 +0000 (16:16 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix test for upcoming pcre2 10.33
Remi Collet [Tue, 19 Mar 2019 15:16:13 +0000 (16:16 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
fix test for upcoming pcre2 10.33
Remi Collet [Tue, 19 Mar 2019 15:15:14 +0000 (16:15 +0100)]
fix test for upcoming pcre2 10.33
"group name ..." => "subpattern name ..."
Nikita Popov [Tue, 19 Mar 2019 14:37:07 +0000 (15:37 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 19 Mar 2019 14:35:15 +0000 (15:35 +0100)]
Respect OFFSET_CAPTURE when padding preg_match_all() results
This issue was mentioned in bug #73948. The PREG_PATTERN_ORDER
padding was performed without respecting the PREF_OFFSET_CAPTURE
flag, which resulted in unmatched subpatterns being either null or
[null, -1] depending on where they occur. Now they will always be
[null, -1], consistent with other usages.
Nikita Popov [Tue, 19 Mar 2019 12:59:48 +0000 (13:59 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 19 Mar 2019 12:59:43 +0000 (13:59 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 19 Mar 2019 12:57:39 +0000 (13:57 +0100)]
Fixed bug #76127
Per documentation, and consistent with other preg functions, we
should return false if an error occurred.
Nikita Popov [Tue, 19 Mar 2019 12:10:01 +0000 (13:10 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 19 Mar 2019 12:06:21 +0000 (13:06 +0100)]
Don't create a new array for empty/null match every time
If PREG_OFFSET_CAPTURE is used, unmatched subpatterns will be either
[null, -1] or ['', -1] depending on PREG_UNMATCHED_AS_NULL mode.
Instead of creating a new array like this every time, cache it inside
a global (per-request -- could make it immutable though).
Additionally check whether the subpattern is an empty string or
single character string and use an existing interned string in that
case. Empty / single-char subpatterns are common, so let's avoid
allocating strings for them.
Nikita Popov [Tue, 19 Mar 2019 11:02:00 +0000 (12:02 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 19 Mar 2019 11:00:38 +0000 (12:00 +0100)]
Revert unintended change
I wanted to cache subpat names, but we can't do that because the
cache relives request boundaries.
Nikita Popov [Tue, 19 Mar 2019 10:59:36 +0000 (11:59 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 19 Mar 2019 10:55:40 +0000 (11:55 +0100)]
Use zend_string for subpat_names table
When used with preg_match_all or preg_replace_callback(_array),
subpattern names can be used in the matches array many times.
Switch the subpat_names table to use zend_string, so we don't have
to allocate a new string every time. Also don't bother creating the
table if no $matches were passed.
This might be a regression for the case where preg_match() is used
with many trailing named subpatterns that are skipped in the result
array, but that seems rather contrived.
Dmitry Stogov [Tue, 19 Mar 2019 10:53:18 +0000 (13:53 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Improve white-space handling
Dmitry Stogov [Tue, 19 Mar 2019 10:52:55 +0000 (13:52 +0300)]
Improve white-space handling
Nikita Popov [Tue, 19 Mar 2019 10:29:20 +0000 (11:29 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 19 Mar 2019 10:18:43 +0000 (11:18 +0100)]
Avoid copying subpat twice if named subpats are used
Nikita Popov [Tue, 19 Mar 2019 09:40:08 +0000 (10:40 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 18 Mar 2019 13:22:06 +0000 (14:22 +0100)]
Fix #77094: Add flags support for pcre_replace_callback(_array)
Nikita Popov [Tue, 19 Mar 2019 09:03:17 +0000 (10:03 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 19 Mar 2019 09:03:11 +0000 (10:03 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 19 Mar 2019 09:02:50 +0000 (10:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Vlad Temian [Mon, 18 Mar 2019 16:35:24 +0000 (18:35 +0200)]
Fixed bug #77765
Set mode 40755 for directories, via FTP stream stat.
Because we already manage to CWD into the current directory,
we should set 40755 as mode, instead of 40644.
Nikita Popov [Tue, 19 Mar 2019 08:56:00 +0000 (09:56 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 19 Mar 2019 08:55:52 +0000 (09:55 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 19 Mar 2019 08:55:24 +0000 (09:55 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Miriam Lauter [Mon, 18 Mar 2019 16:47:18 +0000 (12:47 -0400)]
Fix #77767: phpdbg break command help message shows incorrect aliases
Previously the aliases for at and del were listed as A and d
in the help message for break. This patch corrects the aliases
to be @ and ~ respectively.
Kalle Sommer Nielsen [Tue, 19 Mar 2019 04:58:15 +0000 (06:58 +0200)]
This should be redundant too as we use a centralized PCRE install
Kalle Sommer Nielsen [Tue, 19 Mar 2019 04:50:02 +0000 (06:50 +0200)]
Remove the PCRE checks from ext/filter. pecl/filter is obsolete and since PCRE is a hard dependency for PHP, it will always be available.
A side effect of this should be that Unix builds now support shared builds using ./configure
Dmitry Stogov [Mon, 18 Mar 2019 23:02:37 +0000 (02:02 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
micro-optimization
Dmitry Stogov [Mon, 18 Mar 2019 23:02:14 +0000 (02:02 +0300)]
micro-optimization
Peter Kokot [Mon, 18 Mar 2019 22:04:43 +0000 (23:04 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Leave bundled generated files untouched
Peter Kokot [Mon, 18 Mar 2019 22:02:57 +0000 (23:02 +0100)]
Leave bundled generated files untouched
When building lexer and parser files leave bundled files untouched as
are tracked in the Git. *.orig files also don't need to be cleaned
anymore.
Christoph M. Becker [Mon, 18 Mar 2019 19:09:43 +0000 (20:09 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix order
Christoph M. Becker [Mon, 18 Mar 2019 19:08:49 +0000 (20:08 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix order
Christoph M. Becker [Mon, 18 Mar 2019 19:07:38 +0000 (20:07 +0100)]
Fix order
Christoph M. Becker [Mon, 18 Mar 2019 18:27:38 +0000 (19:27 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77578: Crash when php unload
Christoph M. Becker [Mon, 18 Mar 2019 18:26:08 +0000 (19:26 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77578: Crash when php unload
Christoph M. Becker [Mon, 18 Mar 2019 18:22:51 +0000 (19:22 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77578: Crash when php unload
Christoph M. Becker [Mon, 18 Mar 2019 17:47:34 +0000 (18:47 +0100)]
Fix #77578: Crash when php unload
Since we're putting `ITypeLib *`s into the hash, we're getting
`ITypeLib *`s back, not `ITypeLib **`s.
Dmitry Stogov [Mon, 18 Mar 2019 16:34:17 +0000 (19:34 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Optimization for ASCII data
Dmitry Stogov [Mon, 18 Mar 2019 16:33:51 +0000 (19:33 +0300)]
Optimization for ASCII data
Nikita Popov [Mon, 18 Mar 2019 15:58:59 +0000 (16:58 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 18 Mar 2019 15:55:25 +0000 (16:55 +0100)]
Don't use random mode in mysqli_query test
MYSQLI_ASYNC is also valid here, at least with mysqlnd. Rather than
using a random mode that is prone to failing once in a blue moon,
use a fixed invalid value.
Nikita Popov [Mon, 18 Mar 2019 11:57:43 +0000 (12:57 +0100)]
Fixed bug #72685
We currently have a large performance problem when implementing lexers
working on UTF-8 strings in PHP. This kind of code tends to perform a
large number of matches at different offsets on a single string. This
is generally fast. However, if /u mode is used, the full string will
be UTF-8 validated on each match. This results in quadratic runtime.
This patch fixes the issue by adding a IS_STR_VALID_UTF8 flag, which
is set when we have determined that the string is valid UTF8 and
further validation is skipped.
A limitation of this approach is that we can't set the flag for interned
strings. I think this is not a problem for this use-case which will
generally work on dynamic data. If we want to use this flag for other
purposes as well (mbstring?) then it might be worthwhile to UTF-8 validate
strings during interning. But right now this doesn't seem useful.
Christoph M. Becker [Mon, 18 Mar 2019 15:00:09 +0000 (16:00 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid unnecessary global variable
Christoph M. Becker [Mon, 18 Mar 2019 14:53:56 +0000 (15:53 +0100)]
Avoid unnecessary global variable
Christoph M. Becker [Mon, 18 Mar 2019 14:05:51 +0000 (15:05 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add bison version check to configure
Christoph M. Becker [Mon, 18 Mar 2019 14:05:19 +0000 (15:05 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add bison version check to configure
Christoph M. Becker [Mon, 18 Mar 2019 14:04:09 +0000 (15:04 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add bison version check to configure
Christoph M. Becker [Mon, 18 Mar 2019 11:27:29 +0000 (12:27 +0100)]
Add bison version check to configure
Since we're already checking for the minimum required re2c version,
also checking for the minimum required bison version is sensible.
Christoph M. Becker [Mon, 18 Mar 2019 14:00:02 +0000 (15:00 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Christoph M. Becker [Mon, 18 Mar 2019 13:59:08 +0000 (14:59 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Simplfy test case
Nikita Popov [Mon, 18 Mar 2019 11:33:12 +0000 (12:33 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 18 Mar 2019 11:25:10 +0000 (12:25 +0100)]
Accept zend_string* instead of char* in php_pcre_match_impl()
Xinchen Hui [Mon, 18 Mar 2019 11:30:20 +0000 (19:30 +0800)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Simplfy test case
Xinchen Hui [Mon, 18 Mar 2019 11:30:11 +0000 (19:30 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Simplfy test case
Xinchen Hui [Mon, 18 Mar 2019 11:28:23 +0000 (19:28 +0800)]
Simplfy test case
(I was working on the same bug while nikic committed the similar fix
Nikita Popov [Mon, 18 Mar 2019 11:16:24 +0000 (12:16 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 18 Mar 2019 11:16:18 +0000 (12:16 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 18 Mar 2019 11:16:12 +0000 (12:16 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 18 Mar 2019 11:14:33 +0000 (12:14 +0100)]
Make test independent of icu version
We don't really care about the actual output here, just that it
doesn't fail.
Nikita Popov [Mon, 18 Mar 2019 10:41:24 +0000 (11:41 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 18 Mar 2019 10:41:19 +0000 (11:41 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 18 Mar 2019 10:39:58 +0000 (11:39 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 18 Mar 2019 10:39:16 +0000 (11:39 +0100)]
Allow DateTimeImmutable in datefmt_format_object()
As pointed out in a comment on bug #65683.
Nikita Popov [Mon, 18 Mar 2019 10:07:43 +0000 (11:07 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 18 Mar 2019 10:07:36 +0000 (11:07 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 18 Mar 2019 10:07:27 +0000 (11:07 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 18 Mar 2019 10:04:25 +0000 (11:04 +0100)]
Partial fix for bug #77751
This avoids the segfault, but it will not make writing to the
SplFileObject during output shutdown work.
Nikita Popov [Mon, 18 Mar 2019 09:51:40 +0000 (10:51 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 18 Mar 2019 09:51:20 +0000 (10:51 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 18 Mar 2019 09:50:39 +0000 (10:50 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 18 Mar 2019 09:49:53 +0000 (10:49 +0100)]
Fixed bug #77743
Christoph M. Becker [Mon, 18 Mar 2019 09:21:38 +0000 (10:21 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #76956: Wrong value for 'syslog.filter' documented in php.ini
Christoph M. Becker [Mon, 18 Mar 2019 09:20:41 +0000 (10:20 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #76956: Wrong value for 'syslog.filter' documented in php.ini
Christoph M. Becker [Mon, 18 Mar 2019 09:04:18 +0000 (10:04 +0100)]
Fix #76956: Wrong value for 'syslog.filter' documented in php.ini
Nikita Popov [Mon, 18 Mar 2019 09:14:19 +0000 (10:14 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 18 Mar 2019 09:14:03 +0000 (10:14 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 18 Mar 2019 09:12:15 +0000 (10:12 +0100)]
Remove x86 bit test optimization
This is undefined behavior and we cannot rely on it. Additionally it
breaks builds using undefined behavior sanitizers.
Nikita Popov [Mon, 18 Mar 2019 09:11:25 +0000 (10:11 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 18 Mar 2019 09:11:00 +0000 (10:11 +0100)]
Fix unused variable warning
Nikita Popov [Mon, 18 Mar 2019 09:05:16 +0000 (10:05 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 18 Mar 2019 09:04:59 +0000 (10:04 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 18 Mar 2019 09:04:29 +0000 (10:04 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
twosee [Sat, 16 Mar 2019 05:21:48 +0000 (13:21 +0800)]
Don't disable object slot reuse while running shutdown functions
We only need to do this once we're running destructors. The current
approach interferes with some event loop code that runs everything
inside a shutdown function.
Peter Kokot [Mon, 18 Mar 2019 01:14:24 +0000 (02:14 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Update changelog
Peter Kokot [Mon, 18 Mar 2019 01:14:18 +0000 (02:14 +0100)]
[ci skip] Update changelog