]>
granicus.if.org Git - php/log
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
Dmitry Stogov [Tue, 1 Oct 2019 21:54:59 +0000 (00:54 +0300)]
Fixed test that "fails" from time to time
Dmitry Stogov [Tue, 1 Oct 2019 21:49:58 +0000 (00:49 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed test that "fails" from time to time
Dmitry Stogov [Tue, 1 Oct 2019 21:49:37 +0000 (00:49 +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:49:27 +0000 (00:49 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed test that "fails" from time to time
Dmitry Stogov [Tue, 1 Oct 2019 21:48:42 +0000 (00:48 +0300)]
Fixed test that "fails" from time to time
Nikita Popov [Tue, 1 Oct 2019 20:13:59 +0000 (22:13 +0200)]
Revert "Save opline before fallible arg type check in recv_init jit"
This reverts commit
b09bddcaa5d6af94f0b94b324c1f52045c909d5e .
This causes test failures on macos -- presumably the relevant
difference is that it has no global regs. I suspect that this
is related to the fact that SAVE_VALID_OPLINE may use r0 as
a scratch register, which is already in use. Reverting for now.
Nikita Popov [Tue, 1 Oct 2019 20:02:47 +0000 (22:02 +0200)]
Suppress fsockopen error in ldap_set_rebind_proc_error.phpt
Nikita Popov [Tue, 1 Oct 2019 16:29:23 +0000 (18:29 +0200)]
Limit input size in exif fuzzer
Probably still too much...
Nikita Popov [Tue, 1 Oct 2019 15:36:42 +0000 (17:36 +0200)]
Require a space ofter run-tests "warn"
We don't want to treat a PHP "Warning: " as a run-tests warn.
Nikita Popov [Tue, 1 Oct 2019 15:19:27 +0000 (17:19 +0200)]
Save opline before fallible arg type check in recv_init jit
The verify arg functions may throw an exception, so we need to save
the opline beforehand. Asan failures could be observed in
Zend/tests/type_declarations/scalar_constant_defaults.phpt
with a ZTS build.
Gerard Roche [Tue, 1 Oct 2019 12:42:18 +0000 (13:42 +0100)]
README: Fix AppVeyor branch and add link to LICENSE
Point AppVeyor status badge to master
Closes GH-4763.
[ci skip]
Nikita Popov [Tue, 1 Oct 2019 12:13:48 +0000 (14:13 +0200)]
Improve bless tests script to minimize diffs
Compute the diff between the old EXPECTF and the new output and
don't touch lines that still match the old EXPECTF. This reduces
the amount of manual fixup necessary after running bless_tests.php.
Nikita Popov [Tue, 1 Oct 2019 11:05:12 +0000 (13:05 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 30 Sep 2019 16:27:31 +0000 (18:27 +0200)]
Add --enable-fuzzer-msan flag
To build fuzzers with memory sanitizer.
Nikita Popov [Tue, 1 Oct 2019 10:58:26 +0000 (12:58 +0200)]
Remove func copy optimization for private method with static vars
Not NULLing the static_variables pointer for shadow methods during
static var shutdown would be a way to avoid this leak, but unless
there's evidence that inherited private methods with static vars are
actually a common use-case, I don't think we should keep this kind
of fragile edge-case optimization.
Fixes OSS-Fuzz #17875.
Christoph M. Becker [Tue, 1 Oct 2019 09:51:35 +0000 (11:51 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix AppVeyor build
Christoph M. Becker [Tue, 1 Oct 2019 09:51:07 +0000 (11:51 +0200)]
Fix AppVeyor build
`OPENSSL_CONF` must not contain quotes, but actually, we want to test
the default path, so we don't even set `OPENSLL_CONF` anymore.
Christoph M. Becker [Tue, 1 Oct 2019 09:19:43 +0000 (11:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add missing skip keyword in tests
Update NEWS for 7.4.0RC4
Update NEWS for PHP 7.4.0RC3
Christoph M. Becker [Tue, 1 Oct 2019 09:17:23 +0000 (11:17 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add missing skip keyword in tests
Christoph M. Becker [Tue, 1 Oct 2019 09:15:12 +0000 (11:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add missing skip keyword in tests
Fabien Villepinte [Tue, 1 Oct 2019 08:59:40 +0000 (10:59 +0200)]
Add missing skip keyword in tests
Derick Rethans [Tue, 1 Oct 2019 08:31:43 +0000 (08:31 +0000)]
Update NEWS for 7.4.0RC4
Derick Rethans [Tue, 1 Oct 2019 08:30:24 +0000 (08:30 +0000)]
Update NEWS for PHP 7.4.0RC3
Christoph M. Becker [Tue, 1 Oct 2019 08:01:58 +0000 (10:01 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix AppVeyor setup wrt. changed OpenSSL default config path
Christoph M. Becker [Tue, 1 Oct 2019 08:01:34 +0000 (10:01 +0200)]
Fix AppVeyor setup wrt. changed OpenSSL default config path
Christoph M. Becker [Tue, 1 Oct 2019 07:16:51 +0000 (09:16 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update regarding changed OpenSSL default config path
Christoph M. Becker [Tue, 1 Oct 2019 06:56:56 +0000 (08:56 +0200)]
Update regarding changed OpenSSL default config path
Nikita Popov [Mon, 30 Sep 2019 16:19:56 +0000 (18:19 +0200)]
Pass mode to open() in exif fuzzer
Funny how despite all those sanitizers running, nothing ever
caught this...
Fabien Villepinte [Sat, 28 Sep 2019 15:48:58 +0000 (17:48 +0200)]
Mark test as borked when skipif produces invalid output
SKIPIF section should either output nothing, or start with a
supported keyword like "skip". Mark all tests that don't do so as
BORKED.
Nikita Popov [Mon, 30 Sep 2019 15:52:39 +0000 (17:52 +0200)]
Merge branch 'PHP-7.4'
Fabien Villepinte [Sat, 28 Sep 2019 19:29:54 +0000 (21:29 +0200)]
Fix borked SKIPIFs
Christoph M. Becker [Mon, 30 Sep 2019 14:30:48 +0000 (16:30 +0200)]
Just return after throwing a ValueError
Mark [Fri, 27 Sep 2019 17:47:24 +0000 (19:47 +0200)]
Convert GD Resources to objects
Nikita Popov [Mon, 30 Sep 2019 13:06:51 +0000 (15:06 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 30 Sep 2019 13:06:43 +0000 (15:06 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 30 Sep 2019 13:06:23 +0000 (15:06 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 30 Sep 2019 13:05:35 +0000 (15:05 +0200)]
Fixed bug #78612
Christoph M. Becker [Mon, 30 Sep 2019 12:14:59 +0000 (14:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Skip tests for old versions instead of marking them XFAIL
Christoph M. Becker [Mon, 30 Sep 2019 12:12:40 +0000 (14:12 +0200)]
Skip tests for old versions instead of marking them XFAIL
According to commit
0eea9a6 [1], these tests fail with old Oniguruma
versions; we are not sure which version of Oniguruma is required to let
them pass, but at least 6.9.3 is sufficient.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
0eea9a642941ab5d4c612f8092f186977afbb73e >
Christoph M. Becker [Mon, 30 Sep 2019 11:07:19 +0000 (13:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78609: mb_check_encoding() no longer supports stringable objects
Christoph M. Becker [Mon, 30 Sep 2019 11:05:51 +0000 (13:05 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78609: mb_check_encoding() no longer supports stringable objects
Christoph M. Becker [Mon, 30 Sep 2019 11:04:24 +0000 (13:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78609: mb_check_encoding() no longer supports stringable objects