Nikita Popov
11f950e77e
Don't optimize trailing args for prototype fbc
2022-04-18 17:57:16 +02:00
Dmitry Stogov
c3a30544ad
JIT: Fixed incorrect guard
...
Fixes oss-fuzz #46704
2022-04-18 11:34:18 +03:00
Alex Dowad
04e59c916f
Error handling for UTF-8 complies with WHATWG specification
...
In 7502c86342
, I adjusted the number of error markers emitted on
invalid UTF-8 text to be more consistent with mbstring's behavior on
other text encodings (generally, it emits one error marker for one
unexpected byte). I didn't expect that anybody would actually care one
way or the other, but felt that it was better to be consistent than
not.
Later, Martin Auswöger kindly pointed out that the WHATWG encoding
specification, which governs how various text encodings are handled
by web browsers, does actually specify how many error markers should
be generated for any given piece of invalid UTF-8 text.
Until now, we have never really paid much attention to the WHATWG
specification, but we do want to comply with as many relevant
specifications as possible. And since PHP is commonly used for web
applications, compatibility with the behavior of web browsers is
obviously a good thing.
2022-04-16 15:04:38 +02:00
Nikita Popov
b0ab5d0fb0
Don't set ce for by-ref return type
...
For the case where we upgrade a prototype to a possible by-ref
return from an inheriting method.
2022-04-15 23:55:48 +02:00
Jakub Zelenka
a57625374d
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-15 22:21:18 +01:00
David Carlier
2f0918c638
Fix FPM socket clean up reallocation clang build warning
2022-04-15 22:20:15 +01:00
David Carlier
fc9fecbd09
Fix FPM zlog warning with var being uninitialized
2022-04-15 22:19:36 +01:00
Nikita Popov
4026daee2b
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Move MAY_BE_REF check into COPY_SSA_OBJ_TYPE
2022-04-15 23:14:59 +02:00
Nikita Popov
d16d251e20
Move MAY_BE_REF check into COPY_SSA_OBJ_TYPE
...
ZEND_ASSIGN is not the only place where this is relevant, so
handle it generically inside COPY_SSA_OBJ_TYPE instead.
2022-04-15 23:14:04 +02:00
Nikita Popov
38547b996a
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Don't use CE for by-ref arguments
2022-04-15 23:00:59 +02:00
Nikita Popov
5d072578cd
Don't use CE for by-ref arguments
2022-04-15 23:00:43 +02:00
Nikita Popov
f1814e6a1f
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Don't use CE info from pi node for MAY_BE_REF var
2022-04-15 22:37:29 +02:00
Nikita Popov
41f33b9dc3
Don't use CE info from pi node for MAY_BE_REF var
...
Once again, the actual class type may be reassigned indirectly.
2022-04-15 22:36:13 +02:00
Nikita Popov
3fdb1aa14e
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix inference for assignment of known object to reference
2022-04-15 22:15:32 +02:00
Nikita Popov
b08aac0451
Fix inference for assignment of known object to reference
...
We cannot retain the ce information in that case, we have to
assume the ce may change indirectly through the reference.
Fixes oss-fuzz #46720 .
2022-04-15 22:14:44 +02:00
Christoph M. Becker
549cf3a24d
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-8366: ArrayIterator may leak when calling __construct()
2022-04-15 19:08:28 +02:00
Christoph M. Becker
1762a87932
Fix GH-8366: ArrayIterator may leak when calling __construct()
...
When we detach an iterator, we also have to delete it.
Closes GH-8374.
2022-04-15 19:05:18 +02:00
Derick Rethans
ec0771c03f
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-14 10:32:21 +01:00
Derick Rethans
789f6b8367
Merged pull request #8175
2022-04-14 10:32:18 +01:00
Derick Rethans
e38d300a70
Refactor code to avoid duplication
2022-04-14 10:32:10 +01:00
Cody Mann
24085d0192
style/readability updates
2022-04-14 10:22:00 +01:00
Cody Mann
287c8a86b4
GH-7979: iterator advances when checking if valid
2022-04-14 10:22:00 +01:00
Ilija Tovilo
d1dc71093f
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix opcache testing in CI
2022-04-14 09:52:07 +02:00
Michael Voříšek
e3f2846bbb
Fix opcache testing in CI
...
Closes GH-8350
2022-04-14 09:50:48 +02:00
Ilija Tovilo
914e87e582
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Run nightly on php org only unless triggered via workflow_dispatch
2022-04-14 09:42:11 +02:00
Ilija Tovilo
cd90ddca85
Run nightly on php org only unless triggered via workflow_dispatch
2022-04-14 09:35:37 +02:00
Christoph M. Becker
c821886777
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix openssl_csr_export() stub
2022-04-13 15:23:09 +02:00
Mikko Pesari
16bf8331e0
Fix openssl_csr_export() stub
...
Closes GH-8362.
2022-04-13 15:20:58 +02:00
Christoph M. Becker
11231837d7
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix `--EXTENSIONS--` section for two tests in ext/zend_test
2022-04-13 14:46:56 +02:00
Tim Düsterhus
5655f1abe3
Fix --EXTENSIONS--
section for two tests in ext/zend_test
...
The extension name got broken in e6cf583160
.
Closes GH-8357.
2022-04-13 14:45:52 +02:00
Jakub Zelenka
62b676ff0f
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-12 23:15:34 +01:00
Jakub Zelenka
33bb201b3e
Fix bug #76003 : FPM /status reports wrong number of active processe
...
The fix introduces early locking of scoreboard when it is updated
which prevents the race condition causing an incorrect number of
active processes being set.
2022-04-12 23:12:11 +01:00
Derick Rethans
a39a98e3f2
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-12 15:42:18 +01:00
Derick Rethans
07e91ca91c
Merge branch 'PHP-7.4' into PHP-8.0
2022-04-12 15:42:10 +01:00
Derick Rethans
fbee73df14
Prepare for 7.4.30
2022-04-12 15:41:55 +01:00
Derick Rethans
f62aab2521
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-12 11:53:31 +01:00
Derick Rethans
de774d9e19
Merge branch 'PHP-7.4' into PHP-8.0
2022-04-12 11:53:24 +01:00
Derick Rethans
c14e2e4fc9
Add tz update into NEWS
2022-04-12 11:53:17 +01:00
Derick Rethans
a1ae4dfd7f
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-12 11:32:14 +01:00
Derick Rethans
0cf8b980b7
Merge branch 'PHP-7.4' into PHP-8.0
2022-04-12 11:31:59 +01:00
Derick Rethans
1a0514992d
Prep NEWS for 7.4.29 release
2022-04-12 11:31:33 +01:00
Christoph M. Becker
097c9271e1
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Move locks in TSRM.c to prevent races
2022-04-11 17:19:39 +02:00
ryancaicse
1a75269c8e
Move locks in TSRM.c to prevent races
...
Closes GH-8298.
2022-04-11 17:16:40 +02:00
Christoph M. Becker
e3a5e424f6
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Preserve file-position when php://temp switches to temporary file
2022-04-11 12:44:56 +02:00
Bernd Holzmüller
84c18f9f04
Preserve file-position when php://temp switches to temporary file
...
Closes GH-8333.
2022-04-11 12:31:22 +02:00
Dmitry Stogov
8633893330
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix memory lek
2022-04-11 12:21:02 +03:00
Dmitry Stogov
3aaf2f6f89
JIT: Fix memory lek
...
Fixes oss-fuzz #46462
2022-04-11 12:17:05 +03:00
Dmitry Stogov
69bcd93190
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Tracing JIT: Fixed incorrect assumption about stack slot type
2022-04-11 11:42:56 +03:00
Dmitry Stogov
5b048dd05c
Tracing JIT: Fixed incorrect assumption about stack slot type
...
Fixes oss-fuzz #46404
2022-04-11 11:42:01 +03:00
Nikita Popov
c72e9621ce
Improve type narrowing fix
...
We need to explicitly model the null return type for property
accesses on non-objects.
2022-04-10 11:22:36 +02:00