1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Commit Graph

115606 Commits

Author SHA1 Message Date
Dmitry Stogov cf33837d75 Cleanup CFG optimization 2019-09-25 17:30:59 +03:00
Stephen Reay 72e3b252e8 Adding ldap stubs for arginfo 2019-09-25 15:09:25 +02:00
Gabriel Caruso 5d6e923d46 Remove mention of PHP major version in Copyright headers
Closes GH-4732.
2019-09-25 14:51:43 +02:00
Nikita Popov fb60ccc666 Merge branch 'PHP-7.4' 2019-09-25 11:03:19 +02:00
Nikita Popov b8ef7c35ab Increase serialize_lock while decoding session
Avoid leaking state between Serializable::unserialize() and
session_decode().
2019-09-25 11:02:23 +02:00
Nikita Popov b100d51ba2 Remove xfail on bug70219.phpt
Looks like this is working as it's supposed to, the test expectation
just needs to be adjusted.
2019-09-25 10:57:03 +02:00
Christoph M. Becker de6b76805d Just return on throwing ZPP 2019-09-25 10:40:45 +02:00
Christoph M. Becker 2540c44dbe Add missing zend_parse_parameters_none() 2019-09-25 10:40:45 +02:00
Nikita Popov f753975c7a Merge branch 'PHP-7.4' 2019-09-25 10:35:26 +02:00
Nikita Popov a31256d52c Merge branch 'PHP-7.3' into PHP-7.4 2019-09-25 10:34:33 +02:00
Nikita Popov 915fe2fdc6 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-25 10:34:25 +02:00
Stephen Reay b0d80e16e3 Add SimpleXML arginfo stubs 2019-09-25 10:34:21 +02:00
Jinesh Patel d2331cc3f2 Fix hash key length in umsg_parse_format()
Fix array length passed to zend_hash_str_find_ptr() casting from
UChar array to char array requires mul by sizeof(UChar).
2019-09-25 10:30:33 +02:00
Nikita Popov 2e6c91e3ab Merge branch 'PHP-7.4' 2019-09-25 10:19:34 +02:00
Gerard Roche 9cc1bf5628 Fix GCOV not working for PHP-7.4 and master branches
Code coverage reports (`make lcov`), since commit eef8522 (7.4 branch),
generates incorrect coverage and emits warnings. Simplifying the
Makefile.gcov file has the side-effect of resolving the issue.

    Processing sapi/cli/php_http_parser.gcda
    php-src/lcov_data/sapi/cli/php_http_parser.gcda:stamp mismatch with notes file
    geninfo: WARNING: gcov did not create any files for php-src/lcov_data/sapi/cli/php_http_parser.gcda!
    ...
    Processing ext/mbstring/mb_gpc.gcda
    php-src/lcov_data/ext/mbstring/mb_gpc.gcda:stamp mismatch with notes file
    geninfo: WARNING: gcov did not create any files for php-src/lcov_data/ext/mbstring/mb_gpc.gcda!

Closes: https://bugs.php.net/bug.php?id=52718.
See also: https://bugs.php.net/bug.php?id=78288.
2019-09-25 10:19:19 +02:00
Gabriel Caruso 202158e2cd Merge branch 'PHP-7.4'
* PHP-7.4:
  Use nproc instead of hardcoded number
2019-09-25 00:07:09 +02:00
Gabriel Caruso 3205ebefa3 Use nproc instead of hardcoded number 2019-09-25 00:02:59 +02:00
Christoph M. Becker 652c09ecf7 [ci skip] Update UPGRADING.INTERNALS
Cf. <http://git.php.net/?p=php-src.git;a=commit;h=0c7124e6beff0a7b0540691db370148be06d242a>.
2019-09-24 16:20:18 +02:00
Christoph M. Becker 0c7124e6be Add check_only parameter to get_closure handler
`get_closure` handlers are called to check whether an object is
callable, and to actually get the closure, respectively.  The behavior
of the handler might differ for these two cases, particularly the
handler may throw in the latter case, but should not in the former.

Therefore we add a `check_only` parameter, to be able to distinguish
the desired purpose.
2019-09-24 16:08:42 +02:00
Nikita Popov 1fe47ad233 Add new entries for exif and unserialize fuzzing corpus 2019-09-24 12:34:30 +02:00
Nikita Popov 3b52307c86 Merge branch 'PHP-7.4' 2019-09-24 12:19:14 +02:00
Nikita Popov 73115ef873 Fixed bug #78589
Don't protect GC while destroying zvals. We may need to add GC
roots during this phase.
2019-09-24 12:17:21 +02:00
Nikita Popov a369430b00 Avoid signed shift 2019-09-24 11:36:05 +02:00
Christoph M. Becker 3c28a4ac6c Merge branch 'PHP-7.4'
* PHP-7.4:
  Update NEWS
2019-09-24 11:16:08 +02:00
Christoph M. Becker 2a74fedff0 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Update NEWS
2019-09-24 11:15:28 +02:00
Christoph M. Becker 7530938670 Update NEWS 2019-09-24 11:13:55 +02:00
Stanislav Malyshev a9dabe0e20 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix #78559: Heap buffer overflow in mb_eregi
2019-09-23 21:51:26 -07:00
Stanislav Malyshev e7befd38d4 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix #78559: Heap buffer overflow in mb_eregi
2019-09-23 21:51:12 -07:00
Christoph M. Becker 8f949eba80 Fix #78559: Heap buffer overflow in mb_eregi
We backport kkos/oniguruma@d3e402928b.
2019-09-23 21:49:55 -07:00
Christoph M. Becker c761616f66 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix NEWS entry
2019-09-23 23:04:26 +02:00
Christoph M. Becker 6bdde5d479 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix NEWS entry
2019-09-23 23:03:55 +02:00
Christoph M. Becker 8c9c58436b Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix NEWS entry
2019-09-23 23:03:07 +02:00
Christoph M. Becker ed099ab186 Fix NEWS entry
Cf. <https://bugs.php.net/78590>.
2019-09-23 22:59:55 +02:00
Dmitry Stogov 1030ff5f5f Use cheaper code for scalar type check 2019-09-23 23:04:08 +03:00
Dmitry Stogov 6e226c188c Change ZEND_RECV and ZEND_RECV_VARIADIC to use extended_value for cache slot (instead of op2), to be consistent with ZEND_RECV_INIT. 2019-09-23 22:28:56 +03:00
Nikita Popov 2128c634f6 Check that type is set in ZEND_TYPE_IS_MASK()
Allow this macro to be used without an explicit ZEND_TYPE_IS_SET()
check.
2019-09-23 19:43:27 +02:00
Benjamin Eberlei cece939526 Cleanup ext/dom: Additional unimplemented code following 25bfac4 2019-09-23 19:28:55 +02:00
Nikita Popov 131c1a5668 Merge branch 'PHP-7.4' 2019-09-23 17:18:45 +02:00
Nikita Popov dbeeabed9b Merge branch 'PHP-7.3' into PHP-7.4 2019-09-23 17:18:39 +02:00
Nikita Popov 954d073833 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-23 17:18:33 +02:00
Nikita Popov 3ddb63dce1 Fix skipif condition 2019-09-23 17:17:52 +02:00
Nikita Popov 6276dd826b Use ZEND_TYPE_IS_SET() when checking for property types
Instead of a simple if or 0 comparison. This would no longer work
if zend_type is a struct.
2019-09-23 16:53:54 +02:00
Nikita Popov 3a104c3c37 Merge branch 'PHP-7.4' 2019-09-23 16:43:04 +02:00
Nikita Popov 2bb04106be Merge branch 'PHP-7.3' into PHP-7.4 2019-09-23 16:42:59 +02:00
Nikita Popov d0f4966b05 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-23 16:42:33 +02:00
Nikita Popov bc4c4c658c Skip test on 32-bit 2019-09-23 16:42:24 +02:00
Nikita Popov 3012d006ff Don't set nullability flag for parameters without type
Use value 0 instead. To compensate we check in ReflectionParameter
allowsNull() whether the type is set at all: If it isn't, it always
allows null.

This removes a discrepancy between internal&userland functions:
For userland functions allowsNull() on untyped parameters returned
true, but for internal functions it returned false.
2019-09-23 16:39:52 +02:00
Nikita Popov e441378b54 Update error messages in some more tests 2019-09-23 16:39:52 +02:00
Nikita Popov 5dcbc65a53 Canonicalize typed prop/param default value errors
Use shared logic to determine what values are valid, and a single
error message format.
2019-09-23 16:20:26 +02:00
Nikita Popov b7745d6eeb Check for nullable void type earlier 2019-09-23 15:59:47 +02:00