]>
granicus.if.org Git - php/log
Bishop Bettini [Fri, 20 Sep 2019 16:59:50 +0000 (12:59 -0400)]
[ci skip] Add phar + imap maintainer email
Looks like commit
c09b13cb (Add Bishop Bettini as maintainer for
phar & imap, 2019-03-16) missed adding my email address.
Remi Collet [Fri, 20 Sep 2019 11:30:28 +0000 (13:30 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78574 (broken shared build)
Remi Collet [Fri, 20 Sep 2019 11:30:13 +0000 (13:30 +0200)]
Fixed bug #78574 (broken shared build)
Christoph M. Becker [Thu, 19 Sep 2019 18:06:28 +0000 (20:06 +0200)]
Make MSVC happy again
MSVC complains about unsupported preprocessor syntax, so we employ the
same workaround as in zend_cpuinfo.h.
Craig Duncan [Mon, 16 Sep 2019 17:07:49 +0000 (19:07 +0200)]
Convert soap functions arginfo to php stubs
We alos make the last parameter of `SoapClient::__setCookie()` and
`SoapFault::__construct()` properly nullable.
Craig Duncan [Mon, 26 Aug 2019 17:06:18 +0000 (18:06 +0100)]
Convert pcntl functions arginfo to php stubs
Dmitry Stogov [Thu, 19 Sep 2019 20:46:45 +0000 (23:46 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't buid static libaraies when only DSO required
Dmitry Stogov [Thu, 19 Sep 2019 20:44:53 +0000 (23:44 +0300)]
Don't buid static libaraies when only DSO required
Nikita Popov [Thu, 19 Sep 2019 19:14:54 +0000 (21:14 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 19:14:46 +0000 (21:14 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 19:14:40 +0000 (21:14 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 19:11:57 +0000 (21:11 +0200)]
Fix out-of-bounds read in exif tag reading
This issue was recently introduced in
c739023a50876e2a90588f915803b0140a95638e ,
when the restriction that components>0 has been relaxed. We now need
to make sure that any tags that expect at least one component check
that this is the case.
Nikita Popov [Thu, 19 Sep 2019 19:02:20 +0000 (21:02 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 16:29:13 +0000 (18:29 +0200)]
Clean up JSON parser
Don't use <value> type for JSON tokens that don't have a value
and remove the errlex productions -- we're going to get an
unexpected token error anyway, there's no need to handle these
explicitly.
This also removes the awkward workarounds for the unused value
warnings.
Dmitry Stogov [Thu, 19 Sep 2019 18:53:36 +0000 (21:53 +0300)]
Fixed 32-bit JIT
Stephen Reay [Thu, 19 Sep 2019 09:37:58 +0000 (16:37 +0700)]
Convert IMAP function aliases
These are not really aliases, convert them to normal functions.
Closes GH-4725.
Nikita Popov [Thu, 19 Sep 2019 15:22:34 +0000 (17:22 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 15:22:28 +0000 (17:22 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 15:21:45 +0000 (17:21 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 15:20:10 +0000 (17:20 +0200)]
Fix iterable return type optimization
Nikita Popov [Thu, 19 Sep 2019 12:20:38 +0000 (14:20 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 12:20:13 +0000 (14:20 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 12:20:04 +0000 (14:20 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 12:16:36 +0000 (14:16 +0200)]
Fix exif leak on duplicate copyright tags
Nikita Popov [Thu, 19 Sep 2019 09:36:29 +0000 (11:36 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 09:36:19 +0000 (11:36 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 09:36:09 +0000 (11:36 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
CJDennis [Wed, 18 Sep 2019 10:03:24 +0000 (20:03 +1000)]
Fix typo
`sizeof("data")-1` and `sizeof("date")-1` are both 4, so no change in behaviour
Nikita Popov [Wed, 18 Sep 2019 13:43:32 +0000 (15:43 +0200)]
Don't make argument nullable based on AST null initializer
Closes GH-4720.
Christoph M. Becker [Thu, 19 Sep 2019 07:17:53 +0000 (09:17 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78543: is_callable() on FFI\CData throws Exception
Christoph M. Becker [Wed, 18 Sep 2019 09:55:20 +0000 (11:55 +0200)]
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()`.
George Peter Banyard [Sat, 31 Aug 2019 23:34:55 +0000 (01:34 +0200)]
Indicate entry is skipped in error message
Nikita Popov [Wed, 18 Sep 2019 14:37:23 +0000 (16:37 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 18 Sep 2019 14:37:14 +0000 (16:37 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 14:36:29 +0000 (16:36 +0200)]
Remove unstable test output
This may be printed in a different order, and we don't care about
it anyway.
Nikita Popov [Wed, 18 Sep 2019 12:11:36 +0000 (14:11 +0200)]
Change instructions to use oniguruma from git
Some bugs are already fixed there.
[ci skip]
Dmitry Stogov [Wed, 18 Sep 2019 11:03:07 +0000 (14:03 +0300)]
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.
Nikita Popov [Wed, 18 Sep 2019 09:53:15 +0000 (11:53 +0200)]
Add instructions for building an instrumented libonig
[ci skip]
Craig Duncan [Sat, 10 Aug 2019 15:50:18 +0000 (16:50 +0100)]
Convert session functions arginfo to php stubs
Nikita Popov [Wed, 18 Sep 2019 08:45:19 +0000 (10:45 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 18 Sep 2019 08:45:07 +0000 (10:45 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 07:44:00 +0000 (09:44 +0200)]
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 .
Nikita Popov [Wed, 18 Sep 2019 08:13:35 +0000 (10:13 +0200)]
Add debugging code to usleep()
To see if intermittent CI failures are caused by a signal interrupt.
Nikita Popov [Wed, 18 Sep 2019 07:31:52 +0000 (09:31 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 18 Sep 2019 07:31:44 +0000 (09:31 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 07:28:54 +0000 (09:28 +0200)]
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.
Christoph M. Becker [Sat, 14 Sep 2019 16:31:59 +0000 (18:31 +0200)]
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.
Benjamin Eberlei [Tue, 17 Sep 2019 21:52:08 +0000 (23:52 +0200)]
Upgrading notes for removed ext/dom classes.
Benjamin Eberlei [Sun, 15 Sep 2019 13:09:33 +0000 (15:09 +0200)]
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
Derick Rethans [Tue, 17 Sep 2019 16:39:07 +0000 (16:39 +0000)]
Update NEWS for 7.4.0RC3
Derick Rethans [Tue, 17 Sep 2019 16:37:49 +0000 (16:37 +0000)]
Update NEWS for PHP 7.4.0RC2
Derick Rethans [Tue, 17 Sep 2019 16:34:31 +0000 (17:34 +0100)]
Merge branch 'PHP-7.4'
Derick Rethans [Tue, 17 Sep 2019 16:32:33 +0000 (17:32 +0100)]
Revert "Update NEWS for PHP 7.4.0RC2"
This reverts commit
050059cb269f3581901d3ac4d155292fee95d4cf .
Derick Rethans [Tue, 17 Sep 2019 16:32:31 +0000 (17:32 +0100)]
Revert "Update NEWS for 7.4.0RC3"
This reverts commit
803dc6b8f2ea1f9314d19eb242365f32a364437e .
Nikita Popov [Tue, 17 Sep 2019 15:34:31 +0000 (17:34 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 17 Sep 2019 15:34:24 +0000 (17:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 17 Sep 2019 15:34:08 +0000 (17:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 17 Sep 2019 15:33:46 +0000 (17:33 +0200)]
Increase timeout in test
Christoph M. Becker [Tue, 10 Sep 2019 11:02:59 +0000 (13:02 +0200)]
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.
Nikita Popov [Tue, 17 Sep 2019 14:18:03 +0000 (16:18 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 17 Sep 2019 14:16:31 +0000 (16:16 +0200)]
Enable --with-mhash on CI
Nikita Popov [Tue, 17 Sep 2019 13:43:57 +0000 (15:43 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 17 Sep 2019 13:43:35 +0000 (15:43 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 17 Sep 2019 13:42:42 +0000 (15:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
fancyweb [Mon, 29 Jul 2019 22:33:13 +0000 (00:33 +0200)]
Fix #76342: file_get_contents waits twice specified timeout
Dmitry Stogov [Tue, 17 Sep 2019 12:44:40 +0000 (15:44 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed CLI/CGI/FPM build, when they are built together with Apache SAPI
Dmitry Stogov [Tue, 17 Sep 2019 12:43:00 +0000 (15:43 +0300)]
Fixed CLI/CGI/FPM build, when they are built together with Apache SAPI
Nikita Popov [Tue, 17 Sep 2019 11:15:01 +0000 (13:15 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 17 Sep 2019 11:13:44 +0000 (13:13 +0200)]
Check for exception after calling count_values()
To avoid a duplicate error if count_values() throws.
Nikita Popov [Tue, 17 Sep 2019 10:55:18 +0000 (12:55 +0200)]
Merge branch 'PHP-7.4'
David Carlier [Sat, 27 Jul 2019 12:33:48 +0000 (13:33 +0100)]
Monitoring anonymous pages on mac via vmmap tag
Nikita Popov [Tue, 17 Sep 2019 10:19:57 +0000 (12:19 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 17 Sep 2019 10:19:45 +0000 (12:19 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 17 Sep 2019 10:19:39 +0000 (12:19 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Drakano [Thu, 12 Sep 2019 08:18:30 +0000 (10:18 +0200)]
Add tilde to allowed status/ping path
Because of user specific webdirs it should be possible to set a
status/ping path like "/~username/status".
Closes GH-4698.
Nikita Popov [Tue, 17 Sep 2019 10:18:01 +0000 (12:18 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 17 Sep 2019 10:09:06 +0000 (12:09 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 17 Sep 2019 10:08:57 +0000 (12:08 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Tyson Andre [Fri, 13 Sep 2019 18:09:15 +0000 (14:09 -0400)]
Fix opcache return type for get_headers in zend_func_info
https://www.php.net/manual/en/function.get-headers.php#refsect1-function.get-headers-examples
shows that it will return string keys when the second argument is
non-zero. I've verified that this is the case.
This bug was there since the initial commit in
c88ffa9a567 .
Closes GH-4702.
Nikita Popov [Tue, 17 Sep 2019 10:07:23 +0000 (12:07 +0200)]
Merge branch 'PHP-7.4'
Fabien Villepinte [Sat, 14 Sep 2019 06:38:33 +0000 (08:38 +0200)]
Improve test usleep_basic by inlining its output
Closes GH-4703.
Derick Rethans [Tue, 17 Sep 2019 07:37:35 +0000 (07:37 +0000)]
Update NEWS for 7.4.0RC3
Derick Rethans [Tue, 17 Sep 2019 07:36:16 +0000 (07:36 +0000)]
Update NEWS for PHP 7.4.0RC2
Nikita Popov [Mon, 16 Sep 2019 18:18:00 +0000 (20:18 +0200)]
Move scripts out of corpus/ directory
Nikita Popov [Fri, 13 Sep 2019 13:15:46 +0000 (15:15 +0200)]
Various improvements to fuzzer SAPIs
Stanislav Malyshev [Wed, 31 Jul 2019 05:45:55 +0000 (22:45 -0700)]
Add fuzzer SAPIs to the core
Christoph M. Becker [Mon, 16 Sep 2019 14:01:49 +0000 (16:01 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78429: opcache_compile_file(__FILE__); segfaults
Christoph M. Becker [Tue, 20 Aug 2019 15:56:12 +0000 (17:56 +0200)]
Fix #78429: opcache_compile_file(__FILE__); segfaults
We have to ensure that OPcache has been properly started up when
`opcache_compile_file()` is called.
Christoph M. Becker [Mon, 16 Sep 2019 13:55:58 +0000 (15:55 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typo
Fabien Villepinte [Mon, 16 Sep 2019 13:40:43 +0000 (15:40 +0200)]
Fix typo
Fabien Villepinte [Mon, 16 Sep 2019 08:43:39 +0000 (10:43 +0200)]
Make some session tests more robust
Nikita Popov [Mon, 16 Sep 2019 13:01:22 +0000 (15:01 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 16 Sep 2019 13:01:14 +0000 (15:01 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 16 Sep 2019 13:01:05 +0000 (15:01 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 16 Sep 2019 13:00:20 +0000 (15:00 +0200)]
Fixed bug #78545
By using an explicit (double) cast.
Christoph M. Becker [Mon, 16 Sep 2019 12:59:22 +0000 (14:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78516: password_hash(): Memory cost is not in allowed range
Christoph M. Becker [Sat, 14 Sep 2019 10:04:01 +0000 (12:04 +0200)]
Fix #78516: password_hash(): Memory cost is not in allowed range
libsodium measures the memory cost in bytes, while password_hash() and
friends expect kibibyte values. We have to properly map between these
scales not only when calling libsodium functions, but also when
checking for allowed values.
We also refactor to rid the code duplication.
Nikita Popov [Mon, 16 Sep 2019 12:38:19 +0000 (14:38 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 16 Sep 2019 12:37:16 +0000 (14:37 +0200)]
Fix use-after-free due to packed->mixed conversion with __unserialize()
Nikita Popov [Mon, 16 Sep 2019 11:53:44 +0000 (13:53 +0200)]
Merge branch 'PHP-7.4'