mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-20 15:30:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
113,237 Commits 503 Branches 1,387 Tags 838 MiB
f0f84adf2b
Commit Graph

113237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
f0f84adf2b Merge branch 'PHP-7.3' into PHP-7.4 2019-09-19 21:14:46 +02:00
Nikita Popov
e76dea4283 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-19 21:14:40 +02:00
Nikita Popov
0fa13028cb Fix out-of-bounds read in exif tag reading 
This issue was recently introduced in c739023a50,
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.
 2019-09-19 21:11:57 +02:00
Nikita Popov
3fd68fd827 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.
 2019-09-19 21:00:22 +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
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
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
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
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
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
f879e35e3e.
 2019-09-18 10:41:27 +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
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
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
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
Nikita Popov
66351025c8 Enable --with-mhash on CI 2019-09-17 16:16:31 +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
db094b4b2e Fixed CLI/CGI/FPM build, when they are built together with Apache SAPI 2019-09-17 15:43:00 +03:00
Nikita Popov
d266ba4f2d Check for exception after calling count_values() 
To avoid a duplicate error if count_values() throws.
 2019-09-17 13:13:44 +02:00
David Carlier
ce25fa0d24 Monitoring anonymous pages on mac via vmmap tag 2019-09-17 12:54:46 +02:00
Nikita Popov
1a5f04688e Merge branch 'PHP-7.3' into PHP-7.4 2019-09-17 12:19:45 +02:00
Nikita Popov
3a2fa489dd Merge branch 'PHP-7.2' into PHP-7.3 2019-09-17 12:19:39 +02:00
Drakano
252ebce0d7 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.
 2019-09-17 12:19:21 +02:00
Nikita Popov
62b440ffbb Merge branch 'PHP-7.3' into PHP-7.4 2019-09-17 12:09:06 +02:00
Nikita Popov
f98684b06c Merge branch 'PHP-7.2' into PHP-7.3 2019-09-17 12:08:57 +02:00
Tyson Andre
29bced9521 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 c88ffa9a56.

Closes GH-4702.
 2019-09-17 12:08:29 +02:00
Fabien Villepinte
1792adebfd Improve test usleep_basic by inlining its output 
Closes GH-4703.
 2019-09-17 12:07:06 +02:00
Derick Rethans
803dc6b8f2 Update NEWS for 7.4.0RC3 2019-09-17 07:37:35 +00:00
Derick Rethans
050059cb26 Update NEWS for PHP 7.4.0RC2 2019-09-17 07:36:16 +00:00
Christoph M. Becker
20f73d3d8f Fix #78429: opcache_compile_file(__FILE__); segfaults 
We have to ensure that OPcache has been properly started up when
`opcache_compile_file()` is called.
 2019-09-16 16:01:09 +02:00
Fabien Villepinte
42046c71ee Fix typo 2019-09-16 15:55:23 +02:00
Nikita Popov
8c0c06da86 Merge branch 'PHP-7.3' into PHP-7.4 2019-09-16 15:01:14 +02:00
Nikita Popov
8a11f1284e Merge branch 'PHP-7.2' into PHP-7.3 2019-09-16 15:01:05 +02:00
Nikita Popov
2f6efd835d Fixed bug #78545 
By using an explicit (double) cast.
 2019-09-16 15:00:20 +02:00
Christoph M. Becker
145ffd93fc 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.
 2019-09-16 14:58:39 +02:00
Nikita Popov
c3376bf7ae Fix use-after-free due to packed->mixed conversion with __unserialize() 2019-09-16 14:37:16 +02:00