5caa52476c
Merge branch 'PHP-7.4'
2019-04-12 12:51:42 +02:00
4f28bbda51
Fix SOAP bailout handling
...
This code was reusing the _bailout variable from
SOAP_CLIENT_BEGIN/END_CODE(). As _bailout is not volatile, modifying
it after the setjmp call and then reading it back on return is
illegal. Use a separate local bailout variable instead.
This fixes the miscompile introduced by marking zend_bailout() as
noreturn.
2019-04-12 12:51:17 +02:00
785f034e41
Merge branch 'PHP-7.4'
2019-04-12 12:04:11 +02:00
ba40f505e5
Fix unused variable warnings in libmagic
...
These variables are only used in assertions.
2019-04-12 12:03:26 +02:00
49ce7c0014
Remove odd variable assignment in escape_analysis
...
As we are breaking out of the for loop setting i = ssa_vars_count
doesn't do anything, but it confuses GCC into throwing a no-overflow
assumption warning.
2019-04-12 11:56:37 +02:00
88bfd2ae98
Regroup expressions in php_schema.c to avoid array bounds warnings
2019-04-12 11:11:53 +02:00
edcf087ff9
Avoid potentially-uninitialized warnings in readline
2019-04-12 11:01:56 +02:00
e5edbd0fe6
Fix uninitializde heredoc_tag use in readline
...
Could happen if "<<<" is directly followed by a newline.
2019-04-12 10:56:54 +02:00
b8b00263c5
Merge branch 'PHP-7.4'
2019-04-12 10:37:27 +02:00
1ef5b79b6b
Merge branch 'PHP-7.3' into PHP-7.4
2019-04-12 10:37:17 +02:00
354a1c27aa
Merge branch 'PHP-7.2' into PHP-7.3
2019-04-12 10:37:08 +02:00
3b53d28e60
Fix key leaks in mb_convert_encoding()
2019-04-12 10:36:58 +02:00
8e8d129d7f
Use EMPTY_SWITCH_DEFAULT_CASE in php_unicode.c
...
Avoids a potentially uninitialized variable warning.
2019-04-12 10:26:11 +02:00
d4c69b2633
Merge branch 'PHP-7.4'
2019-04-12 09:57:16 +02:00
0774d67ff9
Avoid directory clash in realpath tests
2019-04-12 09:57:07 +02:00
39505764ad
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Replace "ZEND_CALL_CTOR" hack by additional live-range
2019-04-12 01:01:47 +03:00
88a2268d6b
Replace "ZEND_CALL_CTOR" hack by additional live-range
2019-04-12 00:49:45 +03:00
5477d68300
Fix potential OPcache file cache related issues
...
To solve issues detected during testing, we backport the following
commits to PHP 7.2:
129c5c11819ac133a0b3ce72bc6b65
2019-04-11 18:28:49 +02:00
6960ea99ac
Merge branch 'PHP-7.4'
2019-04-11 16:57:46 +02:00
2b28f71891
Use readdir() instead of readdir_r()
...
readdir_r() is deprecated in modern glibc versions. readdir() is
thread safe in practice, as long as there are no concurrent accesses
on the *same* directory stream.
2019-04-11 16:52:36 +02:00
3e0f9c2c94
Remove curl gnutls locking
...
This is only relevant for the gcrypt backend, which is no longer in
use. I couldn't find any hard info on when exactly gcrypt support was
dropped, but nette is the default since 2.11.1. Most code that still
has the gcrypt handling is checking against < 2.12. In either case,
those versions were released in 2010/2011.
2019-04-11 16:45:45 +02:00
e91de955be
Merge branch 'PHP-7.4'
2019-04-11 16:02:20 +02:00
9d663cba1a
Fix libgd warnings
2019-04-11 15:54:09 +02:00
ca47732eee
Remove incorrect mbstring includes
...
And thus fix unused variable warnings.
2019-04-11 15:47:41 +02:00
f4628436df
Fix VirtualProtect memory size
...
As otherwise it would remove executable flag from JIT memory
Thanks Dmitry for the hint :)
2019-04-11 15:46:46 +02:00
44a1cd4fcd
Remove unused function prototype
2019-04-11 15:39:24 +02:00
771c64edcc
Merge branch 'PHP-7.4'
2019-04-11 15:23:29 +02:00
2d823cb681
Fix error message in spl_autoload test
2019-04-11 15:22:59 +02:00
b65cb7e2aa
Fix libmagic warnings
2019-04-11 15:20:05 +02:00
f6521659ca
Add script to generate libmagic.patch
2019-04-11 15:12:20 +02:00
853f881bd1
Avoid code duplication
2019-04-11 15:05:16 +02:00
3e26a6bd54
Merge branch 'PHP-7.4'
2019-04-11 14:14:31 +02:00
2916ecabe0
Remove the readline thread-safety warning
...
Would be nice to have this in configure, but we'd have to change
the ordering of extension & Zend processing for that.
2019-04-11 14:14:21 +02:00
651fd1a962
Fix pointer signedness warning in mysqlnd
2019-04-11 14:14:21 +02:00
29eb35616a
Remove unused rcsid variables
2019-04-11 14:14:21 +02:00
539a16fdb8
Avoid curl ssl callback warnings with OpenSSL 1.1
2019-04-11 14:14:21 +02:00
6d232eec03
Improved code generated for RETURN in methpods and closures
2019-04-11 15:13:14 +03:00
6dd7450427
Fix opcache build without JIT
2019-04-11 12:52:50 +02:00
47c74e780d
Merge branch 'PHP-7.4'
2019-04-11 12:36:10 +02:00
cd8312a77e
Merge branch 'PHP-7.3' into PHP-7.4
2019-04-11 12:36:01 +02:00
a61d24e4d8
Avoid onig match param unused variable warning
2019-04-11 12:35:24 +02:00
9825d68c08
Use zend_quiet_write instead of ZEND_IGNORE_VALUE
...
Forgot this exists when I changed this earlier...
2019-04-11 12:24:10 +02:00
b2fb753e85
Don't build JIT if the host architecture doesn't support it
...
Also display in phpinfo() whether JIT is unavailable/disabled/enabled.
2019-04-11 12:05:41 +02:00
ee45565a2a
Fix incompatible pointer warning in zend_test
2019-04-11 11:20:52 +02:00
d31104facc
Mark zend_jit_print_regset as unused
...
This is a debugging function, so it's usually not going to be used
and we don't want to see a warning about that.
2019-04-11 11:05:42 +02:00
0351552e1e
Suppress write() warnings in jit_perf_dump.c
2019-04-11 11:00:38 +02:00
cc900edd77
Simplify call frame initialization
2019-04-11 02:08:32 +03:00
9db2efe283
Merge branch 'PHP-7.4'
2019-04-10 15:31:24 +02:00
eb8c07fe2f
Support VirtualProtect for opcache.protect_memory
...
Don't enable this on AppVeyor yet, as there is still an open
issue in phar.
2019-04-10 15:31:18 +02:00
30f5822a9b
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix phar:// include handling with file cache
2019-04-10 14:57:27 +02:00
Nikita Popov