George Peter Banyard
cfc38a6014
SPL: minor refactoring ( #8341 )
...
Use more appropriate types and return macros
2022-04-13 20:34:23 +01:00
Christoph M. Becker
8233e06109
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix openssl_csr_export() stub
2022-04-13 15:23:41 +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
4d24ac3cb0
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix `--EXTENSIONS--` section for two tests in ext/zend_test
2022-04-13 14:47:34 +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
Máté Kocsis
c345b6ee72
Remove unused variable from gen_stub.php
2022-04-13 09:24:08 +02:00
Jakub Zelenka
b0b416b705
Merge branch 'PHP-8.1'
2022-04-12 23:16:26 +01: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
Tim Düsterhus
ddf7e35f71
Configure diff drivers for php, phpt, c and h in .gitattributes ( #8343 )
2022-04-12 21:08:02 +02:00
Derick Rethans
28ae0654d2
Merge branch 'PHP-8.1'
2022-04-12 15:42:23 +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
b9f4fb8aef
Merge branch 'PHP-8.1'
2022-04-12 11:53:36 +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
f84af7bdd9
Merge branch 'PHP-8.1'
2022-04-12 11:32:22 +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
George Peter Banyard
7710f9946b
Fix generation of arginfo if type is just null
2022-04-11 16:58:13 +01:00
George Peter Banyard
7daa8b77a6
BZ2: Use EMPTY_SWITCH_DEFAULT_CASE
...
This adds an assertion that this case indeed never happens
2022-04-11 16:58:13 +01:00
Christoph M. Becker
f4c23b0534
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Move locks in TSRM.c to prevent races
2022-04-11 17:21:14 +02: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
bohwaz
2973b9f02a
Allow user to change SQLITE_DEFENSIVE if needed
...
Closes GH-8200.
2022-04-11 17:08:48 +02:00
George Peter Banyard
8dbfb15f7c
Use more specific return types in SPL
2022-04-11 14:04:37 +01:00
George Peter Banyard
c12da039b5
Add null and false support to gen_stubs
2022-04-11 14:04:37 +01:00
Steven Wang
c4a9d1e668
Makefile: Clean up .gcda files in prof-gen.
...
The .gcda files generated by "$(MAKE) PROF_FLAGS=-fprofile-generate all"
should be removed. Otherwise, the profile data in them would be combined
with the profile data of user's workload.Then, they would be used by
"make prof-use" later.
Closes GH-8284.
2022-04-11 14:30:35 +02:00
Tim Düsterhus
dcd5e8220e
Add print_r() to function_arguments/sensitive_parameter_value.phpt ( #8340 )
...
see 9085197734
see #7921
2022-04-11 13:30:29 +02:00
Christoph M. Becker
30b2398860
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Preserve file-position when php://temp switches to temporary file
2022-04-11 12:45:48 +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
106c908db5
Merge branch 'PHP-8.1'
...
* PHP-8.1:
JIT: Fix memory lek
2022-04-11 12:21:09 +03: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
ccef2bc435
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Tracing JIT: Fixed incorrect assumption about stack slot type
2022-04-11 11:45:32 +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
414f7fc2bb
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Improve type narrowing fix
2022-04-10 11:22:52 +02: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
Nikita Popov
8e58828e89
Add debug assertion on type narrowing
...
This ensures that this will show up as a fuzzing failure.
2022-04-10 10:45:52 +02:00
Nikita Popov
d5c854d89a
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Improve file/line information for narrowing warning
2022-04-10 10:42:11 +02:00
Nikita Popov
323f3c6914
Improve file/line information for narrowing warning
...
Report the file/line of the opline rather than the include location.
This should make issues like #8251 easier to debug.
2022-04-10 10:41:20 +02:00
Ilija Tovilo
eb97b09ac5
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Remove issue_comment trigger on nightly
2022-04-10 01:11:41 +02:00
Ilija Tovilo
3b4d33a8fa
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Remove issue_comment trigger on nightly
2022-04-10 01:11:24 +02:00