1
0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Commit Graph

112053 Commits

Author SHA1 Message Date
Nikita Popov
5caa52476c Merge branch 'PHP-7.4' 2019-04-12 12:51:42 +02:00
Nikita Popov
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
Nikita Popov
3744533468 Enable -Wall on release builds for GCC
-Wall was already enabled for debug builds, enable it for release
builds as well.
2019-04-12 12:51:17 +02:00
Nikita Popov
785f034e41 Merge branch 'PHP-7.4' 2019-04-12 12:04:11 +02:00
Nikita Popov
ba40f505e5 Fix unused variable warnings in libmagic
These variables are only used in assertions.
2019-04-12 12:03:26 +02:00
Nikita Popov
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
Nikita Popov
c09b63595e Fix potentially uninitialized warnings in phpdbg 2019-04-12 11:46:03 +02:00
Nikita Popov
88bfd2ae98 Regroup expressions in php_schema.c to avoid array bounds warnings 2019-04-12 11:11:53 +02:00
Nikita Popov
edcf087ff9 Avoid potentially-uninitialized warnings in readline 2019-04-12 11:01:56 +02:00
Nikita Popov
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
Nikita Popov
ce408504d5 Mark zend_bailout() as a noreturn function 2019-04-12 10:41:53 +02:00
Nikita Popov
b8b00263c5 Merge branch 'PHP-7.4' 2019-04-12 10:37:27 +02:00
Nikita Popov
1ef5b79b6b Merge branch 'PHP-7.3' into PHP-7.4 2019-04-12 10:37:17 +02:00
Nikita Popov
354a1c27aa Merge branch 'PHP-7.2' into PHP-7.3 2019-04-12 10:37:08 +02:00
Nikita Popov
3b53d28e60 Fix key leaks in mb_convert_encoding() 2019-04-12 10:36:58 +02:00
Nikita Popov
8e8d129d7f Use EMPTY_SWITCH_DEFAULT_CASE in php_unicode.c
Avoids a potentially uninitialized variable warning.
2019-04-12 10:26:11 +02:00
Nikita Popov
2370d56334 Merge branch 'PHP-7.4' 2019-04-12 10:06:14 +02:00
Nikita Popov
0f777c768c Run compile step under travis_wait
If there are no warnings, we may end up compiling more than 10
minutes without output, in which case the build times out. Use
travis_wait to avoid this.
2019-04-12 10:05:15 +02:00
Nikita Popov
d4c69b2633 Merge branch 'PHP-7.4' 2019-04-12 09:57:16 +02:00
Nikita Popov
0774d67ff9 Avoid directory clash in realpath tests 2019-04-12 09:57:07 +02:00
Dmitry Stogov
4190b95d11 Merge branch 'PHP-7.4'
* PHP-7.4:
  Backported call frame initialization improvement
2019-04-12 02:37:33 +03:00
Dmitry Stogov
55cc280429 Backported call frame initialization improvement 2019-04-12 02:35:42 +03:00
Dmitry Stogov
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
Dmitry Stogov
88a2268d6b Replace "ZEND_CALL_CTOR" hack by additional live-range 2019-04-12 00:49:45 +03:00
Dmitry Stogov
7604f295ca Merge branch 'PHP-7.4'
* PHP-7.4:
  Added test
2019-04-11 21:37:26 +03:00
Dmitry Stogov
db93c26e6d Added test 2019-04-11 21:37:10 +03:00
Christoph M. Becker
95040f9aa0 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix potential OPcache file cache related issues
2019-04-11 18:31:41 +02:00
Christoph M. Becker
27844773d8 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix potential OPcache file cache related issues
2019-04-11 18:31:17 +02:00
Christoph M. Becker
d2d1a50b04 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix potential OPcache file cache related issues
2019-04-11 18:30:27 +02:00
Anatol Belski
5477d68300 Fix potential OPcache file cache related issues
To solve issues detected during testing, we backport the following
commits to PHP 7.2:

129c5c1181
9ac133a0b3
ce72bc6b65
2019-04-11 18:28:49 +02:00
Nikita Popov
79d1d88e06 Merge branch 'PHP-7.4' 2019-04-11 17:44:38 +02:00
Nikita Popov
09b2e20333 Work around -Walloc-size-larger-than bug 2019-04-11 17:44:20 +02:00
Nikita Popov
6960ea99ac Merge branch 'PHP-7.4' 2019-04-11 16:57:46 +02:00
Markus Staab
7bb22df5cf Fixed typo 2019-04-11 16:56:36 +02:00
Nikita Popov
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
Nikita Popov
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
Nikita Popov
e91de955be Merge branch 'PHP-7.4' 2019-04-11 16:02:20 +02:00
Nikita Popov
9d663cba1a Fix libgd warnings 2019-04-11 15:54:09 +02:00
Nikita Popov
ca47732eee Remove incorrect mbstring includes
And thus fix unused variable warnings.
2019-04-11 15:47:41 +02:00
Anatol Belski
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
Nikita Popov
44a1cd4fcd Remove unused function prototype 2019-04-11 15:39:24 +02:00
Nikita Popov
c51eafe931 Remove restrict zend_portability define
We're not using this anywhere, and it causes warnings, so I'm
dropping it. If we do end up needing this, it should be reintroduced
with a ZEND_ prefix.
2019-04-11 15:32:30 +02:00
Nikita Popov
771c64edcc Merge branch 'PHP-7.4' 2019-04-11 15:23:29 +02:00
Nikita Popov
2d823cb681 Fix error message in spl_autoload test 2019-04-11 15:22:59 +02:00
Nikita Popov
b65cb7e2aa Fix libmagic warnings 2019-04-11 15:20:05 +02:00
Nikita Popov
f6521659ca Add script to generate libmagic.patch 2019-04-11 15:12:20 +02:00
Anatol Belski
853f881bd1 Avoid code duplication 2019-04-11 15:05:16 +02:00
Nikita Popov
3e26a6bd54 Merge branch 'PHP-7.4' 2019-04-11 14:14:31 +02:00
Nikita Popov
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
Nikita Popov
651fd1a962 Fix pointer signedness warning in mysqlnd 2019-04-11 14:14:21 +02:00