Remi Collet
b35db69d82
Merge branch 'PHP-8.1'
...
* PHP-8.1:
bump zip ext version
The PHP-8.1 branch is now for 8.1.0RC5
2021-10-13 11:54:14 +02:00
Remi Collet
8cfd7e2105
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
bump zip ext version
2021-10-13 11:53:25 +02:00
Remi Collet
6d0d5227d8
bump zip ext version
2021-10-13 11:53:02 +02:00
Joe Watkins
7699aed377
missing shutdown in observer
2021-10-13 07:12:09 +02:00
Ben Ramsey
daf6a46177
The PHP-8.1 branch is now for 8.1.0RC5
2021-10-12 18:50:51 -05:00
Nikita Popov
780db4ea42
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix incorrect access of AST_UNPACK
2021-10-12 17:17:49 +02:00
Nikita Popov
f555544faf
Fix incorrect access of AST_UNPACK
...
list_is_keyed() did not take into account that there may be
AST_UNPACK elements. These would error lateron anyway, but still
produce an invalid access here.
2021-10-12 17:16:58 +02:00
Nikita Popov
48a9c409ad
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix bug #81521
2021-10-12 16:43:40 +02:00
Nikita Popov
c5e030f3aa
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix bug #81521
2021-10-12 16:43:24 +02:00
Nikita Popov
53f89219ab
Fix bug #81521
...
The current error message is incorrect -- the problem here is not
that the property is invalid, but that these methods are unusable
prior to loading data, same as read().
2021-10-12 16:42:32 +02:00
Dmitry Stogov
f90cf31bc7
Merge branch 'PHP-8.1'
...
* PHP-8.1:
JIT: Avoid generation of unused exit point for conditional braches with NULL/FALSE/TRUE operand
2021-10-12 16:59:31 +03:00
Dmitry Stogov
da05c0a84f
JIT: Avoid generation of unused exit point for conditional braches with NULL/FALSE/TRUE operand
2021-10-12 16:57:33 +03:00
Nikita Popov
a00446ca90
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Don't replace tmp with cv in YIELD argument
2021-10-12 14:27:13 +02:00
Nikita Popov
9c1d7b43e9
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Don't replace tmp with cv in YIELD argument
2021-10-12 14:27:07 +02:00
Nikita Popov
9ebe8494b8
Don't replace tmp with cv in YIELD argument
...
For by-ref generators, these may have different behavior.
Fixes oss-fuzz 6059739298004992.
2021-10-12 14:26:53 +02:00
Christoph M. Becker
6a65101367
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix #81424 : PCRE2 10.35 JIT performance regression
2021-10-12 14:23:07 +02:00
Christoph M. Becker
5356d06990
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix #81424 : PCRE2 10.35 JIT performance regression
2021-10-12 14:22:52 +02:00
Christoph M. Becker
845a67feb5
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #81424 : PCRE2 10.35 JIT performance regression
2021-10-12 14:21:09 +02:00
Christoph M. Becker
788a701e22
Fix #81424 : PCRE2 10.35 JIT performance regression
...
We backport the respective upstream fix[1] to our bundled pcre2lib plus
the follow-up fix[2] for a functional regression.
[1] <https://github.com/PhilipHazel/pcre2/commit/dc5f96663597572f694147aeec3525003c351123 >
[2] <https://github.com/PhilipHazel/pcre2/commit/e7af7efaa11f71b187b0432e9e60f18ba4d90a0c >
Closes GH-7573.
2021-10-12 14:19:22 +02:00
Christoph M. Becker
7d5be7b1f6
[ci skip] Merge branch 'PHP-8.1'
...
* PHP-8.1:
[ci skip] Fix NEWS
2021-10-12 14:16:23 +02:00
Christoph M. Becker
9beb584037
[ci skip] Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
[ci skip] Fix NEWS
2021-10-12 14:15:43 +02:00
Christoph M. Becker
d130f90f72
[ci skip] Fix NEWS
...
PHP 8.0.12RC1 has already been tagged a week ago, so later changes
target PHP 8.0.13.
2021-10-12 14:14:37 +02:00
Remi Collet
b060b7ae3c
Merge branch 'PHP-8.1'
...
* PHP-8.1:
[ci skip] typo
NEWS
Fix #81520 TEST_PHP_CGI_EXECUTABLE badly set in run-tests.php
2021-10-12 13:43:11 +02:00
Remi Collet
39e4ae0c04
[ci skip] typo
2021-10-12 13:39:24 +02:00
Remi Collet
3fb1cf24c3
Fix #81520 TEST_PHP_CGI_EXECUTABLE badly set in run-tests.php
2021-10-12 13:34:55 +02:00
Remi Collet
0ad19e40a6
NEWS
2021-10-12 13:34:13 +02:00
Remi Collet
ea00e6501c
Fix #81520 TEST_PHP_CGI_EXECUTABLE badly set in run-tests.php
2021-10-12 13:33:16 +02:00
Nikita Popov
ebaed43473
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Don't free FETCH_W operand if GLOBAL_LOCK
2021-10-12 12:46:03 +02:00
Nikita Popov
7b0710695b
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Don't free FETCH_W operand if GLOBAL_LOCK
2021-10-12 12:45:49 +02:00
Nikita Popov
a2e3ca1f5b
Don't free FETCH_W operand if GLOBAL_LOCK
...
The error path performed the free unconditionally, while we should
not do it for GLOBAL_LOCK.
Fixes oss-fuzz #39868 .
2021-10-12 12:44:35 +02:00
Máté Kocsis
0a5fa9dd11
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix the return type of imagecolorexactalpha()
String default values are enclosed in quotes rather than apostrophes
2021-10-12 09:56:04 +02:00
Máté Kocsis
220f0f55cf
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix the return type of imagecolorexactalpha()
String default values are enclosed in quotes rather than apostrophes
2021-10-12 09:53:30 +02:00
Máté Kocsis
2127b49c65
String default values are enclosed in quotes rather than apostrophes
2021-10-12 09:51:20 +02:00
Máté Kocsis
17fa9b77bd
Fix the return type of imagecolorexactalpha()
2021-10-12 09:51:13 +02:00
Nikita Popov
dc4cfb1ccb
Don't accept flags in ZipArchive::getStream()
...
Per discussion on https://github.com/php/php-src/commit/e489e2d3885c35a2a969d92bada5d42aac1bbec6
this method should not accept $flags, so un-alias it from
getStreamName().
2021-10-12 09:29:08 +02:00
Hao Sun
2feecaf3f5
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Reduce threshold further in ext/date/tests/bug73837.phpt
2021-10-12 00:56:48 +00:00
Hao Sun
582e21fbda
Reduce threshold further in ext/date/tests/bug73837.phpt
...
The threshold in test case ext/date/tests/bug73837.phpt has been reduced
several times, from the original 990 to current 400. However, this case
still failed on my local test with Mac Mini machine(macOS on Apple
silicon). Here is the diff result:
```
$ cat ext/date/tests/bug73837.diff
int(%d)
002+ microseconds do not differ enough (268)
002- microseconds differ
```
Hence this patch reduces the threshold further.
Note that this patch should be backported to PHP 8.1 branch as well.
Closes GH-7567.
2021-10-12 00:49:21 +00:00
Nikita Popov
e489e2d388
Add missing $flags param to getStream()
...
This is an alias of getStreamName() but was missing the optional
$flags parameter.
2021-10-11 16:01:57 +02:00
Nikita Popov
1b120b4a59
Declare some properties in tests
2021-10-11 16:01:57 +02:00
Dmitry Stogov
176c319109
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fixed type inference for COPY_TMP
2021-10-11 16:56:49 +03:00
Dmitry Stogov
1208fe932a
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fixed type inference for COPY_TMP
2021-10-11 16:56:40 +03:00
Dmitry Stogov
a4c41d45cd
Fixed type inference for COPY_TMP
2021-10-11 16:56:07 +03:00
Remi Collet
e9b96ae5da
Add ZipArchive::clearError, getStreamIndex and getStreamName methods
...
public function clearError(): void {}
public function getStreamIndex(int $index, int $flags = 0) {}
public function getStreamName(string $name, int $flags = 0) {}
ZipArchive::getStream is kept for BC
See https://github.com/pierrejoye/php_zip/issues/20
2021-10-11 15:39:35 +02:00
Nikita Popov
39a1cab471
Generate tracing jit corpus in generate_all.php
...
Using same corpus as function jit. To allow oss-fuzz integration.
2021-10-11 14:33:11 +02:00
Dmitry Stogov
eeb16a7ab3
Merge branch 'PHP-8.1'
...
* PHP-8.1:
JIT: Fixed incorrect deoptimization info
2021-10-11 14:10:25 +03:00
Dmitry Stogov
912f040583
JIT: Fixed incorrect deoptimization info
2021-10-11 14:10:02 +03:00
Joe Watkins
0603d3b2e2
improve configuration of pthread link for userfaultd thread under NTS ( #7568 )
2021-10-11 12:57:41 +02:00
Nikita Popov
9ecec661ce
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Preserve key/value type invariant in range() type inference
2021-10-11 12:42:06 +02:00
Nikita Popov
f0cf999223
Preserve key/value type invariant in range() type inference
...
Don't set PACKED key type if no value type is set.
Fixes oss-fuzz 6718410667458560.
2021-10-11 12:41:46 +02:00
Nikita Popov
35adc4f7f6
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix long-term shutdown/tick fci/fcc storage
2021-10-11 12:19:50 +02:00