]>
granicus.if.org Git - php/log
Christoph M. Becker [Sun, 6 Oct 2019 17:03:27 +0000 (19:03 +0200)]
Explicitly declare empty parameter list
Christoph M. Becker [Sun, 6 Oct 2019 15:59:47 +0000 (17:59 +0200)]
Just return on failing ZPP
Christoph M. Becker [Sun, 6 Oct 2019 15:55:59 +0000 (17:55 +0200)]
Add missing zend_parse_parameters_none()
Christoph M. Becker [Sun, 6 Oct 2019 13:44:15 +0000 (15:44 +0200)]
Add MBString arginfo stubs
Thomas Gerbet [Sat, 5 Oct 2019 15:41:15 +0000 (17:41 +0200)]
Add stubs for ext-xmlrpc
Nikita Popov [Sun, 6 Oct 2019 08:07:57 +0000 (10:07 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 2 Oct 2019 10:42:46 +0000 (12:42 +0200)]
Add support for mbstring.regex_retry_limit
This is very similar to the existing mbstring.regex_stack_limit,
but for backtracking. The default value matches pcre.backtrack_limit.
Only used on libonig >= 2.8.0.
Benjamin Eberlei [Sat, 5 Oct 2019 17:01:50 +0000 (19:01 +0200)]
Update NEWS
Benjamin Eberlei [Mon, 23 Sep 2019 20:08:21 +0000 (22:08 +0200)]
ext/dom: Add global registerNodeNS flag on DOMXPath ctor and property.
Christoph M. Becker [Sat, 5 Oct 2019 15:55:28 +0000 (17:55 +0200)]
Add missing zend_parse_parameters_none()
Christoph M. Becker [Sat, 5 Oct 2019 09:09:38 +0000 (11:09 +0200)]
Add ext/pspell arginfo stubs
Christoph M. Becker [Sat, 5 Oct 2019 08:07:43 +0000 (10:07 +0200)]
Add arginfo stub for JsonSerializable
Nikita Popov [Fri, 4 Oct 2019 20:47:10 +0000 (22:47 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 4 Oct 2019 20:46:53 +0000 (22:46 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 4 Oct 2019 20:42:14 +0000 (22:42 +0200)]
Make sure T_ERROR is returned for all lexer exceptions
This originally manifested as a leak in oss-fuzz #18000. The following
is a reduced test case:
<?php
[
5 => 1,
"foo" > 1,
" " => "" == 0
];
<<<BAR
$x
BAR;
Because this particular error condition did not return T_ERROR,
EG(exception) was set while performing binary operation constant
evaluation, which checks exceptions for cast failures.
Instead of adding this indirect test case, I'm adding an assertion
that the lexer has to return T_ERROR if EG(exception) is set.
Nikita Popov [Fri, 4 Oct 2019 14:04:42 +0000 (16:04 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 4 Oct 2019 14:04:34 +0000 (16:04 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 4 Oct 2019 14:01:10 +0000 (16:01 +0200)]
Improve diagnostic on PCRE JIT mmap failure
Print a more informative message that indicates that this is
likely a permission issue, and also indicate that pcre.jit=0
can be used to work around it.
Also automatically disable the JIT, so that this message is
only shown once.
See bug #78630.
Christoph M. Becker [Fri, 4 Oct 2019 11:55:33 +0000 (13:55 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Split intl tests for ICU 65
Christoph M. Becker [Fri, 4 Oct 2019 11:54:49 +0000 (13:54 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Split intl tests for ICU 65
Christoph M. Becker [Fri, 4 Oct 2019 11:53:58 +0000 (13:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Split intl tests for ICU 65
Christoph M. Becker [Fri, 4 Oct 2019 10:48:40 +0000 (12:48 +0200)]
Split intl tests for ICU 65
Nikita Popov [Fri, 4 Oct 2019 10:42:58 +0000 (12:42 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 4 Oct 2019 10:38:18 +0000 (12:38 +0200)]
Fixed bug #78632
I'm going for a very conservative fix here, where the previous
logic is restored for the case where an object is passed to
method_exists(). We might want to check against EG(scope) instead,
but this seems like a safer choice.
This means that behavior in PHP 7.4 changes only for
method_exists('C', 'privateMethodNotOnC'), which should be sensible.
Dmitry Stogov [Fri, 4 Oct 2019 09:51:01 +0000 (12:51 +0300)]
Prefer optimization without JMPZNZ instruction
Nikita Popov [Wed, 2 Oct 2019 10:24:11 +0000 (12:24 +0200)]
Replace "unexpected character" warning with ParseError
Closes GH-4767.
Nikita Popov [Fri, 4 Oct 2019 08:39:32 +0000 (10:39 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 4 Oct 2019 08:38:11 +0000 (10:38 +0200)]
Fix use-after-free with delayed interned memoized const operand
We should addref CONST operands during memoization, as they might
be destroyed by later compilation, e.g. through interning.
Nikita Popov [Fri, 4 Oct 2019 08:12:16 +0000 (10:12 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 4 Oct 2019 08:11:30 +0000 (10:11 +0200)]
Fix crash when unpacking into array literal with string keys
Christoph M. Becker [Fri, 4 Oct 2019 07:14:36 +0000 (09:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78620: Out of memory error
Christoph M. Becker [Fri, 4 Oct 2019 07:10:49 +0000 (09:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78620: Out of memory error
Dmitry Stogov [Fri, 4 Oct 2019 07:10:53 +0000 (10:10 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78614 (Does not compile with DTRACE anymore)
Dmitry Stogov [Fri, 4 Oct 2019 07:10:22 +0000 (10:10 +0300)]
Fixed bug #78614 (Does not compile with DTRACE anymore)
Christoph M. Becker [Fri, 4 Oct 2019 07:09:25 +0000 (09:09 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78620: Out of memory error
Christoph M. Becker [Thu, 3 Oct 2019 17:23:05 +0000 (19:23 +0200)]
Fix #78620: Out of memory error
The integer addition in `ZEND_MM_ALIGNED_SIZE_EX` can overflow, what we
have to catch early.
Joe Watkins [Fri, 4 Oct 2019 04:16:26 +0000 (06:16 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix #78624: session_gc return value for user defined session handlers
Joe Watkins [Fri, 4 Oct 2019 04:16:02 +0000 (06:16 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
fix #78624: session_gc return value for user defined session handlers
Joe Watkins [Fri, 4 Oct 2019 04:12:15 +0000 (06:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix #78624: session_gc return value for user defined session handlers
Brent Shaffer [Wed, 2 Oct 2019 23:44:58 +0000 (16:44 -0700)]
fix #78624: session_gc return value for user defined session handlers
Joe Watkins [Fri, 4 Oct 2019 03:42:44 +0000 (05:42 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typo in CODING_STANDARDS.md [ci skip]
tpfast [Fri, 4 Oct 2019 01:57:51 +0000 (21:57 -0400)]
Fix typo in CODING_STANDARDS.md [ci skip]
Dmitry Stogov [Thu, 3 Oct 2019 23:53:24 +0000 (02:53 +0300)]
Remove "finally" restriction.
Dmitry Stogov [Thu, 3 Oct 2019 23:04:00 +0000 (02:04 +0300)]
Simplify protection from infinity loops
Dmitry Stogov [Thu, 3 Oct 2019 21:27:49 +0000 (00:27 +0300)]
Moved non-constant JMP optimizations from pass1 to pass3.
Removed useless "break"s, that stopped optimization too early.
Dmitry Stogov [Thu, 3 Oct 2019 13:33:17 +0000 (16:33 +0300)]
Avoid "$a = $a + ..." to "$a += ..." conversion (compound assignments work slower).
Added DFA optimization patters (e.g. "$a = $a + 1" to "++$a"), that previously worked only for compound assignments.
Dmitry Stogov [Thu, 3 Oct 2019 11:57:20 +0000 (14:57 +0300)]
Move obvious optimization patterns from pass1 directly to compiler
Dmitry Stogov [Thu, 3 Oct 2019 11:56:02 +0000 (14:56 +0300)]
Added missing rules
Dmitry Stogov [Thu, 3 Oct 2019 10:55:58 +0000 (13:55 +0300)]
Fixed comments
Dmitry Stogov [Thu, 3 Oct 2019 10:54:08 +0000 (13:54 +0300)]
Added missing rules
Joe Watkins [Thu, 3 Oct 2019 05:13:26 +0000 (07:13 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
Joe Watkins [Thu, 3 Oct 2019 05:12:49 +0000 (07:12 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
Joe Watkins [Thu, 3 Oct 2019 04:56:45 +0000 (06:56 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
Fábio Souto [Mon, 3 Sep 2018 16:18:37 +0000 (17:18 +0100)]
Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
Joe Watkins [Thu, 3 Oct 2019 04:52:10 +0000 (06:52 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #76859 stream_get_line skips data if used with data-generating filter
Joe Watkins [Thu, 3 Oct 2019 04:51:33 +0000 (06:51 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #76859 stream_get_line skips data if used with data-generating filter
Joe Watkins [Thu, 3 Oct 2019 04:50:58 +0000 (06:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #76859 stream_get_line skips data if used with data-generating filter
Konstantin Kopachev [Tue, 18 Sep 2018 04:44:01 +0000 (21:44 -0700)]
Fix #76859 stream_get_line skips data if used with data-generating filter
stream_get-line repeatedly calls php_stream_fill_read_buffer until
enough data is accumulated in buffer. However, when stream contains
filters attached to it, then each call to fill buffer essentially
resets buffer read/write pointers and new data is written over old.
This causes stream_get_line to skip parts of data from stream
This patch fixes such behavior, so fill buffer call will append.
Dmitry Stogov [Thu, 3 Oct 2019 01:26:40 +0000 (04:26 +0300)]
Cleanup JMP optimization rules
Dmitry Stogov [Wed, 2 Oct 2019 23:18:16 +0000 (02:18 +0300)]
Optimizer cleanup
- all rules from pass2 moved to pass1
- all JMP unrelated rules from pass3 moved to pass1
- pass3 keeps only JMP optimization rules
- pass2.c is removed
- pass1_5.c remaned to pass1.c ("_5" was related to PHP 5)
Derick Rethans [Wed, 2 Oct 2019 22:39:12 +0000 (23:39 +0100)]
Updated to version 2019.3 (2019c)
Derick Rethans [Wed, 2 Oct 2019 22:39:12 +0000 (23:39 +0100)]
Empty merge
Derick Rethans [Wed, 2 Oct 2019 22:39:11 +0000 (23:39 +0100)]
Updated to version 2019.3 (2019c)
Derick Rethans [Wed, 2 Oct 2019 22:39:11 +0000 (23:39 +0100)]
Empty merge
Derick Rethans [Wed, 2 Oct 2019 22:39:09 +0000 (23:39 +0100)]
Updated to version 2019.3 (2019c)
Christoph M. Becker [Wed, 2 Oct 2019 17:03:48 +0000 (19:03 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Fix #78620: Out of memory error"
Christoph M. Becker [Wed, 2 Oct 2019 17:03:04 +0000 (19:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Revert "Fix #78620: Out of memory error"
Christoph M. Becker [Wed, 2 Oct 2019 17:02:12 +0000 (19:02 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Revert "Fix #78620: Out of memory error"
Christoph M. Becker [Wed, 2 Oct 2019 17:01:35 +0000 (19:01 +0200)]
Revert "Fix #78620: Out of memory error"
This reverts commit
8ce04df7e0108a10f7b782a28204e9384ab1129c .
Cf. <https://github.com/php/php-src/pull/4766#discussion_r330658679>.
Christoph M. Becker [Wed, 2 Oct 2019 16:22:11 +0000 (18:22 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78620: Out of memory error
Christoph M. Becker [Wed, 2 Oct 2019 16:21:24 +0000 (18:21 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78620: Out of memory error
Christoph M. Becker [Wed, 2 Oct 2019 16:19:53 +0000 (18:19 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78620: Out of memory error
Christoph M. Becker [Wed, 2 Oct 2019 14:42:28 +0000 (16:42 +0200)]
Fix #78620: Out of memory error
If the integer addition in `ZEND_MM_ALIGNED_SIZE_EX` overflows, the
macro evaluates to `0`, what we should catch early.
theodorejb [Wed, 2 Oct 2019 15:22:57 +0000 (09:22 -0600)]
Fix array_fill stub return type
This was missed in commit
d5e9ef8f0fad00618de62949d362d0980c6250f9 .
Fabien Villepinte [Wed, 2 Oct 2019 13:55:37 +0000 (15:55 +0200)]
Fix regex in generate_parser_corpus.php
The next section after --FILE-- is not necessarily --EXPECT--.
Accept any section.
Closes GH-4770.
tyage [Fri, 10 Jun 2016 08:17:50 +0000 (17:17 +0900)]
Fix #72374: remove_path strips first char of filename
Nikita Popov [Wed, 2 Oct 2019 12:41:25 +0000 (14:41 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 2 Oct 2019 12:41:02 +0000 (14:41 +0200)]
Fix AArch64 build
George Peter Banyard [Tue, 20 Aug 2019 22:30:36 +0000 (00:30 +0200)]
Promote warnings to error in array_flip()
Closes GH-4576.
Nikita Popov [Wed, 2 Oct 2019 10:07:49 +0000 (12:07 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 2 Oct 2019 10:07:33 +0000 (12:07 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 2 Oct 2019 10:07:19 +0000 (12:07 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 2 Oct 2019 10:06:00 +0000 (12:06 +0200)]
Fix segfault with __COMPILER_HALT_OFFSET__ and trailing {}
Fixes OSS-Fuzz #17895.
Christoph M. Becker [Wed, 2 Oct 2019 09:36:38 +0000 (11:36 +0200)]
Fix borked test case
Setting `CURLOPT_STDERR` can trigger a warning, what causes the test to
be marked as borked as of commit
e49593a [1]. To avoid this, we silence
the `curl_setopt()` call.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
e49593a7c3159a5673ce74b4e5133f1264dc313f >
Nikita Popov [Wed, 2 Oct 2019 09:34:54 +0000 (11:34 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 2 Oct 2019 09:33:52 +0000 (11:33 +0200)]
Avoid file clash in root_check skipifs
peter279k [Tue, 7 May 2019 17:11:19 +0000 (01:11 +0800)]
Fix bug #77204
Include opened path in getimagesize() error message
Nikita Popov [Wed, 2 Oct 2019 08:54:47 +0000 (10:54 +0200)]
Prune opcache func info
Remove opcache func info for some functions which have arg info
with same or better accuracy (this is incomplete, we can drop more).
George Peter Banyard [Wed, 21 Aug 2019 00:27:27 +0000 (02:27 +0200)]
Promote warnings to errors in array_push()
This is in line with the engine change from
https://wiki.php.net/rfc/engine_warnings.
Nikita Popov [Tue, 1 Oct 2019 11:20:42 +0000 (13:20 +0200)]
Convert some notices to warnings
Part of https://wiki.php.net/rfc/engine_warnings.
Nikita Popov [Wed, 2 Oct 2019 08:09:37 +0000 (10:09 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 14 Jan 2019 12:04:37 +0000 (13:04 +0100)]
Allow SA_RESTART for SIGALRM
If no explicit restart_syscalls is passed, default to
restart_syscalls=0 for SIGALRM only, to reduce BC impact.
Joe Watkins [Wed, 2 Oct 2019 06:17:22 +0000 (08:17 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed #75245 Don't set content of elements with only whitespaces
Erik Lundin [Tue, 13 Aug 2019 20:50:37 +0000 (22:50 +0200)]
Fixed #75245 Don't set content of elements with only whitespaces
Dmitry Stogov [Tue, 1 Oct 2019 23:31:01 +0000 (02:31 +0300)]
Fixed tests
Dmitry Stogov [Tue, 1 Oct 2019 22:13:30 +0000 (01:13 +0300)]
Remove irrelevant tests (they were failed because of warning to exception chenge in parameter parsing API).
Dmitry Stogov [Tue, 1 Oct 2019 22:09:37 +0000 (01:09 +0300)]
Fixed tests
Dmitry Stogov [Tue, 1 Oct 2019 21:57:40 +0000 (00:57 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed test that "fails" from time to time
Dmitry Stogov [Tue, 1 Oct 2019 21:57:26 +0000 (00:57 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed test that "fails" from time to time
Dmitry Stogov [Tue, 1 Oct 2019 21:57:16 +0000 (00:57 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed test that "fails" from time to time