1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Commit Graph

115490 Commits

Author SHA1 Message Date
Nikita Popov edfcf2d81f Merge branch 'PHP-7.4' 2019-09-19 17:22:34 +02:00
Nikita Popov 5bee9c9062 Merge branch 'PHP-7.3' into PHP-7.4 2019-09-19 17:22:28 +02:00
Nikita Popov 85e7668129 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-19 17:21:45 +02:00
Nikita Popov 003c13d7bc Fix iterable return type optimization 2019-09-19 17:21:00 +02:00
Nikita Popov 975ef6ea9c Merge branch 'PHP-7.4' 2019-09-19 14:20:38 +02:00
Nikita Popov 8a599c7b74 Merge branch 'PHP-7.3' into PHP-7.4 2019-09-19 14:20:13 +02:00
Nikita Popov 6bf5c8508a Merge branch 'PHP-7.2' into PHP-7.3 2019-09-19 14:20:04 +02:00
Nikita Popov 3e139a4653 Fix exif leak on duplicate copyright tags 2019-09-19 14:19:31 +02:00
Nikita Popov 962a9cd74e Merge branch 'PHP-7.4' 2019-09-19 11:36:29 +02:00
Nikita Popov 22516b7d8a Merge branch 'PHP-7.3' into PHP-7.4 2019-09-19 11:36:19 +02:00
Nikita Popov f53b8268d6 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-19 11:36:09 +02:00
CJDennis e3255a4f49 Fix typo
`sizeof("data")-1` and `sizeof("date")-1` are both 4, so no change in behaviour
2019-09-19 11:36:00 +02:00
Nikita Popov cdd4e591a4 Don't make argument nullable based on AST null initializer
Closes GH-4720.
2019-09-19 11:27:00 +02:00
Christoph M. Becker d6ef63db53 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix #78543: is_callable() on FFI\CData throws Exception
2019-09-19 09:17:53 +02:00
Christoph M. Becker 9dfbcd7248 Fix #78543: is_callable() on FFI\CData throws Exception
If `Z_OBJ_HANDLER_P(callable, get_closure)` throws, we must not let the
exeception pass to userland, if called through `is_callable()`.
2019-09-19 09:13:22 +02:00
George Peter Banyard f816171240 Indicate entry is skipped in error message 2019-09-18 22:30:12 +02:00
Nikita Popov 0b4e007253 Merge branch 'PHP-7.4' 2019-09-18 16:37:23 +02:00
Nikita Popov 38ae522440 Merge branch 'PHP-7.3' into PHP-7.4 2019-09-18 16:37:14 +02:00
Nikita Popov 85b001974a Remove unstable test output
This may be printed in a different order, and we don't care about
it anyway.
2019-09-18 16:36:29 +02:00
Nikita Popov 418d243e37 Change instructions to use oniguruma from git
Some bugs are already fixed there.

[ci skip]
2019-09-18 14:56:25 +02:00
Dmitry Stogov 2aefd11211 Optimize access to thread local cache.
This patch saves one CPU instruction on each "_tsrm_ls_cache" access in ZTS CLI/CGI/FPM builds.
This reduce typical instruction sequence for EG(current_execute_data) access from 4 to 3 CPU instructions.
2019-09-18 14:03:07 +03:00
Nikita Popov d7b4cdff3f Add instructions for building an instrumented libonig
[ci skip]
2019-09-18 12:49:42 +02:00
Craig Duncan 1fc2fec138 Convert session functions arginfo to php stubs 2019-09-18 10:59:57 +02:00
Nikita Popov ee41204915 Merge branch 'PHP-7.4' 2019-09-18 10:45:19 +02:00
Nikita Popov db7702213c Merge branch 'PHP-7.3' into PHP-7.4 2019-09-18 10:45:07 +02:00
Nikita Popov e11ed02870 Fixed bug #78272
Use MAP_JIT only when running under hardened runtime, because MAP_JIT
is incompatible with fork().

The check is based on
https://github.com/mono/mono/commit/f879e35e3ed7496d819bd766deb8be6992d068ed.
2019-09-18 10:41:27 +02:00
Nikita Popov 96840a280f Add debugging code to usleep()
To see if intermittent CI failures are caused by a signal interrupt.
2019-09-18 10:13:35 +02:00
Nikita Popov 16f4fa0ee8 Merge branch 'PHP-7.4' 2019-09-18 09:31:52 +02:00
Nikita Popov 996292a91d Merge branch 'PHP-7.3' into PHP-7.4 2019-09-18 09:31:44 +02:00
Nikita Popov 03efeda538 Backport MAP_JIT fixes from PCRE2 10.33
This is intended to fix the primary issue from bug #77260.

Prior to macOS 10.14 multiple MAP_JIT segments were not permitted,
leading to mmap failures and corresponding "no more memory" errors
on macOS 10.13.
2019-09-18 09:28:54 +02:00
Christoph M. Becker d61bc63c4d Change XMLWriter resources to objects
While we generally prefer objects over resources for quite a while, the
procedural XMLWriter API still uses resources, although there is
already an object-oriented API which uses objects.  This dichotomy
makes no sense, slightly complicates the implementation, and doesn't
allow a stepwise migration to the object-oriented API, which might be
desired.  Thus we completely drop the XMLWriter resources in favor of
XMLWriter objects.

We consider the minor BC break acceptable for a major version, since
only explicit type checks (`is_resource()`, `gettype()` etc.) need to
be adapted.
2019-09-18 08:52:14 +02:00
Benjamin Eberlei 873b54840f Upgrading notes for removed ext/dom classes. 2019-09-17 23:52:08 +02:00
Benjamin Eberlei 25bfac44b0 Cleanup ext/dom: Removal of unimplemented dummy classes.
The following classes were registered in ext/dom but
neither documented nor had any behavior (only test data).
These classes are now removed:

- DOMNameList
- DomImplementationList
- DOMConfiguration
- DomError
- DomErrorHandler
- DOMImplementationSource
- DOMLocator
- DOMUserDataHandler
- DOMTypeInfo
2019-09-17 23:45:06 +02:00
Derick Rethans 7baca20067 Update NEWS for 7.4.0RC3 2019-09-17 16:39:07 +00:00
Derick Rethans 19ac6b2a58 Update NEWS for PHP 7.4.0RC2 2019-09-17 16:37:49 +00:00
Derick Rethans 07d0ebb15b Merge branch 'PHP-7.4' 2019-09-17 17:34:31 +01:00
Derick Rethans 9ed247b7b1 Revert "Update NEWS for PHP 7.4.0RC2"
This reverts commit 050059cb26.
2019-09-17 17:32:33 +01:00
Derick Rethans 4c39f557e6 Revert "Update NEWS for 7.4.0RC3"
This reverts commit 803dc6b8f2.
2019-09-17 17:32:31 +01:00
Nikita Popov 31b9b656b4 Merge branch 'PHP-7.4' 2019-09-17 17:34:31 +02:00
Nikita Popov 7c6985d7cb Merge branch 'PHP-7.3' into PHP-7.4 2019-09-17 17:34:24 +02:00
Nikita Popov 409e9ea51d Merge branch 'PHP-7.2' into PHP-7.3 2019-09-17 17:34:08 +02:00
Nikita Popov 175f4f24ae Increase timeout in test 2019-09-17 17:33:46 +02:00
Christoph M. Becker 9a734c5c19 Implement NUL byte checks for dbnames
Since we're passing these parameter to C functions accepting `char*`
without any further checking, we should reject strings with NUL bytes
in the first place.
2019-09-17 16:37:28 +02:00
Nikita Popov 8a66cb35a3 Merge branch 'PHP-7.4' 2019-09-17 16:18:03 +02:00
Nikita Popov 66351025c8 Enable --with-mhash on CI 2019-09-17 16:16:31 +02:00
Nikita Popov 4ea28680a9 Merge branch 'PHP-7.4' 2019-09-17 15:43:57 +02:00
Nikita Popov b50a90867a Merge branch 'PHP-7.3' into PHP-7.4 2019-09-17 15:43:35 +02:00
Nikita Popov c5d4c45e7d Merge branch 'PHP-7.2' into PHP-7.3 2019-09-17 15:42:58 +02:00
fancyweb e691a98c1f Fix #76342: file_get_contents waits twice specified timeout 2019-09-17 15:42:29 +02:00
Dmitry Stogov 50527aa49b Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed CLI/CGI/FPM build, when they are built together with Apache SAPI
2019-09-17 15:44:40 +03:00