Commit Graph

111309 Commits

Author SHA1 Message Date
Nikita Popov
92291ab726 Merge branch 'PHP-7.4' 2019-03-11 14:33:07 +01:00
Nikita Popov
ac79d42ba6 Free trampolines from get_closure in is_callable
Also extract this logic into a function, as it's duplicated a few times.
2019-03-11 14:00:33 +01:00
Dmitry Stogov
e279c80247 Merge branch 'PHP-7.4'
* PHP-7.4:
  Closure::fromCallable() supports only regular methods and magic method invoked through __call()/__callStatic(). It doesn't support method of internal classes invoked through C object or class handlers. This commit prevents crash described at bug #77708, but doesn't implement the desired behavior.
2019-03-11 15:42:41 +03:00
Dmitry Stogov
409e0dd29f Closure::fromCallable() supports only regular methods and magic method invoked through __call()/__callStatic().
It doesn't support method of internal classes invoked through C object or class handlers.
This commit prevents crash described at bug #77708, but doesn't implement the desired behavior.
2019-03-11 15:39:34 +03:00
Dmitry Stogov
ddf02dc978 Merge branch 'PHP-7.4'
* PHP-7.4:
  Reset fields
2019-03-11 15:39:18 +03:00
Dmitry Stogov
e7f0a60d54 Reset fields 2019-03-11 15:38:49 +03:00
Dmitry Stogov
63da56cfc4 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed bug #77707 (FFI loses type information for opaque types)
2019-03-11 14:26:52 +03:00
Dmitry Stogov
e623df650f Fixed bug #77707 (FFI loses type information for opaque types) 2019-03-11 14:26:17 +03:00
Nikita Popov
852485d8ec Adjust tests for zpp TypeError change 2019-03-11 11:32:20 +01:00
Nikita Popov
6bfb119e18 Remove some unnecessary error handler setting
A few non-standard exceptions thrown on zpp failures will change to
TypeError due to this.
2019-03-11 11:32:20 +01:00
Nikita Popov
86ef425177 Intl: Don't separately report "bad arguments" errors
zpp will be throwing for these now, don't report them in addition to
that.
2019-03-11 11:32:20 +01:00
Nikita Popov
513b76794b Make zpp failures always throw, independent of strict_types
Previously zend_parse_parameters (and FastZPP) would handle invalid
arguments depending on strict_types: With strict_types=1, a TypeError
is thrown, with strict_types=0 a warning is thrown and (usually) NULL
is returned. Additionally, some functions (constructors always and
other methods sometimes) opt-it to throwing regardless of strict_types.

This commit changes zpp to always generate a TypeError exception in
PHP 8.
2019-03-11 11:32:20 +01:00
Dmitry Stogov
87f8b1b709 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed bug #77706 (Improve error messages in FFI for incompatible arguments)
2019-03-11 13:28:04 +03:00
Dmitry Stogov
a1868d2291 Fixed bug #77706 (Improve error messages in FFI for incompatible arguments) 2019-03-11 13:27:23 +03:00
Nikita Popov
d40889e408 Merge branch 'PHP-7.4' 2019-03-11 10:19:50 +01:00
Andrew Brampton
c79ce48ddb Fix #71890: Add support for crc32c Castagnoli's polynomial.
This variant of crc32 is heavily used by storage systems, such as iSCSI, SCTP,
Btrfs, ext4, and is increasingly being used in API (such as Google Cloud
Storage, and Apache Kafka).
2019-03-11 10:19:35 +01:00
David Carlier
f8a2497584 Fix shm api detection test for opcache module on FreeBSD
Per man page the shm_open path should start with / and contain no
further slashes.
2019-03-11 10:19:35 +01:00
Joe Watkins
bf21727ea0
Merge branch 'PHP-7.4'
* PHP-7.4:
  drop unused parameter from zend_startup
2019-03-11 10:10:45 +01:00
Joe Watkins
df6e9fae8f
drop unused parameter from zend_startup 2019-03-11 10:10:14 +01:00
Nikita Popov
bbdc5d1da6 Merge branch 'PHP-7.4' 2019-03-11 10:01:16 +01:00
c9s
9f6f6fe219 Remove function_table var from the caller
function_table var is not used in call_user_function macro anymore
hence replace the usage with NULL
2019-03-11 10:00:39 +01:00
Daniel Stenberg
d9d253fa6b curl_exec: remove bad check for CURLE_PARTIAL_FILE
This check introduced in 2004 is wrong and removed. A HEAD request with
curl does *not* cause this error code - only if you make a regular GET
request but tell curl to send a HEAD using CURLOPT_CUSTOMREQUEST and
then you've asked for it.

You do a proper HEAD request with curl by setting the CURLOPT_NOBODY
option to 1L.

This was the case in 2004. This is still the case in 2019. This is also
documented in libcurl documentation.

This check hides the possibly serious error when this error code is
genuinely and correctly returned by curl because the transfer was
truncated and ended up partial.

As can be seen, I objected to this change already in the original bug:
https://bugs.php.net/bug.php?id=27341
2019-03-11 09:56:25 +01:00
Stanislav Malyshev
48d636a5e7 Merge branch 'PHP-7.4'
* PHP-7.4:
  This option doesn't exist for a long time.
2019-03-11 01:14:29 -07:00
Stanislav Malyshev
4a12fb4aba This option doesn't exist for a long time. 2019-03-11 01:14:14 -07:00
Gabriel Caruso
726919e4b5 Merge branch 'PHP-7.4'
* PHP-7.4:
  Use EXPECT when possible
  Fix tests filenames
2019-03-11 00:07:32 -03:00
Gabriel Caruso
6c4e2079c0 Use EXPECT when possible
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
2019-03-11 00:05:44 -03:00
Gabriel Caruso
c67c2c4d8f Fix tests filenames 2019-03-10 23:57:32 -03:00
Peter Kokot
f4a12d198b Merge branch 'PHP-7.4'
* PHP-7.4:
  Add meaningful error message for ext/zip
2019-03-11 00:16:36 +01:00
hassan
173e126a77 Add meaningful error message for ext/zip 2019-03-11 00:15:29 +01:00
Jakub Zelenka
dd50dba2db Merge branch 'PHP-7.4' 2019-03-10 16:37:39 +00:00
Jakub Zelenka
bc57efb78f Merge branch 'PHP-7.3' into PHP-7.4 2019-03-10 16:36:55 +00:00
Jakub Zelenka
f8850ccd85 Speed up TLS wrapper test for min and max versions 2019-03-10 16:36:13 +00:00
Jakub Zelenka
ee4fa7d482 Merge branch 'PHP-7.2' into PHP-7.3 2019-03-10 16:34:58 +00:00
Jakub Zelenka
769d2d9b62 Speed up TLS wrapper tests when SSLv3 disabled
If SSLv3 is disabled in OpenSSL, then sslv3 is not available so the accept
times out. This commit removes the extra accept if SSLv3 is disabled.
2019-03-10 16:23:44 +00:00
Anatol Belski
4c489a9a2e Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix bc break in Windows readlink
2019-03-10 15:49:56 +01:00
johnstevenson
b37a6aafce Fix bc break in Windows readlink
GetFinalPathNameByHandleW is given a file handle to a symbolic link,
rather than one to the target, and therefore returns an incorrect path.

Fix symlink with relative path and add test
2019-03-10 15:48:31 +01:00
Anatol Belski
bcf6d9bd00 Merge branch 'PHP-7.4'
* PHP-7.4:
  Don't use Opcache with the master test process
2019-03-10 13:58:04 +01:00
Anatol Belski
44b7126c6d Don't use Opcache with the master test process
Additionally, enable opcache.file_cache to mitigate possible reattach
failures in the tests.
2019-03-10 13:56:32 +01:00
Anatol Belski
abd60b0523 Merge branch 'PHP-7.4'
* PHP-7.4:
  Update libmagic.patch [skip ci]
2019-03-08 21:56:07 +01:00
Anatol Belski
591d6b86ab Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Update libmagic.patch [skip ci]
2019-03-08 21:55:48 +01:00
Anatol Belski
3e92365fa2 Update libmagic.patch [skip ci] 2019-03-08 21:55:15 +01:00
Anatol Belski
53eeeb5226 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix typo in libmagic version
2019-03-08 21:45:45 +01:00
Anatol Belski
93a38b1f7c Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix typo in libmagic version
2019-03-08 21:45:18 +01:00
Fabien Villepinte
d9a3cb0b36 Fix typo in libmagic version 2019-03-08 20:51:09 +01:00
Anatol Belski
c39f5ef9f4 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed bug #77576 pull the libmagic implementation of gmtime_r
2019-03-08 20:48:52 +01:00
Anatol Belski
c8ebfaa4eb Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fixed bug #77576 pull the libmagic implementation of gmtime_r
2019-03-08 20:48:24 +01:00
Anatol Belski
65ffdc2adf Fixed bug #77576 pull the libmagic implementation of gmtime_r
PHP already has all the checks to handle the *_r function variants.
Thus, reusing it to get right symbols.
2019-03-08 20:32:15 +01:00
Anatol Belski
ec0cc64d67 Merge branch 'PHP-7.4'
* PHP-7.4:
  Sync with behavior change in OpenSSL 1.1.1b
  fix news
  bump versions after release
2019-03-08 15:57:29 +01:00
Anatol Belski
6ecdd78d7a Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Sync with behavior change in OpenSSL 1.1.1b
  fix news
  bump versions after release
2019-03-08 15:56:48 +01:00
Anatol Belski
58cb3312d6 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Sync with behavior change in OpenSSL 1.1.1b
  fix news
  bump versions after release
2019-03-08 15:55:34 +01:00