1
0
mirror of https://github.com/php/php-src.git synced 2026-04-20 14:31:06 +02:00
Commit Graph

111978 Commits

Author SHA1 Message Date
Anatol Belski
0d91b046a3 Merge branch 'PHP-7.4'
* PHP-7.4:
  Ensure double slashes are replaced by the path normalization
2019-04-10 15:47:57 +02:00
Anatol Belski
d207c9a78a Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Ensure double slashes are replaced by the path normalization
2019-04-10 15:47:36 +02:00
Nikita Popov
9db2efe283 Merge branch 'PHP-7.4' 2019-04-10 15:31:24 +02:00
Nikita Popov
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
Anatol Belski
ce72bc6b65 Ensure double slashes are replaced by the path normalization 2019-04-10 15:20:36 +02:00
Anatol Belski
30f5822a9b Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix phar:// include handling with file cache
2019-04-10 14:57:27 +02:00
Anatol Belski
db7aba538d Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix phar:// include handling with file cache
2019-04-10 14:57:04 +02:00
Anatol Belski
1aa30bb71c Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix phar:// include handling with file cache
2019-04-10 14:56:29 +02:00
Anatol Belski
f31d7ca85e Fix phar:// include handling with file cache 2019-04-10 14:55:15 +02:00
Nikita Popov
6342458499 Merge branch 'PHP-7.4' 2019-04-10 14:45:01 +02:00
Nikita Popov
33a149afba Remove posix_getlogin() check from posix_getpwnam() test
It doesn't make sense to pass false to posix_getpwnam(). I'm not
sure what exactly this is guarding against, but it won't work in
this form.
2019-04-10 14:43:52 +02:00
Nikita Popov
4e6a33dc2b Merge branch 'PHP-7.4' 2019-04-10 13:39:59 +02:00
Nikita Popov
397ee767fd Make zlib include_path tests more robust
One file is placed inside the script directory, we need to make
sure it has a unique name as well.
2019-04-10 13:39:17 +02:00
Nikita Popov
2e982e975c Merge branch 'PHP-7.4' 2019-04-10 13:07:06 +02:00
Nikita Popov
c02a5931f4 Merge branch 'PHP-7.3' into PHP-7.4 2019-04-10 13:07:01 +02:00
Nikita Popov
b67ca4f07c Merge branch 'PHP-7.2' into PHP-7.3 2019-04-10 13:06:55 +02:00
Nikita Popov
8f13599a64 Fix 29nb_async_connect.phpt
Intermediate states are unreliable across versions (I think), make
sure we go through the whole connect procedure.
2019-04-10 13:06:02 +02:00
Nikita Popov
30d968951d Merge branch 'PHP-7.4' 2019-04-10 12:23:49 +02:00
Nikita Popov
2191eac3b3 Merge branch 'PHP-7.3' into PHP-7.4 2019-04-10 12:23:01 +02:00
Nikita Popov
6615b9c287 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-10 12:22:34 +02:00
Nikita Popov
c7a86a38a3 Fix pgsql use after free trying to reuse closed connection
When a connection is closed, we also need to remove the hash entry
from the regular_list, as it now points to freed memory. To do this
store a reverse mapping from the connection to the hash string.

It would be nicer to introduce a wrapping structure for the pgsql
link resource that could store the hash (and notices), but that would
require large changes to the extension, so I'm going for a more
minimal fix here.
2019-04-10 12:18:57 +02:00
Peter Kokot
90654aff31 Merge branch 'PHP-7.4'
* PHP-7.4:
  fix a spell mistake
2019-04-10 10:45:31 +02:00
ROVAST
231fecee27 fix a spell mistake
possbile => possible
2019-04-10 10:45:13 +02:00
Nikita Popov
f3dd39ef61 Merge branch 'PHP-7.4' 2019-04-10 10:39:02 +02:00
Nikita Popov
d50dcbe659 Merge branch 'PHP-7.3' into PHP-7.4 2019-04-10 10:38:52 +02:00
Nikita Popov
ed1df9d135 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-10 10:38:32 +02:00
Nikita Popov
b55715d61a Fix use after free on pg_close() of default connection 2019-04-10 10:38:24 +02:00
Dmitry Stogov
d374920e5e Eliminated unreachable jumps 2019-04-10 11:18:59 +03:00
Nikita Popov
ef1bc493ed Merge branch 'PHP-7.4' 2019-04-10 10:02:23 +02:00
Nikita Popov
ce5e5b0aa3 Use release for regex in imap
The regex may be used as a cache key now.
2019-04-10 10:01:49 +02:00
Nikita Popov
dc17ca6044 Remove redundant $this args in SplObjectStorage implementation
If we pass intern we can get the object from &intern->std, no need
to pass around an extra argument everywhere.
2019-04-10 09:44:06 +02:00
Nikita Popov
03783bb55d Merge branch 'PHP-7.4' 2019-04-10 09:40:06 +02:00
Nikita Popov
e2ea0f105c Fix bug #77866: Port Serializable SPL classes to use __unserialize()
Payloads created using Serializable are still supported.
2019-04-10 09:36:39 +02:00
Dmitry Stogov
20548ab506 Removed too strict register allocation constraint. 2019-04-10 02:06:51 +03:00
Dmitry Stogov
2980de29f0 Don't split basic block after RECV, if function checks type hints 2019-04-09 21:59:47 +03:00
Nikita Popov
e640f64008 Merge branch 'PHP-7.4' 2019-04-09 17:27:22 +02:00
Nikita Popov
cb145e18b2 Fixed bug #77873 2019-04-09 17:27:02 +02:00
Nikita Popov
6cec795951 Merge branch 'PHP-7.4' 2019-04-09 17:24:37 +02:00
Nikita Popov
b870685c5b Fix leak on error in new serialization mechanism 2019-04-09 17:19:44 +02:00
Dmitry Stogov
40c8585bab Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed ext/ffi/tests/044.phpt failure on 32-bit Linux
2019-04-09 16:12:53 +03:00
Dmitry Stogov
a5e86d8264 Fixed ext/ffi/tests/044.phpt failure on 32-bit Linux 2019-04-09 16:12:13 +03:00
Dmitry Stogov
e05867f089 Merge branch 'PHP-7.4'
* PHP-7.4:
  Eliminated check for assignment to itself
2019-04-09 15:37:50 +03:00
Dmitry Stogov
ec5d4c79d2 Eliminated check for assignment to itself 2019-04-09 15:37:19 +03:00
Dmitry Stogov
578049f157 Merge branch 'PHP-7.4'
* PHP-7.4:
  Micro-optimization
2019-04-09 14:39:15 +03:00
Dmitry Stogov
5fdee9394f Micro-optimization 2019-04-09 14:38:49 +03:00
Dmitry Stogov
9c14cfdc78 Compare only "significant" bits 2019-04-09 11:28:29 +03:00
Peter Kokot
8afb3e6856 Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove duplicated substitude for Makefile
2019-04-09 02:11:57 +02:00
Peter Kokot
8021d52fb6 Remove duplicated substitude for Makefile
The substitution is already done in the CLI's config.m4 file. Current
SAPIs only provide one PHP_EXECUTABLE variable, i.e. PHP CLI so the one
in the configure.ac can be removed.
2019-04-09 02:09:42 +02:00
Dmitry Stogov
ef6e99ec39 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Remove HAVE_STRERROR
2019-04-09 01:18:54 +03:00
Dmitry Stogov
53189b5ebc Merge branch 'PHP-7.4' of git.php.net:php-src into PHP-7.4
* 'PHP-7.4' of git.php.net:php-src:
  Remove HAVE_STRERROR
2019-04-09 01:18:44 +03:00