]>
granicus.if.org Git - php/log
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 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.
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: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: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
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: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: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:13:44 +0000 (13:13 +0200)]
Check for exception after calling count_values()
To avoid a duplicate error if count_values() throws.
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: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: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.
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
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.
Fabien Villepinte [Mon, 16 Sep 2019 13:40:43 +0000 (15:40 +0200)]
Fix typo
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 [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:37:16 +0000 (14:37 +0200)]
Fix use-after-free due to packed->mixed conversion with __unserialize()
Nikita Popov [Mon, 16 Sep 2019 11:52:52 +0000 (13:52 +0200)]
Fix segfault when unserializing abstract class
Nikita Popov [Mon, 16 Sep 2019 11:03:08 +0000 (13:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 16 Sep 2019 11:02:56 +0000 (13:02 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 16 Sep 2019 11:01:59 +0000 (13:01 +0200)]
Fix leak in SplObjectStorage unserialization
The result of php_var_unserialize always needs to be destroyed,
even if the call failed.
Nikita Popov [Mon, 16 Sep 2019 09:59:43 +0000 (11:59 +0200)]
Fix test after unserialize change
Nikita Popov [Mon, 16 Sep 2019 09:38:35 +0000 (11:38 +0200)]
Sanity-check array/object lengths during unserialization
Avoid OOM conditions in unserialize due to overly large array or
object length specifications.
Dmitry Stogov [Mon, 16 Sep 2019 07:29:29 +0000 (10:29 +0300)]
Fixed typos
Christoph M. Becker [Sun, 15 Sep 2019 13:14:02 +0000 (15:14 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Stick with zend_long for ABI compatibility
Christoph M. Becker [Sun, 15 Sep 2019 13:13:13 +0000 (15:13 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Stick with zend_long for ABI compatibility
Christoph M. Becker [Sun, 15 Sep 2019 13:11:25 +0000 (15:11 +0200)]
Stick with zend_long for ABI compatibility
Cf. <https://github.com/php/php-src/pull/4700#issuecomment-
531515689 >.
Christoph M. Becker [Sat, 14 Sep 2019 16:47:53 +0000 (18:47 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78535: auto_detect_line_endings value not parsed as bool
Christoph M. Becker [Sat, 14 Sep 2019 16:46:34 +0000 (18:46 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78535: auto_detect_line_endings value not parsed as bool
bugreportuser [Thu, 12 Sep 2019 18:44:08 +0000 (12:44 -0600)]
Fix #78535: auto_detect_line_endings value not parsed as bool
Nikita Popov [Sat, 14 Sep 2019 10:08:20 +0000 (12:08 +0200)]
Fix double-free on invalid large octal with separators
To clean up the mess here a bit, check for invalid octal digits
with an explicit loop instead of mixing this into the string to
number conversion.
Also clean up some type usage.
Nikita Popov [Fri, 13 Sep 2019 22:00:04 +0000 (00:00 +0200)]
Use XtOffsetOf() in url_scanner_ex
Instead of a manual implementation.
Nikita Popov [Fri, 13 Sep 2019 21:49:50 +0000 (23:49 +0200)]
Fix symtable_cache_limit assignment in phpdbg
The meaning of the limit changed in 7.4, it now points one past the
end. Adjust code accordingly.
David Carlier [Fri, 13 Sep 2019 10:37:53 +0000 (11:37 +0100)]
Fix tautological compare warning
The ZEND_ALLOCATOR() macro compares against constants that are
larger than the unsigned short type, resulting in warnings on
clang. Avoid this by explicitly casting to size_t.
Nikita Popov [Fri, 13 Sep 2019 20:04:58 +0000 (22:04 +0200)]
Define OBJ_PROP_TO_OFFSET() using XtOffsetOf()
This avoids null pointer arithmetic UB.
Nikita Popov [Fri, 13 Sep 2019 19:52:17 +0000 (21:52 +0200)]
Include stddef.h in zend_portability.h for offsetof() macro
This makes sure that we use compiler builtins when they are
available and thus avoid ubsan warnings in clang.
And also reindent the fallback implementation.
Nikita Popov [Fri, 13 Sep 2019 15:09:24 +0000 (17:09 +0200)]
Fix use-after-free in assign-ref compilation
zend_emit_op_data may reallocate the op_array, so the assignment
of the RETURNS_FUNCTION flag may happen on an outdated opline.
Restructure the code a bit to set the flag before calling
zend_emit_op_data().
Nikita Popov [Fri, 13 Sep 2019 12:37:15 +0000 (14:37 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 12 Sep 2019 11:17:27 +0000 (13:17 +0200)]
Fix bug #78525
When calling free_result_buffers(), also free field metadata and
restore the mempool state to what it was before any allocations
have been made. Remove the mempool save/restore logic for the
inner result set as this is now handled on a higher level.
Dmitry Stogov [Fri, 13 Sep 2019 09:38:57 +0000 (12:38 +0300)]
Make constant and copy propagation only for IS_TMP_VAR operands
Dmitry Stogov [Fri, 13 Sep 2019 09:08:59 +0000 (12:08 +0300)]
Fixed incorrect usage of QM_ASSIGN instruction
Dmitry Stogov [Thu, 12 Sep 2019 22:42:02 +0000 (01:42 +0300)]
Fixed bug #78531 (Crash when using undefined variable as object
Dmitry Stogov [Thu, 12 Sep 2019 15:46:13 +0000 (18:46 +0300)]
Load string once
Dmitry Stogov [Thu, 12 Sep 2019 15:29:19 +0000 (18:29 +0300)]
Eliminate checks using ZEND_CONST_COND() macro
Nikita Popov [Wed, 11 Sep 2019 13:31:04 +0000 (15:31 +0200)]
Allow throwing exception while loading parent class
This is a fix for symfony/symfony#32995.
The behavior is:
* Throwing exception when loading parent/interface is allowed
(and we will also throw one if the class is simply not found).
* If this happens, the bucket key for the class is reset, so
it's possibly to try registering the same class again.
* However, if the class has already been used due to a variance
obligation, the exception is upgraded to a fatal error, as we
cannot safely unregister the class stub anymore.
Christoph M. Becker [Thu, 12 Sep 2019 07:14:08 +0000 (09:14 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix exif build
NEWS
Christoph M. Becker [Thu, 12 Sep 2019 07:11:14 +0000 (09:11 +0200)]
Fix exif build
As of PHP 7.3.0 the `model` field is removed.
Kalle Sommer Nielsen [Thu, 12 Sep 2019 03:52:24 +0000 (06:52 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
NEWS
Kalle Sommer Nielsen [Thu, 12 Sep 2019 03:50:53 +0000 (06:50 +0300)]
NEWS
Kalle Sommer Nielsen [Thu, 12 Sep 2019 03:33:40 +0000 (06:33 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
Kalle Sommer Nielsen [Thu, 12 Sep 2019 03:31:52 +0000 (06:31 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
Kalle Sommer Nielsen [Thu, 12 Sep 2019 03:21:39 +0000 (06:21 +0300)]
Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
Nikita Popov [Wed, 11 Sep 2019 15:04:13 +0000 (17:04 +0200)]
Improve "already declared" error message
If this error is missing because the rtd_key was renamed to lcname,
fetch the class based on lcname and use the class type and cased
name from there.
Nikita Popov [Wed, 11 Sep 2019 14:50:16 +0000 (16:50 +0200)]
Fix typo in unlinked_instanceof assertion
Nikita Popov [Wed, 11 Sep 2019 14:27:28 +0000 (16:27 +0200)]
Only allow "nearly linked" classes for parent/interface
The requirements for parent/interface are difference than for the
variance checks in type declarations. The latter can work on fully
unlinked classes, but the former need inheritance to be essentially
finished, only variance checks may still be outstanding.
Adding a new flag for this because we have lots of space, but we
could also represent these "inheritance states" more compactly in
the future.
Nikita Popov [Tue, 3 Sep 2019 08:06:09 +0000 (10:06 +0200)]
Specify -fsanitize-no-recover
To make it more obvious when there are ubsan failures.
Nicolas Grekas [Tue, 3 Sep 2019 08:02:30 +0000 (10:02 +0200)]
Improve Symfony test setup
Perform PHPUnit installation under php7.3 -- which will also make
it work on master.
Also properly resolve the tty issue by specifying excluded groups
during the test run.
Nikita Popov [Wed, 11 Sep 2019 08:59:04 +0000 (10:59 +0200)]
Free history_get_history_state() result
It's not documented, but per https://bugs.python.org/issue8065
the result is freshly malloc'd and needs to be freed.
Nikita Popov [Wed, 11 Sep 2019 08:31:03 +0000 (10:31 +0200)]
Fix another pointer indexing UB in http_fopen_wrapper
Only compute the gep after checking whether the pointer is NULL.
Nikita Popov [Wed, 11 Sep 2019 08:27:32 +0000 (10:27 +0200)]
Fixed bug #78506
Nikita Popov [Wed, 11 Sep 2019 07:52:31 +0000 (09:52 +0200)]
Preloading: Fix handling of static vars in inherited methods
Part of bug #78512.
Dmitry Stogov [Tue, 10 Sep 2019 21:52:54 +0000 (00:52 +0300)]
Fixed bad format string
Sara Golemon [Tue, 10 Sep 2019 17:05:38 +0000 (13:05 -0400)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Bump for 7.2.24
Sara Golemon [Tue, 10 Sep 2019 17:05:17 +0000 (13:05 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump for 7.2.24
Sara Golemon [Tue, 10 Sep 2019 17:03:27 +0000 (13:03 -0400)]
Bump for 7.2.24
Remi Collet [Tue, 10 Sep 2019 14:29:44 +0000 (16:29 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Raise minimal GCC version, Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions
Remi Collet [Tue, 10 Sep 2019 14:29:30 +0000 (16:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Raise minimal GCC version, Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions
Remi Collet [Tue, 10 Sep 2019 14:28:35 +0000 (16:28 +0200)]
Raise minimal GCC version,
Test with 4.8 is OK
With 4.4: error: #pragma GCC diagnostic not allowed inside functions
Christoph M. Becker [Tue, 10 Sep 2019 13:13:11 +0000 (15:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
PHP 7.3.10RC1 has been tagged
Christoph M. Becker [Tue, 10 Sep 2019 13:11:54 +0000 (15:11 +0200)]
PHP 7.3.10RC1 has been tagged
Dmitry Stogov [Tue, 10 Sep 2019 08:23:12 +0000 (11:23 +0300)]
NEWS entry, test and minor cleanup for FFI::isNull()
Dmitry Stogov [Tue, 10 Sep 2019 08:22:05 +0000 (11:22 +0300)]
Merge branch 'PHP-7.4' of git.php.net:php-src into PHP-7.4
* 'PHP-7.4' of git.php.net:php-src:
Drop regression test
Christoph M. Becker [Tue, 10 Sep 2019 08:08:42 +0000 (10:08 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Drop regression test
Christoph M. Becker [Tue, 10 Sep 2019 08:08:07 +0000 (10:08 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Drop regression test
Christoph M. Becker [Tue, 10 Sep 2019 08:07:39 +0000 (10:07 +0200)]
Drop regression test
The state returned by `sodium_crypto_generichash_init()` has to be
regarded as opaque byte string; neither its size nor its exact
structure are fixed, and actually vary for diffent libsodium versions.
Therefore we drop the test altogether.
Philip Hofstetter [Mon, 9 Sep 2019 11:14:59 +0000 (13:14 +0200)]
add FFI::isNull() to check whether a FFI\CData is a null pointer
Dmitry Stogov [Tue, 10 Sep 2019 08:01:36 +0000 (11:01 +0300)]
Stop after exceptions
Simonov Denis [Tue, 10 Sep 2019 07:22:26 +0000 (09:22 +0200)]
Request #77863: PDO firebird support type Boolean in input parameters
Christoph M. Becker [Mon, 9 Sep 2019 14:57:23 +0000 (16:57 +0200)]
new_variable '{' expr '}' is deprecated as well
Curly brace syntax for accessing array elements and string offsets is
deprecated [1]; this should also be the case for respective `new`
expressions.
This issue has been reported by brzuchal@php.net.
[1] <https://wiki.php.net/rfc/deprecate_curly_braces_array_access>
Nikita Popov [Mon, 9 Sep 2019 15:29:49 +0000 (17:29 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 9 Sep 2019 15:29:39 +0000 (17:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
CHU Zhaowei [Sun, 8 Sep 2019 09:29:32 +0000 (09:29 +0000)]
Fix bug #72884 isCloneable() on SplFileObject should return false
Tyson Andre [Mon, 9 Sep 2019 12:30:18 +0000 (08:30 -0400)]
Add opcache return type for random_int()
random_int() will throw for incorrect argument counts, types (e.g. float
that can't cast to int), or having min > max.
See ext/standard/random.c