Christoph M. Becker
254a7c2457
Fix # 79171: heap-buffer-overflow in phar_extract_file
...
We must not access memory outside of the allocated buffer.
(cherry picked from commit 7df594b943 )
2020-02-18 09:13:40 +01:00
Stanislav Malyshev
08b47a3d0f
Fix bug #79221 - Null Pointer Dereference in PHP Session Upload Progress
...
(cherry picked from commit 409965fe1c )
2020-02-18 09:12:51 +01:00
Stanislav Malyshev
2589f5bd83
Fix bug #79082 - Files added to tar with Phar::buildFromIterator have all-access permissions
...
(cherry picked from commit 6facfa59a5 )
2020-02-18 09:12:09 +01:00
Christoph M. Becker
a64d111c6e
Bump version
2020-02-18 09:11:16 +01:00
Christoph M. Becker
41f4674257
Bump version
2020-02-04 11:53:59 +01:00
Christoph M. Becker
079905acd5
Fix #78090 : bug45161.phpt takes forever to finish
...
Not all systems support the discard protocol (TCP port 9), and since
there is no particular reason to use it, we switch to using actual
server testing.
2020-02-04 00:44:04 +01:00
Christoph M. Becker
fe1bfb78d6
Fix #79191 : Error in SoapClient ctor disables DOMDocument::save()
...
The culprit is the too restrictive fix for bug #71536 , which prevents
`php_libxml_streams_IO_write()` from properly executing when unclean
shutdown is flagged. A *more* suitable solution is to move the
`xmlwriter_free_resource_ptr()` call from the `free_obj` handler to an
added `dtor_obj` handler, to avoid to write to a closed stream in case
of late object freeing. This makes the `EG(active)` guard superfluous.
We also fix bug79029.phpt which has to use different variables for the
three parts to actually check the original shutdown issue.
Thanks to bwoebi and daverandom for helping to investigate this issue.
2020-02-03 23:31:46 +01:00
Christoph M. Becker
b93e4aa11c
Relax test expectation
...
Since we're dealing with floating point numbers, precision issues may
hit us, and actually it's not necessary to check for the exact number
anyway, because it is not exact in the first place. Therefore, we
relax the test expectations.
2020-02-03 13:03:54 +01:00
Christoph M. Becker
c2935499b1
Fix #79212 : NumberFormatter::format() may detect wrong type
...
We have to convert to number *before* detecting the type, to cater to
internal objects implementing `cast_object`.
We also get rid of the fallback behavior of using `FORMAT_TYPE_INT32`,
because that can no longer happen; after `convert_scalar_to_number_ex`
the type is either `IS_LONG` or `IS_DOUBLE`. We cater explicitly to
the `IS_ARRAY` case what also avoids triggering a type confusion when
`::TYPE_INT64` is passed as `$type`.
2020-02-03 12:28:32 +01:00
Nikita Popov
ef1e4891b4
Fix bug #76047
...
Unlink the current stack frame before freeing CVs or extra args.
This means it will no longer show up in back traces that are
generated during CV destruction.
We already did this prior to destructing the object/closure,
presumably for the same reason.
2020-01-31 10:26:40 +01:00
Christoph M. Becker
8226e704e4
Fix #70078 : XSL callbacks with nodes as parameter leak memory
...
The fix for bug #49634 solved a double-free by copying the node with
`xmlDocCopyNodeList()`, but the copied node is later freed by calling
`xmlFreeNode()` instead of `xmlFreeNodeList()`, thus leaking memory.
However, there is no need to treat the node as node list, i.e. to copy
also the node's siblings; just creating a recursive copy of the node
with `xmlDocCopyNode()` is sufficient, while that also avoids the leak.
2020-01-30 13:04:57 +01:00
Nikita Popov
494615fcb8
Fix leak in DateTimeImmutable::modify()
2020-01-30 12:16:56 +01:00
Nikita Popov
6ccd675776
Add SKIPIF to test requiring mbregex
2020-01-30 11:20:42 +01:00
Nikita Popov
a62c06c4cf
Fix mb_ord() crash if internal encoding not supported
...
enc_name can be NULL here. Take the name from the mbfl_encoding
instead.
2020-01-29 16:18:46 +01:00
Nikita Popov
560ff9725e
Reset MBREX(search_re) in RSHUTDOWN
...
This is going to cause a segfault if reused in the next request.
To illustrate the issue, run these two scripts in sequence with
the built-in server:
// script1.php
mb_ereg_search_init('foobar');
mb_ereg_search('foo');
// script2.php
var_dump(mb_ereg_search_init("foobar"));
var_dump(mb_ereg_search_pos());
2020-01-29 16:05:11 +01:00
Nikita Popov
392ad206a4
Fix use of mb_ereg_search_getregs() after invalid pattern
...
This segfaulted because we assumed that if there are matches,
there must be a regular expression as well.
2020-01-29 12:50:18 +01:00
Christoph M. Becker
136f51f1e1
Fix #76584 : PharFileInfo::decompress not working
...
We actually have to decompress, when told to do so.
2020-01-28 10:31:36 +01:00
Ivan Mikheykin
fd08f062ae
Fix bug #78323 : Code 0 is returned on invalid options
...
Set CLI exit code to 1 when invalid parameters are passed,
and print error to stderr.
2020-01-27 13:32:19 +01:00
Florian Smeets
b836d9cdc1
Add CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0
2020-01-26 14:12:53 +01:00
George Peter Banyard
a1f2f8f06e
Fixed bug #79080 [ci skip]
...
Rewrote session.gc_probability and session.gc_divisor INI setting
description to be more succint.
2020-01-25 13:29:36 +01:00
Christoph M. Becker
49cbd23155
Make test independent of online XSD schema
...
The test still needs to access <http://www.w3.org/2009/01/xml.xsd >, but
at least we no longer depend on <http://x-road.eu/xsd/x-road.xsd >,
which may be moved again.
2020-01-24 14:18:16 +01:00
Christoph M. Becker
372b678e56
Yet another check for php_strip_tags_ex()
2020-01-24 13:02:02 +01:00
Nikita Popov
2c2cbbbf55
Fix bug76348.phpt
...
Adjust for URL change in XSD file and mark as online test.
Is it possible for use to store http://x-road.eu/xsd/xroad.xsd
locally instead? Do relative file system paths work here?
I'm not familiar with this.
2020-01-23 15:08:20 +01:00
liudaixiao
67421a780d
Fixed bug #78902
2020-01-23 14:57:16 +01:00
Léopold Jacquot
f720fb1e21
Add unit test for bug #78902
2020-01-23 14:53:28 +01:00
Nikita Popov
db9776c53c
Fixed bug #79151
...
Make sure we also NULL out next/prev of the removed element on
pop/shift. This only matter is that element is still being referenced
by an iterator.
2020-01-23 14:20:26 +01:00
Stanislav Malyshev
dd3c664f8f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
More checks for php_strip_tags_ex
2020-01-22 22:41:56 -08:00
Stanislav Malyshev
2dc170e25d
More checks for php_strip_tags_ex
2020-01-22 22:37:30 -08:00
Christoph M. Becker
f1bf4bf6eb
Don't leak encoding_str
2020-01-22 11:15:16 +01:00
Christoph M. Becker
9be31a582a
Fix #79154 : mb_convert_encoding() can modify $from_encoding
...
We must not modify arrays passed by value.
2020-01-22 10:28:07 +01:00
Remi Collet
5a9475f4b9
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
next will be 7.2.28
2020-01-22 09:17:33 +01:00
Remi Collet
7e2bd95fa5
next will be 7.2.28
2020-01-22 09:17:00 +01:00
Christoph M. Becker
9eff906a02
Fix #79145 : openssl memory leak
...
We must increase the refcount of `return_value` only if `cert` is a
resource; this is already done in `php_openssl_evp_from_zval()`,
though.
2020-01-21 16:17:25 +01:00
Deus Kane
3046e35718
Fix #79146 : cscript can fail to run on some systems
...
In the buildconf and configure batch files, Windows' cscript utility was being
run without the /e:jscript flag. This works on systems that have not had the
default .js file association changed, but if .js has been re-associated to
(say) an IDE, the batch files fail with the error message:
Input Error: There is no script engine for file extension ".js".
2020-01-21 11:53:11 +01:00
Christoph M. Becker
b67fc51859
Update NEWS wrt. sec fixes
2020-01-21 11:31:14 +01:00
Stanislav Malyshev
25ec7eb346
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS
Fix bug #79037 (global buffer-overflow in `mbfl_filt_conv_big5_wchar`)
Fix #79099 : OOB read in php_strip_tags_ex
Fix #79091 : heap use-after-free in session_create_id()
2020-01-20 22:46:29 -08:00
Stanislav Malyshev
5c90f8eb66
Update NEWS
2020-01-20 22:12:32 -08:00
Stanislav Malyshev
2bcbc95f03
Fix bug #79037 (global buffer-overflow in mbfl_filt_conv_big5_wchar)
2020-01-20 21:43:42 -08:00
Stanislav Malyshev
0f79b1bf30
Fix #79099 : OOB read in php_strip_tags_ex
2020-01-20 21:43:42 -08:00
Christoph M. Becker
f79c774274
Fix #79091 : heap use-after-free in session_create_id()
...
If the `new_id` is released, we must not use it again.
2020-01-20 21:43:42 -08:00
Nikita Popov
07bda97e76
Fixed bug #79115
2020-01-17 11:37:35 +01:00
Nikita Popov
018251a7c4
Fixed bug #71876
...
This is a backport of fcdc0a6db0
to the PHP-7.3 branch. We need to make sure that OnUpdateString
is also called for a NULL value, otherwise the reset of the encoding
at the end of the request will not work.
I believe I already tried to land this before once, but it didn't
actually end up on the PHP-7.3 branch due to a push conflict that
I only noticed just now.
2020-01-17 09:47:31 +01:00
Christoph M. Becker
1752393bb4
Fix #79084 : mysqlnd may fetch wrong column indexes with MYSQLI_BOTH
...
Column names can be numeric strings, so we have to make sure to insert
the column values with the appropriate numeric keys, instead of adding
them.
2020-01-13 13:21:45 +01:00
Christoph M. Becker
f6dea34831
Fix test cases which fail on Windows debug builds
...
We use the portable {TMP} instead of the hard-coded /tmp, and skip
mysqli_debug_append.phpt on Windows, because unlinking the trace file
while the connection is still open won't work there.
(cherry picked from commit 60081ca20d )
2020-01-10 20:00:31 +01:00
Christoph M. Becker
bc529b92ee
Fix test for Windows ZTS builds
...
Cf. <https://bugs.php.net/bug.php?id=61685#1578672905 >.
2020-01-11 06:15:32 +14:00
Christoph M. Becker
0dda4a844e
Fix #79078 : Hypothetical use-after-free in curl_multi_add_handle()
...
To avoid this, we have to verify the handlers already in
`curl_multi_add_handle()`, not only in `curl_multi_exec()`.
2020-01-08 18:29:10 +01:00
Christoph M. Becker
38c0a53b60
Bump version
2020-01-07 11:03:19 +01:00
Christoph M. Becker
06e78cad83
Revert "Extend CURLFile to support streams"
...
This reverts commit 17a9f1401a , because
this commit would break ABI, and also due to bug #79013 .
We keep the commit for PHP 7.4+, though.
2020-01-06 15:31:49 +01:00
Christoph M. Becker
ae2150692a
Fix #54298 : Using empty additional_headers adding extraneous CRLF
...
If the header string is empty, we pass `NULL` to `php_mail()` to avoid
further checks on the string length.
2020-01-06 14:47:23 +01:00
Christoph M. Becker
4bec59f175
Fix #79068 : gdTransformAffineCopy() changes interpolation method
...
We port
<https://github.com/libgd/libgd/commit/9088591eae437358ee5b929adf82865e37e3001e >.
2020-01-06 10:36:48 +01:00
Christoph M. Becker
2c5860517c
Fix #79067 : gdTransformAffineCopy() may use unitialized values
...
We port
<https://github.com/libgd/libgd/commit/7a06c1669c563917bc48c464521e3de962ddb4e8 >.
2020-01-06 09:35:13 +01:00
Christoph M. Becker
c05a069adf
Fix #78808 : [LMDB] MDB_MAP_FULL: Environment mapsize limit reached
...
We implement support for a fifth parameter, which allows to specify the
mapsize. The parameter defaults to zero, in which case the compiled in
default mapsize (usually 1048576) will be used. The mapsize should be
a multiple of the page size of the OS.
2020-01-03 18:49:12 +01:00
Christoph M. Becker
18172303f4
Fix #78538 : shmop memory leak
...
If the descriptor's refcount drops to zero, we have to unmap the
respective file view, to avoid leaking memory.
2020-01-03 18:10:29 +01:00
Christoph M. Becker
b48f2625b5
Fix #79015 : undefined-behavior in php_date.c
...
We check that the given microsecond fraction is in the valid range
[0, 1000000[, and otherwise mark it as invalid. We also drop the
useless do loop; a plain block is sufficient here.
2020-01-03 14:31:03 +01:00
Christoph M. Becker
0cecf83b26
Fix #79040 : Warning Opcode handlers are unusable due to ASLR
...
We must not use the same shared memory OPcache instance for different
SAPIs, since their memory layout is different. To avoid this, we add
the SAPI name (truncated to at most 20 characters) to the names of the
memory base file, the mutex and the file mapping.
2019-12-30 15:12:58 +01:00
Christoph M. Becker
1aa419dcdc
Add missing skipif clause
2019-12-28 11:00:37 +01:00
Christoph M. Becker
c47b18a222
Fix #79033 : Curl timeout error with specific url and post
...
We must not set an empty mime structure as `CURLOPT_MIMEPOST`; instead
we set it to `NULL` if `CURLOPT_POSTFIELDS` has been set to an empty
array.
2019-12-28 10:47:03 +01:00
Xinchen Hui
27bb3289ac
Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter).
...
We backport the fix PHP 7.3, since this branch is affected as well.
(cherry picked from commit b5e0043796 )
(cherry picked from commit e36daa6927 )
(cherry picked from commit 2704ee6844 )
2019-12-25 12:33:30 +01:00
SATO Kentaro
37d11d123e
Fix #78982 : pdo_pgsql returns dead persistent connection
...
Call PQconsumeInput() before PQstatus() to update the status.
2019-12-20 12:05:17 +01:00
SATO Kentaro
7e39e6934d
Fix #78980 : pgsqlGetNotify() overlooks dead connection
...
pgsqlGetNotify() didn't check result of PQconsumeInput().
2019-12-20 11:44:07 +01:00
Sergei Turchanov
c62cd9a43a
Fix #74170 : locale information change after mime_content_type
...
Some functions in libmagic (distributed with fileinfo extension) perform this sequence of calls:
func() {
setlocale(LC_TYPE, "C")
.. do some work ..
setlocale(LC_TYPE, "")
}
It effectively resets LC_TYPE if it that was set before the function call.
To avoid manipulations with current locale at all, the problematic functions
were modified to use locale-independent functions.
2019-12-20 11:22:59 +01:00
SATO Kentaro
cbb0efaeeb
Fix #78402 : pcntl_signal() misleading error message
...
An error message can be misleading when a handler
passed to pcntl_signal() is not callable.
2019-12-20 11:02:20 +01:00
Dmitry Stogov
eb846939b1
Fixed bug #78999 (Cycle leak when using function result as temporary)
2019-12-19 23:11:08 +03:00
SATO Kentaro
3e35b08980
Fix #78983 : pdo_pgsql config.w32 cannot find libpq-fe.h
...
When configured with a path specified.
2019-12-19 13:20:43 +01:00
Nikita Popov
0f078f6e78
Add destructor annotations in ini parser
...
It would be better to switch this to use %union and %type annotations,
but not going to do that change for 7.3.
2019-12-19 10:43:05 +01:00
Remi Collet
bacfae8baf
fix release date
2019-12-18 14:17:31 +01:00
Remi Collet
22dec2b323
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
fix release date
2019-12-18 14:17:21 +01:00
Remi Collet
864f5ef12f
fix release date
2019-12-18 14:16:19 +01:00
Nikita Popov
897d99c7a4
Rethrow generator exception even without active stack frame
...
Finally blocks in generators may be invoked during shutdown, in
which case we don't have a stack frame. Similar to what
zend_call_function does, we still need to rethrow these exceptions,
otherwise they will be hidden (and leak).
2019-12-18 11:04:15 +01:00
Nikita Popov
189f625e2b
Fix freeing of dynamic call name
...
We need to free op2 if the call construction fails.
Also remove a redundant check for !call.
2019-12-18 10:11:09 +01:00
Christoph M. Becker
3d50131ef7
Update/fix NEWS [ci skip]
2019-12-17 10:04:42 +01:00
Christoph M. Becker
b94c28b0e6
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
[ci skip] Update NEWS
2019-12-17 10:01:50 +01:00
Stanislav Malyshev
0e413241ec
[ci skip] Update NEWS
2019-12-16 23:45:11 -08:00
Stanislav Malyshev
9705e631a4
[ci skip] Update NEWS
2019-12-16 23:41:04 -08:00
Stanislav Malyshev
a62154564d
Fix test
2019-12-16 10:32:49 -08:00
Stanislav Malyshev
5cb4686753
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test
Fix bug #78793
2019-12-16 10:04:03 -08:00
Stanislav Malyshev
6d5cddabaf
Fix test
2019-12-16 10:03:43 -08:00
Stanislav Malyshev
c14eb8de97
Fix bug #78793
2019-12-16 01:14:58 -08:00
Stanislav Malyshev
b74a300edf
Fix build - no model field anymore
2019-12-16 01:10:42 -08:00
Stanislav Malyshev
a65b8abf2c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #78910
Fix #78878 : Buffer underflow in bc_shift_addsub
Fix test
Fix #78862 : link() silently truncates after a null byte on Windows
Fix #78863 : DirectoryIterator class silently truncates after a null byte
2019-12-16 00:38:54 -08:00
Stanislav Malyshev
d348cfb96f
Fixed bug #78910
2019-12-16 00:10:39 -08:00
Christoph M. Becker
eb23c60087
Fix #78878 : Buffer underflow in bc_shift_addsub
...
We must not rely on `isdigit()` to detect digits, since we only support
decimal ASCII digits in the following processing.
2019-12-16 00:05:03 -08:00
Stanislav Malyshev
b771a18133
Fix test
2019-12-16 00:03:18 -08:00
Christoph M. Becker
0e6c0654ed
Fix #78862 : link() silently truncates after a null byte on Windows
...
Since link() is supposed to accepts paths (i.e. strings without NUL
bytes), we must not accept arbitrary strings.
2019-12-16 00:03:06 -08:00
Christoph M. Becker
a5a15965da
Fix #78863 : DirectoryIterator class silently truncates after a null byte
...
Since the constructor of DirectoryIterator and friends is supposed to
accepts paths (i.e. strings without NUL bytes), we must not accept
arbitrary strings.
2019-12-16 00:02:57 -08:00
Christoph M. Becker
518a160b65
Fix #78943 : mail() may release string with refcount==1 twice
...
Since we need `headers_lc` as well as `headers_trim` in the following,
we do not release the former even if they are the same string, to avoid
complicating the release logic even more.
A new test case is not necessary, since we already have
mail_basic_alt2-win32.phpt and others.
2019-12-15 13:13:30 -08:00
Nikita Popov
621598eaa8
Fixed bug #78921
...
By resetting fake_scope during autoloading. We already do the same
when executing destructors.
2019-12-13 16:37:20 +01:00
Nikita Popov
87691e74e5
Fix DCE with FE_FETCH
...
For now, don't treat FE_FETCH op2 as no-val use. See GH-4982.
2019-12-10 09:00:09 +01:00
Christoph M. Becker
17a9f1401a
Extend CURLFile to support streams
...
Due to former restrictions of the libcurl API, curl multipart/formdata
file uploads supported only proper files. However, as of curl 7.56.0
the new `curl_mime_*()` API is available (and already supported by
PHP[1]), which allows us to support arbitrary *seekable* streams, which
is generally desirable, and particularly resolves issues with the
transparent Unicode and long part support on Windows (see bug #77711 ).
Note that older curl versions are still supported, but CURLFile is
still restricted to proper files in this case.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=a83b68ba56714bfa06737a61af795460caa4a105 >
(cherry picked from commit c68dc6b5e3 )
2019-12-09 10:30:00 +01:00
Christoph M. Becker
e1202733a5
Use curl_mime_*() functions if available
...
As of curl 7.56.0, `curl_formadd()` is deprecated in favor of
`curl_mime_*()`, so we use the latter if available.
(cherry picked from commit a83b68ba56 )
2019-12-09 10:24:49 +01:00
willson-chen
b5d2cbe027
Fix #78923 : Artifacts when convoluting image with transparency
...
We have to properly initialize `pxl` before using it.
Fix ported from <https://github.com/libgd/libgd/pull/559 >.
2019-12-07 12:06:33 +01:00
Nikita Popov
249e49092d
Fix constant evaluation of && and ||
...
The "return" in the for loop should have been a break on the switch,
otherwise the result is just ignored... but because it prevents
evaluation of the other operand, it also violates the invariant that
everything has been constant evaluated, resulting in an assertion
failure.
The for loop isn't correct in any case though, because it's not legal
to determine the result based on just the second operand, as the
first one may have a side-effect that cannot be optimized away.
2019-12-06 11:07:57 +01:00
Nikita Popov
fac43d6515
Fix AST printing of nullable builtin types
...
Fixes oss-fuzz #19109 .
2019-12-04 11:20:52 +01:00
Tyson Andre
c8e9aa854c
Fix print_r return types in opcache
...
https://www.php.net/print_r
> When the return parameter is TRUE, this function will return a string.
> Otherwise, the return value is TRUE.
2019-12-04 07:16:32 +01:00
Christoph M. Becker
65bbc67063
Next is 7.3.14
2019-12-03 12:04:17 +01:00
Remi Collet
3444b90746
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
next is 7.2.27
2019-12-03 11:26:05 +01:00
Remi Collet
d2cfb63f02
next is 7.2.27
2019-12-03 11:25:37 +01:00
Christoph M. Becker
861fa60814
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78814 : strip_tags allows / in tag name => whitelist bypass
2019-12-02 11:38:45 +01:00
Christoph M. Becker
600f1f898f
Fix #78814 : strip_tags allows / in tag name => whitelist bypass
...
When normalizing tags to check whether they are contained in the set
of allowable tags, we must not strip slashes, unless they come
immediately after the opening `<`, or immediately before the closing
`>`.
2019-12-02 11:37:25 +01:00
Christoph M. Becker
bb735c9e9e
Fix #78296 : is_file fails to detect file
...
If we're constructing extended-length paths (i.e. paths prefixed with
`\\?\`), we have to replace all forward slashes with backward slashes,
because the former are not supported by Windows for extended-length
paths.
The more efficient and likely cleaner alternative solution would be to
cater to this in `php_win32_ioutil_normalize_path_w()` by always
replacing forward slashes, but that might break existing code. It
might be sensible to change that for `master`, though.
2019-12-02 11:29:10 +01:00
Christoph M. Becker
3d81c54879
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78833 : Integer overflow in pack causes out-of-bound access
2019-12-02 11:19:15 +01:00
Christoph M. Becker
db420cb6a1
Fix #78833 : Integer overflow in pack causes out-of-bound access
...
We check for potential signed integer overflow, and bail out
gracefully, in that case.
2019-12-02 11:18:19 +01:00
Christoph M. Becker
1979c5d16f
Upgrade to Oniguruma 6.9.4
...
Oniguruma 6.9.4 fixes several CVEs.
2019-11-30 14:00:41 +01:00
Christoph M. Becker
8c4b0ddde5
Add missing skip checks
2019-11-29 23:50:05 +01:00
Christoph M. Becker
ff2140c49d
Partially revert "Adapt test cases for Oniguruma 6.9.4"
...
This partially reverts commit c55d09c2f5 ,
because `MB_ONIGURUMA_VERSION` is only available as of PHP 7.4.0, so
that change made no sense for PHP-7.3; we keep it for PHP-7.4, though.
We also stick with the modification to bug78633.phpt.
2019-11-29 23:40:30 +01:00
Christoph M. Becker
c55d09c2f5
Adapt test cases for Oniguruma 6.9.4
...
Apparently, bug 78633 has now really been fixed; the former fix only
catered to the buffer overflow, but yielded a wrong result. Also,
the order of the named captures has been fixed.
2019-11-29 16:59:19 +01:00
Christoph M. Becker
fee38633d2
Fix #78840 : imploding $GLOBALS crashes
...
We add support for IS_INDIRECT zvals to implode().
2019-11-27 09:32:16 +01:00
Christoph M. Becker
23c65a8173
Fix #77638 : var_export'ing certain class instances segfaults
...
If objects return immutable property hash tables (typically,
`zend_empty_array`), we must not try to apply recursion protection on
those.
2019-11-25 15:54:11 +01:00
Dmitry Stogov
bb30fe9e2b
Fixed bug #78868 (Calling __autoload() with incorrect EG(fake_scope) value)
2019-11-25 14:05:43 +03:00
Christoph M. Becker
e1da72bdf1
Fix #78853 : preg_match() may return integer > 1
...
Commit 54ebebd[1] optimized the match loop, but for this case it has
been overlooked, that we must only loop if we're doing global matching.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=54ebebd686255c5f124af718c966edb392782d4a >
2019-11-22 19:26:26 +01:00
George Wang
e981f5af51
Merge branch 'PHP-7.2' into PHP-7.3
2019-11-21 17:58:16 -05:00
George Wang
c7141412ce
Added environment LSAPI_CLEAN_SHUTDOWN to control clean shutdown. Update SAPI version to LiteSpeed v7.6 .
2019-11-21 17:57:50 -05:00
Christoph M. Becker
b4f501d5a4
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78849 : GD build broken with -D SIGNED_COMPARE_SLOW
2019-11-21 10:01:05 +01:00
Christoph M. Becker
9b92c1d154
Fix #78849 : GD build broken with -D SIGNED_COMPARE_SLOW
...
Apparently, this has not been tested for a long time, and might be a
refactoring relict. Anyhow, we have to pass the context to
`GIFNextPixel` as well.
2019-11-21 09:59:26 +01:00
Christoph M. Becker
3b46fbfc36
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS
2019-11-18 12:47:53 +01:00
Christoph M. Becker
f6eac76b65
Update NEWS
2019-11-18 12:46:43 +01:00
Dmitry Stogov
e72e3370c6
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix $x = (bool)$x; for undefined with opcache
2019-11-18 11:26:30 +03:00
Tyson Andre
a2c41c0ea6
Fix $x = (bool)$x; for undefined with opcache
...
And `$x = !$x`
Noticed while working on GH-4912
The included test would not emit undefined variable errors in php 8.0
with opcache enabled. The command used:
```
php -d zend_extension=opcache.so --no-php-ini -d error_reporting=E_ALL \
-d opcache.file_cache= -d opcache.enable_cli=1 test.php
```
2019-11-18 11:24:03 +03:00
Christoph M. Becker
39d04f15f8
Fix ASLR related invalid opline handler issues
...
Opcache stores `opline->handler`s in shared memory. These pointers are
invalid, if the main PHP DLL is loaded at another base address due to
ASLR. We therefore store the address of `execute_ex` in the mmap base
file, and check on startup whether it matches its current address. If
not, we fall back on the file cache if enabled, and bail out otherwise.
This still does not address cases where the opline handler is located
inside of another DLL (e.g. for some profilers, debuggers), but there
seems to be no general solution for now.
(cherry picked from commit 8ba10b8fbc )
2019-11-15 09:46:58 +01:00
Dmitry Stogov
9083e178f6
Fixed wrong constant usage
2019-11-12 12:59:50 +03:00
Stanislav Malyshev
ea2a125789
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #78804 - Segmentation fault in Locale::filterMatches
2019-11-11 23:08:38 -08:00
Stanislav Malyshev
2c9926f156
Fix bug #78804 - Segmentation fault in Locale::filterMatches
2019-11-11 22:32:35 -08:00
Levi Morrison
4a55794b98
Wrap php_random.h in C++ portability macros
...
Also remove portability headers. This goes against the existing
conventions of these files.
2019-11-08 07:58:26 -07:00
Levi Morrison
b9dfa12853
Wrap hrtime in extern "c" {}
...
This allows it to be used by C++ extensions without them having to do their own forward declares.
Closes GH-4890.
2019-11-07 14:41:58 +01:00
Nikita Popov
6dcc0b859f
Fix php_pcre_mutex_free()
...
We should only set the mutex to NULL if we actually freed it.
Due to missing braces non-main threads may currently set it to
NULL first.
2019-11-07 14:31:19 +01:00
Nikita Popov
29f4939923
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Remove outdated comments in test
2019-11-07 14:06:33 +01:00
Nikita Popov
ee243bc471
Remove outdated comments in test
2019-11-07 14:06:23 +01:00
Nikita Popov
8d2a9d8859
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #78759
2019-11-07 11:16:24 +01:00
Nikita Popov
5fa6dcd972
Fixed bug #78759
...
Handle INDIRECT values in array.
2019-11-07 11:15:29 +01:00
Nikita Popov
6d4965febd
Fixed bug #78787
...
Not the first time inheritance of shadow properties causes an issue,
thankfully this whole concept is gone in PHP 7.4.
2019-11-06 12:52:34 +01:00
Christoph M. Becker
4c9ba3e042
7.3.13 is next
2019-11-05 18:20:56 +01:00
Sara Golemon
e85cae8ef4
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Bump for 7.2.26-dev
2019-11-05 10:58:35 -05:00
Sara Golemon
d317e16e89
Bump for 7.2.26-dev
2019-11-05 10:57:29 -05:00
Nikita Popov
747cb46244
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #78775
2019-11-05 12:15:44 +01:00
Nikita Popov
4f984a2fdb
Fixed bug #78775
...
Clear the OpenSSL error queue before performing SSL stream operations.
As we don't control all code that could possibly be using OpenSSL,
we can't rely on the error queue being empty.
2019-11-05 12:13:46 +01:00
Christoph M. Becker
85874af404
Remove obsolete oniguruma.patch
...
The proper `SIZEOF_SIZE_T` definitions are available as of Oniguruma
6.9.1; no more need to patch.
2019-11-05 10:16:22 +01:00
Christoph M. Becker
e175a0a1c8
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test cases for libxml2 2.9.10
2019-10-31 16:08:38 +01:00
Christoph M. Becker
e29922f054
Fix test cases for libxml2 2.9.10
...
Since the error reporting has been slightly changed, we have to adapt
the two affected test cases.
2019-10-31 16:07:34 +01:00
Nikita Popov
d3237b5504
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add missing refcount increment
2019-10-30 09:22:51 +01:00
Nikita Popov
5f6eaf355c
Add missing refcount increment
2019-10-30 09:22:20 +01:00
Nikita Popov
33dd25d21c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #78689
2019-10-29 15:06:52 +01:00
Nikita Popov
f9895b4bf5
Fixed bug #78689
2019-10-29 15:06:16 +01:00
Stanislav Malyshev
8c2b3b0568
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix libmagic buffer overflow issue (CVE-2019-18218)
bump version
set versions for release
2019-10-28 20:47:44 -07:00
Stanislav Malyshev
2bdb13a1f7
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix libmagic buffer overflow issue (CVE-2019-18218)
bump version
set versions for release
2019-10-28 20:47:30 -07:00
Christoph M. Becker
736cd93ef5
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78751 : Serialising DatePeriod converts DateTimeImmutable
2019-10-28 13:08:34 +01:00
Christoph M. Becker
89c327f884
Fix #78751 : Serialising DatePeriod converts DateTimeImmutable
...
When getting the properties of a DatePeriod instance we have to retain
the proper classes, and when restoring a DatePeriod instance we have to
cater to DateTimeImmutable instances as well.
2019-10-28 13:07:28 +01:00
Nikita Popov
b61b60d15b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #78752
2019-10-28 10:28:04 +01:00
Nikita Popov
16c4910876
Fix bug #78752
...
NULL out the execute_data before destroying it, otherwise GC may
trigger while the execute_data is partially destroyed, resulting
in double-frees.
The handling of call stack unfreezing is a bit awkward because it's
a ZEND_API function, so we can't change the signature.
2019-10-28 10:27:32 +01:00
Stanislav Malyshev
469820048d
Fix libmagic buffer overflow issue (CVE-2019-18218)
...
Ported from https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84
2019-10-27 16:30:38 -07:00
Nikita Popov
74699533e5
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #78747
2019-10-25 12:50:12 +02:00
Nikita Popov
5249993814
Fixed bug #78747
2019-10-25 12:47:18 +02:00
Nikita Popov
813305b67f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Use ICU's CXXFLAGS when using pkg-config
2019-10-23 11:17:46 +02:00
Ryan Schmidt
8daf96cef3
Use ICU's CXXFLAGS when using pkg-config
...
This mirrors how ICU's CXXFLAGS are already used when using icu-config.
2019-10-23 11:17:37 +02:00
Nikita Popov
832b5c7b9d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as well
2019-10-23 11:07:16 +02:00
Nikita Popov
fa89c41f37
Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as well
...
This is a backport of c518932c03
from the PHP 7.4 branch.
2019-10-23 11:06:51 +02:00
Joe Watkins
52f049879a
bump version
2019-10-22 18:58:39 +02:00
Joe Watkins
326cd05dae
set versions for release
2019-10-22 18:56:55 +02:00
Christoph M. Becker
36943dfff1
Update NEWS
2019-10-22 09:50:11 +02:00
Remi Collet
c00fd843d7
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
add NEWS entry
2019-10-22 09:37:51 +02:00
Remi Collet
2213bd36fd
add NEWS entry
2019-10-22 09:37:35 +02:00
Stanislav Malyshev
57b4dcbe77
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
bump versions after release
set versions for release
2019-10-21 13:17:19 -07:00
Stanislav Malyshev
4b5cdda0c7
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
bump versions after release
set versions for release
2019-10-21 13:17:09 -07:00
Joe Watkins
1c9b62fbd4
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #78697 : inaccurate error message
2019-10-21 09:23:26 +02:00
Fabien Villepinte
bea2ff88c9
Fix bug #78697 : inaccurate error message
2019-10-21 09:22:09 +02:00
Jakub Zelenka
ab061f95ca
Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
2019-10-20 22:50:04 -07:00
Christoph M. Becker
4f50d58cab
Fix #78633 : Heap buffer overflow (read) in mb_eregi
...
We backport kkos/oniguruma@15c4228aa2 .
2019-10-20 22:47:38 -07:00
Christoph M. Becker
ce035dc4a0
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78694 : Appending to a variant array causes segfault
2019-10-19 11:49:18 +02:00
Christoph M. Becker
45a7723267
Fix #78694 : Appending to a variant array causes segfault
...
`write_dimension` object handlers have to be able to handle `NULL`
`offset`s; for now we simply throw an exception instead of following
the `NULL` pointer.
2019-10-19 11:47:00 +02:00
Christoph M. Becker
c7c7ab53ac
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #70153 \DateInterval incorrectly unserialized
2019-10-18 15:32:08 +02:00
m.yakunin
d2cde0bfd3
Fix #70153 \DateInterval incorrectly unserialized
...
Added a separate macro for reading 'days' property, so that bool(false)
is correctly converted to the proper internal representation.
2019-10-18 15:31:14 +02:00
Derick Rethans
3725a446ba
Import timelib version 2018.03
2019-10-15 21:00:39 +01:00
Joe Watkins
22ac57b064
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix checksum calculation for opcache
2019-10-14 16:49:48 +02:00
Mitch Hagstrand
e2a6bf482f
Fix checksum calculation for opcache
2019-10-14 16:46:42 +02:00
Christoph M. Becker
7439d48bea
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78665 : Multicasting may leak memory
2019-10-12 14:44:55 +02:00
Christoph M. Becker
900bdcbd03
Fix #78665 : Multicasting may leak memory
2019-10-12 14:43:43 +02:00
Nikita Popov
74ac3dd6e2
Merge branch 'PHP-7.2' into PHP-7.3
2019-10-10 16:14:37 +02:00
Nikita Popov
46561dab6a
Fix leak in phar open
2019-10-10 16:14:21 +02:00
Nikita Popov
4ba8d78100
Merge branch 'PHP-7.2' into PHP-7.3
2019-10-10 11:41:29 +02:00
Nikita Popov
96c84b7bc1
Fix leak on static method call on non-existent class
2019-10-10 11:40:49 +02:00
Nikita Popov
a0163417ef
Merge branch 'PHP-7.2' into PHP-7.3
2019-10-09 17:33:44 +02:00
Nikita Popov
daf1fc6e31
Avoid float to int cast UB in exif
2019-10-09 17:33:29 +02:00
Christoph M. Becker
bbd481c11d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78656 : Parse errors classified as highest log-level
2019-10-09 17:28:50 +02:00
Erik Lundin
3164186d53
Fix #78656 : Parse errors classified as highest log-level
2019-10-09 17:27:32 +02:00
Nikita Popov
6fd6ad8f53
Fixed bug #78658
2019-10-09 17:00:27 +02:00
Nikita Popov
cbf589b17c
Merge branch 'PHP-7.2' into PHP-7.3
2019-10-09 14:58:01 +02:00
Nikita Popov
d6ca174d5b
Remove redundant components < 0 check
...
components is an unsigned number, it cannot be smaller than zero.
2019-10-09 14:57:24 +02:00
Nikita Popov
736af5f660
Merge branch 'PHP-7.2' into PHP-7.3
2019-10-08 16:13:17 +02:00
Sergei Turchanov
a8f60ac9dd
Add pcre_get_compiled_regex_cache_ex() with local_aware flag
...
A new function `pcre_get_compiled_regex_cache_ex()` is introduced,
which allows to compile regexp pattern using the "C" locale instead
of a current locale.
This will be needed to replace setlocale() usage in fileinfo,
which is not thread-safe.
2019-10-08 16:11:55 +02:00
Christoph M. Becker
9fd555f99e
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add missing SKIPIFs in exif tests
2019-10-08 14:12:12 +02:00
Fabien Villepinte
46894580b0
Add missing SKIPIFs in exif tests
2019-10-08 14:11:32 +02:00
Nikita Popov
2fdd142f99
Check for exception after applying stream filters
...
This makes the stream opening actually fail, and avoids assertion
failures when we tokenize with EG(exception) set.
Also avoid throwing an additional warning after an exception has
already been thrown.
2019-10-08 12:32:57 +02:00
Christoph M. Becker
d6fdc17f7f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78642 : Wrong libiconv version displayed
2019-10-08 12:10:06 +02:00
Christoph M. Becker
195c2008e8
Fix #78642 : Wrong libiconv version displayed
...
The high byte of `_libiconv_version` specifies the major version; the
low byte the minor version.
2019-10-08 12:09:11 +02:00
Christoph M. Becker
26f45cb4bb
7.3.12 is next
2019-10-08 12:04:25 +02:00
Remi Collet
4b15f7ca09
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
next is 7.2.25
2019-10-08 11:36:36 +02:00
Remi Collet
05d6878b3b
next is 7.2.25
2019-10-08 11:36:10 +02:00
Christoph M. Becker
11654fdfa6
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78641 : addGlob can modify given remove_path value
2019-10-08 09:48:59 +02:00
Christoph M. Becker
fd3118ffb0
Fix #78641 : addGlob can modify given remove_path value
...
`remove_path` points to the given string, so we must not modify it.
Instead we use a duplicate, if we need the modification.
We may want to switch to `zend_string`s in master.
2019-10-08 09:45:05 +02:00
Nikita Popov
8a03fd6a5e
Merge branch 'PHP-7.2' into PHP-7.3
2019-10-07 17:52:35 +02:00
Nikita Popov
19e6abebc7
Check for object_init_ex() failure in user filter factory
2019-10-07 17:52:29 +02:00
Nikita Popov
2624c9a505
Merge branch 'PHP-7.2' into PHP-7.3
2019-10-07 16:44:31 +02:00
Nikita Popov
7d19668f60
Set session.gc_probability=0 in bug78624.phpt
...
We only want to test manually triggered session GC.
Avoid spurious output due to automatic GC.
2019-10-07 16:43:19 +02:00
Nikita Popov
ab61d5caf9
Backport fix for uaf during pcre jit fallback
...
Backports parts of https://vcs.pcre.org/pcre2?view=revision&revision=1175
fixing https://bugs.exim.org/show_bug.cgi?id=2453 .
2019-10-07 13:23:56 +02:00
Christoph M. Becker
3322c78a88
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78623 : Regression caused by "SP call yields additional empty result set"
2019-10-07 09:17:29 +02:00
Christoph M. Becker
114c03b9a6
Fix #78623 : Regression caused by "SP call yields additional empty result set"
...
This reverts commit 41a4379cb4 .
2019-10-07 09:15:51 +02:00
Nikita Popov
239e2dda64
Make sure T_ERROR is returned for all lexer exceptions
...
This originally manifested as a leak in oss-fuzz #18000 . The following
is a reduced test case:
<?php
[
5 => 1,
"foo" > 1,
" " => "" == 0
];
<<<BAR
$x
BAR;
Because this particular error condition did not return T_ERROR,
EG(exception) was set while performing binary operation constant
evaluation, which checks exceptions for cast failures.
Instead of adding this indirect test case, I'm adding an assertion
that the lexer has to return T_ERROR if EG(exception) is set.
2019-10-04 22:42:14 +02:00
Nikita Popov
1d6e9da743
Improve diagnostic on PCRE JIT mmap failure
...
Print a more informative message that indicates that this is
likely a permission issue, and also indicate that pcre.jit=0
can be used to work around it.
Also automatically disable the JIT, so that this message is
only shown once.
See bug #78630 .
2019-10-04 16:03:38 +02:00
Christoph M. Becker
1ce8c805e2
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Split intl tests for ICU 65
2019-10-04 13:53:58 +02:00
Christoph M. Becker
545412a6cd
Split intl tests for ICU 65
2019-10-04 13:53:22 +02:00
Christoph M. Becker
cf183a5e2c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78620 : Out of memory error
2019-10-04 09:09:39 +02:00
Christoph M. Becker
abaf9a76dc
Fix #78620 : Out of memory error
...
The integer addition in `ZEND_MM_ALIGNED_SIZE_EX` can overflow, what we
have to catch early.
2019-10-04 09:08:01 +02:00
Joe Watkins
f45eb353d1
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
fix #78624 : session_gc return value for user defined session handlers
2019-10-04 06:12:29 +02:00
Brent Shaffer
a6d219630c
fix #78624 : session_gc return value for user defined session handlers
2019-10-04 06:12:02 +02:00
Joe Watkins
f4d078b1c7
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
2019-10-03 06:57:05 +02:00
Fábio Souto
9a2b42a5c1
Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
2019-10-03 06:56:21 +02:00
Joe Watkins
5b1bb23edf
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #76859 stream_get_line skips data if used with data-generating filter
2019-10-03 06:51:10 +02:00
Konstantin Kopachev
05560b67bc
Fix #76859 stream_get_line skips data if used with data-generating filter
...
stream_get-line repeatedly calls php_stream_fill_read_buffer until
enough data is accumulated in buffer. However, when stream contains
filters attached to it, then each call to fill buffer essentially
resets buffer read/write pointers and new data is written over old.
This causes stream_get_line to skip parts of data from stream
This patch fixes such behavior, so fill buffer call will append.
2019-10-03 06:50:43 +02:00
Derick Rethans
0505fbf2e5
Updated to version 2019.3 (2019c)
2019-10-02 23:39:09 +01:00
Christoph M. Becker
d295e1dce2
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Revert "Fix #78620 : Out of memory error"
2019-10-02 19:02:28 +02:00
Christoph M. Becker
f2fb37a772
Revert "Fix #78620 : Out of memory error"
...
This reverts commit 8ce04df7e0 .
Cf. <https://github.com/php/php-src/pull/4766#discussion_r330658679 >.
2019-10-02 19:01:35 +02:00
Christoph M. Becker
752a34fb2c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78620 : Out of memory error
2019-10-02 18:20:09 +02:00
Christoph M. Becker
8ce04df7e0
Fix #78620 : Out of memory error
...
If the integer addition in `ZEND_MM_ALIGNED_SIZE_EX` overflows, the
macro evaluates to `0`, what we should catch early.
2019-10-02 18:18:52 +02:00
Nikita Popov
3c42471ef8
Merge branch 'PHP-7.2' into PHP-7.3
2019-10-02 12:07:19 +02:00
Nikita Popov
a5d3620d93
Fix segfault with __COMPILER_HALT_OFFSET__ and trailing {}
...
Fixes OSS-Fuzz #17895 .
2019-10-02 12:07:15 +02:00
Dmitry Stogov
f7596d1b5b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed test that "fails" from time to time
2019-10-02 00:57:16 +03:00
Dmitry Stogov
3124129ca8
Fixed test that "fails" from time to time
2019-10-02 00:54:59 +03:00
Dmitry Stogov
848bc776ea
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed test that "fails" from time to time
2019-10-02 00:49:27 +03:00
Dmitry Stogov
2fcb5eadbb
Fixed test that "fails" from time to time
2019-10-02 00:48:42 +03:00
Christoph M. Becker
2fc5d00afa
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add missing skip keyword in tests
2019-10-01 11:15:12 +02:00
Fabien Villepinte
209e37db7d
Add missing skip keyword in tests
2019-10-01 11:13:36 +02:00
Nikita Popov
0805e132b0
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-30 15:06:32 +02:00
Nikita Popov
6fcde56b03
Fixed bug #78612
2019-09-30 15:06:07 +02:00
Christoph M. Becker
2046b3ce4f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78609 : mb_check_encoding() no longer supports stringable objects
2019-09-30 13:04:54 +02:00
Sergei Turchanov
e546d721e8
Fix #78413 : php-fpm request_terminate_timeout does not take effect after fastcgi_finish_request
...
To retain legacy behavior I decided to add an option to control request
termination logic. If request_terminate_timeout_track_finished is set,
then request will be tracked for time limits even after
fastcgi_finish_request was called.
This patch depends on the fix provided in BUG 78469 (otherwise php-fpm
workers listening on named pipes on Windows will be erroneously terminated)
(PR #4636 )
2019-09-30 12:54:09 +02:00
Christoph M. Becker
45db6fa567
Fix #78609 : mb_check_encoding() no longer supports stringable objects
...
We apply type juggling for other types than array.
2019-09-30 12:42:04 +02:00
Christoph M. Becker
466f91bb3b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix build for libzip < 0.11.2
2019-09-29 13:34:16 +02:00
Christoph M. Becker
f6bfbe9553
Fix build for libzip < 0.11.2
...
We must not define method entries, if the actual method definitions or
the arginfo structures are not defined.
2019-09-29 13:33:18 +02:00
Nikita Popov
7df50ef147
Don't throw warnings during heredoc scan-ahead
...
Otherwise these warnings will turn up twice (or more...)
2019-09-28 17:15:36 +02:00
Christoph M. Becker
66c48e8694
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix SKIPIF in ext/mysqli
2019-09-27 16:04:00 +02:00
Fabien Villepinte
37d27e666a
Fix SKIPIF in ext/mysqli
2019-09-27 16:03:20 +02:00
Christoph M. Becker
878704ff6f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix skipif.inc
2019-09-27 12:51:21 +02:00
Christoph M. Becker
115f6effec
Fix skipif.inc
2019-09-27 12:50:04 +02:00
Nikita Popov
91c4abcfcc
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-26 13:47:19 +02:00
Nikita Popov
ab938d7bbc
Fix memory leak with ** on array operands
2019-09-26 13:45:45 +02:00
Nikita Popov
99c67804d5
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-26 10:25:40 +02:00
Nikita Popov
8a9df88597
Fix null-pointer deref in if stmt printing
...
Fixes OSS-Fuzz #17721 .
2019-09-26 10:24:49 +02:00
Nikita Popov
915fe2fdc6
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-25 10:34:25 +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
Christoph M. Becker
7530938670
Update NEWS
2019-09-24 11:13:55 +02: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
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
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
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
087051c9a5
Skip test on 32-bit
2019-09-23 14:52:32 +02:00
Nikita Popov
1a184f030a
Commit regenerated var_unserializer.c
2019-09-23 13:47:05 +02:00
Nikita Popov
f53af9ac23
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-23 13:18:39 +02:00
Nikita Popov
8509970e6a
Fix signed integer overflow in SplObjectStorage unserialization
...
If count is ZEND_LONG_MIN the count-- loop underflows. This is
ultimately harmless, but results in a ubsan warning.
Fix this by adding a sanity check that the count isn't negative,
because that doesn't make sense...
2019-09-23 13:18:27 +02:00
Nikita Popov
e65adc9c19
Fix ubsan violation in parse_iv2
...
This fixes two issues:
* Negative the value in an unsigned type to avoid signed overflow.
* Treat -0 as 0 rather than an invalid number that gets converted
to ZEND_LONG_MIN.
2019-09-23 13:08:44 +02:00
Christoph M. Becker
9c89f43d55
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test to be skipped if dom is not available
2019-09-22 18:42:40 +02:00
Christoph M. Becker
697945aa89
Fix test to be skipped if dom is not available
2019-09-22 18:42:02 +02:00
Nikita Popov
9cd365e571
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-22 12:10:42 +02:00
Nikita Popov
f989a4cd44
Fix leak of temporary buffer during exif tag reading
2019-09-22 12:10:17 +02:00
Nikita Popov
623d897998
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-22 10:26:57 +02:00
Nikita Popov
0701835c01
Fix multiple leaks in exif_read_data()
...
This fixes two leaks related to duplicate tags, as well as a leak
of zero-length FMT_(S)BYTE with non-null value. This can show up
for MAKERNOTE values where the original length is non-zero, but
the first character is a null byte.
2019-09-21 20:40:03 +02:00
Christoph M. Becker
33e556fab4
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix length of key passed to zend_hash_str_find_ptr
2019-09-21 18:12:27 +02:00
Jinesh Patel
0d6c2448a7
Fix length of key passed to zend_hash_str_find_ptr
2019-09-21 18:11:21 +02:00
Christoph M. Becker
698088ca7c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78579 : mb_decode_numericentity: args number inconsistency
2019-09-21 16:16:52 +02:00
Christoph M. Becker
398b308316
Fix #78579 : mb_decode_numericentity: args number inconsistency
...
mb_decode_numericentity() accepts a fourth optional parameter, which is
unused, however. Since this parameter doesn't do any harm, and to avoid
the small BC break, we're keeping this parameter for PHP 7, but adjust
the arginfo.
For PHP 8, we will remove this parameter.
2019-09-21 16:15:23 +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
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
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
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
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
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
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
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
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
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
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
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
Nikita Popov
74876f09c4
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-16 13:02:56 +02:00
Nikita Popov
8873df8e86
Fix leak in SplObjectStorage unserialization
...
The result of php_var_unserialize always needs to be destroyed,
even if the call failed.
2019-09-16 13:02:32 +02:00
Christoph M. Becker
da8aa4a798
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Stick with zend_long for ABI compatibility
2019-09-15 15:13:13 +02:00
Christoph M. Becker
81cefab7b0
Stick with zend_long for ABI compatibility
...
Cf. <https://github.com/php/php-src/pull/4700#issuecomment-531515689 >.
2019-09-15 15:11:25 +02:00
Christoph M. Becker
00ad365125
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78535 : auto_detect_line_endings value not parsed as bool
2019-09-14 18:47:12 +02:00
bugreportuser
fdcca93056
Fix #78535 : auto_detect_line_endings value not parsed as bool
2019-09-14 18:46:09 +02:00
Nikita Popov
df982da587
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.
2019-09-13 14:37:03 +02:00
Christoph M. Becker
31f617d9bc
Fix exif build
...
As of PHP 7.3.0 the `model` field is removed.
2019-09-12 09:13:27 +02:00
Kalle Sommer Nielsen
f6f981c13c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
NEWS
2019-09-12 06:52:24 +03:00
Kalle Sommer Nielsen
716518373f
NEWS
2019-09-12 06:50:53 +03:00
Kalle Sommer Nielsen
6f0e5a45ff
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
2019-09-12 06:31:52 +03:00
Kalle Sommer Nielsen
2823e938d4
Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
2019-09-12 06:21:39 +03:00
Sara Golemon
e2bdd7b4ab
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Bump for 7.2.24
2019-09-10 13:05:17 -04:00
Sara Golemon
a270eb1911
Bump for 7.2.24
2019-09-10 13:04:01 -04:00
Remi Collet
664b1a3f57
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
2019-09-10 16:29:30 +02:00
Remi Collet
c43fc204b1
Raise minimal GCC version,
...
Test with 4.8 is OK
With 4.4: error: #pragma GCC diagnostic not allowed inside functions
2019-09-10 16:28:35 +02:00
Christoph M. Becker
cf31210f29
PHP 7.3.10RC1 has been tagged
2019-09-10 15:11:54 +02:00
Christoph M. Becker
318b92dc12
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Drop regression test
2019-09-10 10:08:07 +02:00
Christoph M. Becker
bca66002f1
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.
2019-09-10 10:07:39 +02:00
Nikita Popov
3f2d5c612e
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-09 17:29:39 +02:00
CHU Zhaowei
1ac6b0251b
Fix bug #72884 isCloneable() on SplFileObject should return false
2019-09-09 17:27:17 +02:00
Christoph M. Becker
73ede6911d
Fix version
...
7.3.10 is next, not 7.3.11.
2019-09-09 15:44:06 +02:00
Christoph M. Becker
af2033b1cd
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78510 : Partially uninitialized buffer returned by sodium_crypto_generichash_init()
2019-09-09 15:31:15 +02:00
Christoph M. Becker
8ead77936e
Fix #78510 : Partially uninitialized buffer returned by sodium_crypto_generichash_init()
...
Backport jedisct1/libsodium.php@28d13bf437 .
2019-09-09 15:30:28 +02:00
Stanislav Malyshev
60cfa5781a
fix version
2019-09-05 09:54:43 -07:00
Christoph M. Becker
b90cd91eba
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #41997 : SP call yields additional empty result set
2019-09-03 13:31:24 +02:00
Christoph M. Becker
41a4379cb4
Fix #41997 : SP call yields additional empty result set
...
When stored procedures are called, the "final result set is a status
result that includes no result set". Calling `::nextRowset()` on the
actual last result set should return FALSE, since there is actually no
further result set to be processed.
2019-09-03 13:29:30 +02:00
Nikita Popov
d66e0f165d
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-03 09:23:55 +02:00
Tyson Andre
9c3b7ccda5
Fix opcache return type for hash_update_stream
...
It can return false if the resource type is wrong.
```
php > var_export(hash_update_stream(hash_init('md5'),
imagecreate(1,1)));
Warning: hash_update_stream(): supplied resource is not a valid stream
resource in php shell code on line 1
false
```
The return types were initially added in
c88ffa9a56
2019-09-03 09:23:39 +02:00
Christoph M. Becker
f712925500
Update NEWS
2019-09-02 15:21:20 +02:00
Christoph M. Becker
86ddc469f9
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #76577 : outdated documentation concerning track_errors
2019-09-02 15:05:57 +02:00
Christoph M. Becker
cd63908ab8
Fix #76577 : outdated documentation concerning track_errors
2019-09-02 15:05:01 +02:00
Nikita Popov
7659182632
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-02 09:36:58 +02:00
Nikita Popov
5a0980f1d9
Fix pkg-config version constraint for ICU
...
On PHP 7.2 our minimum ICU version is 4.0, not 40.
2019-09-02 09:36:20 +02:00
Nikita Popov
e9cfd94b8e
Merge branch 'PHP-7.2' into PHP-7.3
2019-08-30 16:07:43 +02:00
Sergei Turchanov
8f564e5308
Fixed bug #78469
...
fcgi_accept_request function is supposed to call a FastCGI implementation's
on_accept hook when entering an "accepting" stage (that is right before
calling "accept"). This hook implementation (fpm_request_accepting) updates
a worker state to an "accepting" state which is effectively an "Idle" state,
and updates counters on the scoreboard of the corresponding pool (idle++,
active--).
But this is not done when listening for client connections on a named pipe on
Windows platform. In that case a combination of
ConnectNamedPipe/WaitForSingleObject is used (to be able to catch in_shutdown
as far as I understand), but it is nonetheless functionally equivalent to
"accept" call. Also by not calling on_hook neither a worker's state is updated
to "accepting" state nor scoreboard counters are updated.
2019-08-30 16:06:50 +02:00
Nikita Popov
34edd4aa2a
Merge branch 'PHP-7.2' into PHP-7.3
2019-08-29 12:33:04 +02:00
Nikita Popov
ed749edd47
Fix use-after-free of immediately invoked closure with extra args
2019-08-29 12:32:03 +02:00
Christoph M. Becker
195b8ae779
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78473 : odbc_close() closes arbitrary resources
2019-08-28 17:57:10 +02:00
Christoph M. Becker
b557265816
Fix #78473 : odbc_close() closes arbitrary resources
...
We have to bail out, if an invalid resource is given. For consistency
with the other `zend_fetch_resource(2)` calls, we return `FALSE`.
2019-08-28 17:55:15 +02:00
Joe Watkins
fadd7f0f1e
bump versions after release
2019-08-28 09:08:23 +02:00
Joe Watkins
481520d381
set versions for release
2019-08-28 09:06:38 +02:00
Stanislav Malyshev
5748cec3ee
Upgrade oniguruma lib to 6.9.3
2019-08-27 23:40:46 -07:00
Christoph M. Becker
e2b60796f0
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update SDK version for AppVeyor
2019-08-27 13:35:05 +02:00
Christoph M. Becker
88ab374627
Update SDK version for AppVeyor
2019-08-27 13:34:35 +02:00
Tsuyoshi Sadakata
ffcf57fa18
Fix bug #78334 (fpm log prefix message includes wrong stdout/stderr notation)
2019-08-26 18:05:11 +01:00
Nikita Popov
461db52400
Merge branch 'PHP-7.2' into PHP-7.3
2019-08-26 17:52:37 +02:00
Nikita Popov
589542f50c
Remove properties HT from nested GC data
...
The properties HT may be a GC root itself, so we need to remove it.
I'm not sure this issue actually applies to PHP 7.2, but committing
it there to be safe. As seen from the test case, the handling here
is rather buggy on 7.2.
2019-08-26 17:49:37 +02:00
Nikita Popov
e4ecadcb62
Merge branch 'PHP-7.2' into PHP-7.3
2019-08-26 11:13:49 +02:00
Tyson Andre
1e82a2d659
Also fix signature for passthru
...
Backported from a1a8d14485
https://www.php.net/manual/en/function.passthru.php#refsect1-function.passthru-returnvalues
`passthru()` is false with invalid args
`passthru('command')` is null.
2019-08-26 11:13:26 +02:00
Tyson Andre
f5bccc0eb5
Fix opcache optimizer info for time_nanosleep
...
This can also return an array. See
https://www.php.net/manual/en/function.time-nanosleep.php#refsect1-function.time-nanosleep-returnvalues
> If the delay was interrupted by a signal, an associative array will be
returned with the components:
>
> - seconds - number of seconds remaining in the delay
> - nanoseconds - number of nanoseconds remaining in the delay
Sending a SIGUSR1 to the below program would trigger this behavior.
```
pcntl_signal(\SIGUSR1, function ($signo, $signinfo) {
echo "Handling a signal $signo\n";
});
echo "Sleeping for 100 seconds\n";
var_export(time_nanosleep(100, 0));
```
The incomplete signature existed since c88ffa9a5 .
No phpt tests existed for time_nanosleep returning an array
2019-08-26 11:13:26 +02:00
Nikita Popov
a26f63213d
Merge branch 'PHP-7.2' into PHP-7.3
2019-08-26 10:26:49 +02:00
Nikita Popov
16d35eb643
Fix overflow in memory limit checks
...
Due to overflows in the memory limit checks, we were missing cases
where the allocation size was close to the address space size, and
caused an OOM condition rather than a memory limit error.
2019-08-26 10:25:30 +02:00
Stanislav Malyshev
d1646e328a
Fix test
...
Not sure why offset changed... probably different PCRE version calculates
them in different way.
2019-08-25 20:06:02 -07:00
Stanislav Malyshev
5d25ebb0dd
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #75457 : heap-use-after-free in php7.0.25
2019-08-25 19:21:04 -07:00
Stanislav Malyshev
4b4a656d9e
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #75457 : heap-use-after-free in php7.0.25
2019-08-25 19:20:59 -07:00
Christoph M. Becker
7bf1f9d561
Fix #75457 : heap-use-after-free in php7.0.25
...
Backport <https://vcs.pcre.org/pcre?view=revision&revision=1638 >.
2019-08-25 19:19:50 -07:00
Stanislav Malyshev
d3f2cfe20a
Update Oniguruma to 6.9.1
2019-08-25 00:02:32 -07:00
Stanislav Malyshev
5704eca6f7
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
set version for release
2019-08-24 23:16:09 -07:00
Stanislav Malyshev
087cb7bab2
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
set version for release
2019-08-24 23:15:36 -07:00
Stanislav Malyshev
1258303e66
Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
...
Backport from https://github.com/kkos/oniguruma/commit/0f7f61ed1b7b697e283e37bd2d731d0bd57adb55
2019-08-24 23:11:45 -07:00
Christoph M. Becker
03c7749dc8
Fix #77812 : Interactive mode does not support PHP 7.3-style heredoc
...
As of PHP 7.3.0, the rules regarding the heredoc and nowdoc closing
identifier have been relaxed. While formerly, the closing identifier
was required to be placed at the beginning of a line and to be
immediately followed by (a semicolon and) a line break, it may now be
preceeded by whitespace, and may be followed by any non-word character.
We adjust the recognition logic respectively.
2019-08-23 13:59:10 +02:00
Christoph M. Becker
c9d31941e4
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Suppress deprecation warning on IDNA2003 ICU methods for clang
2019-08-23 12:21:57 +02:00
Christoph M. Becker
ff7029b65b
Suppress deprecation warning on IDNA2003 ICU methods for clang
2019-08-23 12:18:58 +02:00
Christoph M. Becker
310708845f
Fix #78441 : Parse error due to heredoc identifier followed by digit
...
Since digits are allowed for identifiers, we have to cater to them as
well.
2019-08-21 22:51:51 +02:00
Remi Collet
08aafbe93e
ensure proper settings for test
2019-08-20 16:30:52 +02:00
Christoph M. Becker
963b40c9a8
Don't use C++ style comments
...
Cf. <https://github.com/php/php-src/blob/f45b61b8988b5b2d80dd4a1df7edd04282cf319a/CODING_STANDARDS.md#syntax-and-indentation >
cc @mcmic
2019-08-20 13:58:22 +02:00
Christoph M. Becker
3771d66142
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
fix the problem for connect_attr, set db condition, and add a new attribute _server_host
2019-08-20 13:33:45 +02:00
Qianqian Bu
cdf16c010a
fix the problem for connect_attr, set db condition, and add a new attribute _server_host
2019-08-20 13:31:58 +02:00
Christoph M. Becker
5e19f1d458
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78220 : Can't access OneDrive folder
2019-08-19 19:57:22 +02:00
Christoph M. Becker
81f52158b4
Fix #78220 : Can't access OneDrive folder
...
As of Windows 1903, when the OneDrive on-demand feature is enabled, the
OneDrive folder is reported as reparse point by `FindFirstFile()`, but
trying to get information about the reparse point using
`DeviceIoControl()` fails with `ERROR_NOT_A_REPARSE_POINT`. We work
around this problem by falling back to `GetFileInformationByHandle()`
if that happens, but only if the reparse point is reported as cloud
reparse point, and only if PHP is running on Windows 1903 or later.
The patch has been developed in collaboration with ab@php.net .
We should keep an eye on the somewhat quirky OneDrive behavior, since
it might change again in a future Windows release.
2019-08-19 19:55:35 +02:00
Nikita Popov
be7e819068
Fixed bug #77922
...
In PHP 7.3 shadow properties are no longer duplicated. Make sure we
only release them if the property was defined on the parent class,
which means that it changed from private->shadow, which is where
duplication does happen.
2019-08-17 10:58:54 +02:00
Sara Golemon
a192499d2a
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Suppress deprecation warning on IDNA2003 ICU methods
2019-08-16 12:41:02 -04:00
Sara Golemon
725f439778
Suppress deprecation warning on IDNA2003 ICU methods
2019-08-16 12:40:20 -04:00
Sara Golemon
9b9814fa77
Revert "Move to non deprecated API on suitable ICU versions"
...
This reverts commit 13a2f2d041 .
The APIs used by this commit aren't entirely equivalent to the original ones.
2019-08-16 11:39:05 -04:00
Christoph M. Becker
4966647443
Update NEWS
...
This fix has been cherry-picked into PHP-7.3.9.
2019-08-15 15:28:52 +02:00
Christoph M. Becker
8fb297cd82
Update credits_ext.h
2019-08-14 19:24:16 +02:00
Nikita Popov
1166359acb
Merge branch 'PHP-7.2' into PHP-7.3
2019-08-14 17:51:35 +02:00
Nikita Popov
fcabe7e5e4
Fixed bug #78412
...
$this should only be included in the generator GC buffer, if it
will be released on destruction.
2019-08-14 17:50:58 +02:00
Sara Golemon
e5da73d1f2
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Bump for 7.2.23
2019-08-13 19:34:12 -04:00
Sara Golemon
4b64d47c99
Bump for 7.2.23
2019-08-13 19:32:12 -04:00
Christoph M. Becker
5536105b67
Next will be 7.3.10
2019-08-13 23:57:48 +02:00
Christoph M. Becker
fe7997912d
Bump version numbers
...
This should have been done four weeks ago already.
2019-08-13 23:23:43 +02:00
Nikita Popov
a33361a37c
Merge branch 'PHP-7.2' into PHP-7.3
2019-08-13 11:22:41 +02:00
Nikita Popov
4eeb41d1ea
Fixed bug #77191
2019-08-13 11:19:58 +02:00
Nikita Popov
7ba54b9822
Merge branch 'PHP-7.2' into PHP-7.3
2019-08-13 09:54:26 +02:00
Nikita Popov
18f2918a0f
Don't destroy properties array with unset GC type
...
As the properties array can also be a GC root, it might have
already been destroyed.
2019-08-13 09:53:25 +02:00
Nikita Popov
4cd563d07e
Merge branch 'PHP-7.2' into PHP-7.3
2019-08-12 17:17:30 +02:00
Nikita Popov
f3fdf570b3
Intern alias old_name early
...
This is likely going to end up interned lateron at some point
when the new_name is referenced somewhere. However, it may be
that there are some uses that do not get interned before that.
In this case we will intern a string that already have zval
users, without updating the refcounted flag on those zvals.
In particular this can happen with something like [Foo::class],
where Foo is an imported symbol. The string it resolves to won't
get interned right away, but may be interned later.
use Foo as Bar;
$x = [Bar::class];
var_dump(Bar::X);
debug_zval_dump($x); // Will show negative refcount
class Foo {
const X = 1;
}
However, this doesn't really fix the root cause, there are probably
other situations where something similar can occur.
2019-08-12 17:12:28 +02:00
Derick Rethans
7aa1dd3ba1
Updated to version 2019.2 (2019b)
2019-08-11 16:05:58 +01:00
Dmitry Stogov
722a44d515
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed handling of references in nested data of objects with destructor
2019-08-09 17:47:06 +03:00
Dmitry Stogov
9b43e29d9b
Fixed handling of references in nested data of objects with destructor
2019-08-09 17:43:50 +03:00
Dmitry Stogov
22d23e08c9
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash)
2019-08-09 15:58:16 +03:00
Dmitry Stogov
6b1cc1252e
Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash)
2019-08-09 15:42:39 +03:00
Dmitry Stogov
21a0a28fd0
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Added asserts to catch GC errors when refcount goes below zero.
2019-08-09 13:39:59 +03:00
Dmitry Stogov
2e2cd65d73
Added asserts to catch GC errors when refcount goes below zero.
2019-08-09 13:37:23 +03:00
Matteo Beccati
5ef1a30aaf
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Skip test when SIGKILL is not defined
2019-08-09 10:32:56 +02:00
Matteo Beccati
796efd849e
Skip test when SIGKILL is not defined
2019-08-09 10:32:15 +02:00
Nikita Popov
38f10ff5cf
Fix GC tracing
...
Due to the GC changes in 7.3 we stopped tracing most of the
interesting coloring changes...
2019-08-08 10:54:18 +02:00
Dmitry Stogov
bff2743caf
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #78379 (Cast to object confuses GC, causes crash)
2019-08-08 10:05:59 +03:00
Dmitry Stogov
358379be22
Fixed bug #78379 (Cast to object confuses GC, causes crash)
2019-08-08 10:00:39 +03:00
Christoph M. Becker
9ea39d15ab
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78282 : atime and mtime mismatch
2019-08-06 17:28:11 +02:00
Christoph M. Becker
954543cec6
Fix #78282 : atime and mtime mismatch
...
The fix for bug #78241 assumed that `time_t` would always be 64bit, but
actually is 32bit for x86. We therefore enforce 64bit arithmetic to
avoid wrapping.
(cherry picked from commit bf242d58e7 )
2019-08-06 17:25:54 +02:00
Christoph M. Becker
a87ef5e3dd
Fix #78346 : strip_tags no longer handling nested php tags
...
When the strip tags state machine has been flattened, an if statement
has mistakenly been treated as else if. We fix this, and also simplify
a bit right away.
2019-08-02 17:03:20 +02:00
Christoph M. Becker
81efd489db
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78179 : MariaDB server version incorrectly detected
2019-08-02 16:44:15 +02:00
Christoph M. Becker
f9f4a68368
Fix #78179 : MariaDB server version incorrectly detected
...
As of MariaDB 10.0.2, the server reports a fake version number as work-
around for replication issues[1]. We apply the same "fix" as in the
MariaDB client to cater to this.
[1] <https://github.com/MariaDB/server/commit/c50ee6c23dbeb090963580754bec2f0a96ac0557#diff-5b45fa673c88c06a9651c7906364f592 >
2019-08-02 16:42:49 +02:00
Nikita Popov
d89157cd67
Add test for bug #78363
2019-08-02 10:37:44 +02:00
Nikita Popov
e1934f8515
Merge branch 'PHP-7.2' into PHP-7.3
2019-08-02 10:35:48 +02:00
Nikita Popov
85e8ccd55e
Fixed bug #78363
2019-08-02 10:35:24 +02:00
Christoph M. Becker
b419b24ead
Remove upgrade-pcre.php script
...
This script has not been updated for PCRE2, and it's mostly useless
anyway. Therefore we remove it altogether.
2019-08-01 10:49:05 +02:00
Christoph M. Becker
8af14024c2
Fix 78213: Empty row pocket
...
We have to ensure that we don't create an arena which is smaller than
its header, regardless of the configured alignment.
2019-07-31 18:05:40 +02:00
Joe Watkins
1c01a1579e
set version for release
2019-07-31 08:21:39 +02:00
Christoph M. Becker
ef439abd46
Add security related NEWS entries [ci skip]
2019-07-30 09:49:39 +02:00
Remi Collet
6ea13baaf1
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
add security NEW entries + reorder [ci skip]
2019-07-30 09:27:06 +02:00
Remi Collet
b29ecec4ef
add security NEW entries + reorder [ci skip]
2019-07-30 09:26:50 +02:00
Christoph M. Becker
8947fd9e9f
Fix #78338 : Array cross-border reading in PCRE
...
We backport r1092 from pcre2.
2019-07-29 14:49:33 -07:00
Stanislav Malyshev
d69894734d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77919 : Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
2019-07-29 13:20:44 -07:00
Stanislav Malyshev
284fb08fdc
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #77919 : Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
2019-07-29 13:19:16 -07:00
Christoph M. Becker
cd1101e8c8
Fix #77919 : Potential UAF in Phar RSHUTDOWN
...
We have to properly clean up in case phar_flush() is failing.
We also make the expectation of the respective test case less liberal
to avoid missing such bugs in the future.
2019-07-29 13:18:27 -07:00
Stanislav Malyshev
42e8b85d94
Update NEWS
2019-07-29 13:16:53 -07:00
Nikita Popov
44fe025c28
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-29 17:34:16 +02:00
Albert Casademont
dc7aa22b18
Fix bug #78326
...
Similar to what fread() does, truncate the stream_get_contents()
result if the original buffer was way too large.
2019-07-29 17:33:57 +02:00
Nikita Popov
bbed5564eb
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-29 16:57:57 +02:00
Nikita Popov
38f1288b64
Fix Zend signals unblocking
...
There are a few parts here:
* opcache should not be blocking signals while invoking compile_file,
otherwise signals may remain blocked on a compile error. While at
it, also protect SHM memory during compile_file.
* We should deactivate Zend signals at the end of the request, to make
sure that we gracefully recover from a missing unblock and signals
don't remain blocked forever.
* We don't use a critical section in deactivation, because it should
not be necessary. Additionally we want to clean up the signal queue,
if it is non-empty.
* Enable SIGG(check) in debug builds so we notice issues in the future.
2019-07-29 15:17:32 +02:00
Christoph M. Becker
76683ea999
Update NEWS [ci skip]
...
The fix has been cherry-picked into PHP-7.3.8, so the bug will be fixed
already there.
2019-07-29 14:48:23 +02:00
Nikita Popov
8e63bb5e46
Fixed bug #78341
...
The smart branch logic assumed b->start refers to the old offsets,
while b->start was already adjusted to the new offsets at this
point. Delay the change until later.
2019-07-29 13:02:01 +02:00
Nikita Popov
552ce9c763
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-29 11:27:34 +02:00
Nikita Popov
68fd435ba8
Fixed bug #78333
...
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
2019-07-29 11:27:21 +02:00
Nikita Popov
727929765b
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-29 11:26:09 +02:00
Nikita Popov
d142dfc93d
Fixed bug #78333
...
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
2019-07-29 11:25:27 +02:00
Stanislav Malyshev
aeb6d13185
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
2019-07-29 00:53:37 -07:00
Stanislav Malyshev
dea2989ab8
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
2019-07-29 00:53:28 -07:00
Christoph M. Becker
585131f901
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78342 : Bus error in configure test for iconv //IGNORE
2019-07-29 08:50:39 +02:00
Christoph M. Becker
30eb4b3563
Fix #78342 : Bus error in configure test for iconv //IGNORE
...
We have to check the return value of iconv_open() for error, to avoid
that and potentially other undesired behavior of iconv().
2019-07-29 08:48:13 +02:00
Levi Morrison
c624a7fe43
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Remove .post files only for passing tests
2019-07-25 09:49:18 -06:00
Levi Morrison
5649267b25
Remove .post files only for passing tests
...
This allows the sh script for failing tests with --POST-- to work
2019-07-25 09:48:39 -06:00
Peter Kokot
b42a13b08a
Update NEWS
2019-07-23 02:13:36 +02:00
Peter Kokot
9e2ac14702
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS
2019-07-23 02:13:12 +02:00
Peter Kokot
8f384bea93
Update NEWS
2019-07-23 02:13:00 +02:00
Nikita Popov
b59a9381b9
Remove test for bug #77185
...
Seems to be very unreliable in CI.
2019-07-22 12:40:26 +02:00
Nikita Popov
5e4dbce586
Reduce number of workers in test
...
4 seems to be enough to reliably reproduce the issue. Let's see
if this works better in CI.
2019-07-22 11:18:38 +02:00
Maksim Nikulin
bdf24f8d6d
Prevent use after free in fpm_event_epoll_wait
...
epoll event backend does not guarantee that child input/output events
are reported before SIGCHILD due to finished worker. While a bunch of
events received by epoll is being processed, child-related structures
may be removed before dispatching of an I/O event for the same child.
The result may be attempt to access to memory region allocated for
another purpose, segfault of the master process, and unavailable web
sites.
Postpone processing of SIGCHILD events till other events in the same
bunch are processed.
Fix Bug #62418 php-fpm master process crashes
Fix Bug #65398 Race condition between SIGCHLD and child stdout/stderr event leads to segfault
Fix Bug #75112 php-fpm crashing, hard to reproduce
Fix Bug #77114 php-fpm master segfaults in fpm_event_epoll_wait/fpm_event_fire
Fix Bug #77185 Use-after-free in FPM master event handling
2019-07-22 10:32:58 +02:00
George Wang
82f35ab089
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-21 00:01:06 -04:00
George Wang
eb7e45f662
Checked in LiteSpeed SAPI 7.5, addressed two main problems in "clean shutdown" introduced in 7.4.3,
...
1. falls in an infinite loop because PHP engine's inconsistent state, now override the ITIMER_PROF to 0.1 second, clean shutdown must finish before that.
2. generate too much error log, we completely disable "error_reporting" before calling php_request_shutdown().
2019-07-20 23:59:43 -04:00
Nikita Popov
4a9f78f9d7
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-18 14:41:35 +02:00
Abyr Valg
c8c183eb62
Fixed bug #77946
...
Save multi_info_read() result into easy handle.
2019-07-18 14:40:47 +02:00
Nikita Popov
79efd55fc3
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-17 15:59:14 +02:00
Nikita Popov
b864abfe23
Fixed bug #69100
2019-07-17 15:58:29 +02:00
George Peter Banyard
e7e66d5275
Convert short tag to standard tag in Zend test file
...
Closes GH-4389.
(cherry picked from commit e6c2b28865 )
2019-07-16 15:27:50 +02:00
Christoph M. Becker
956ecc2ce5
Update NEWS [ci skip]
2019-07-16 13:44:13 +02:00
Remi Collet
344d01bee3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
move NEWS entry [ci skip]
2019-07-16 13:00:30 +02:00
Remi Collet
bd0514913b
move NEWS entry [ci skip]
2019-07-16 13:00:13 +02:00
Nikita Popov
eea9d61763
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-16 11:10:51 +02:00
Nikita Popov
8a19fe29de
Fixed bug #78297
2019-07-16 11:09:17 +02:00
Remi Collet
bf1ace7dd3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
next is 7.2.22
2019-07-16 10:39:03 +02:00
Remi Collet
c9037421ac
next is 7.2.22
2019-07-16 10:38:20 +02:00
Dmitry Stogov
c570980175
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed incorrect specialization (missed IS_INDIRECT handling)
2019-07-16 01:52:11 +03:00
Dmitry Stogov
9ccf3fb996
Fixed incorrect specialization (missed IS_INDIRECT handling)
2019-07-16 01:50:10 +03:00
Nikita Popov
2d737a1e4b
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-15 15:20:15 +02:00
Nikita Popov
88ffe05797
Fix bug #77124
...
This is a backport of 6fcae63f61
to PHP 7.2.
2019-07-15 15:19:31 +02:00
Remi Collet
ad48464ec2
typo [ci skip]
2019-07-15 14:17:13 +02:00
Remi Collet
590d8f8263
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78269 password_hash uses weak options for argon2
2019-07-15 14:11:38 +02:00
Remi Collet
a7ff3a6483
Fix #78269 password_hash uses weak options for argon2
2019-07-15 14:11:30 +02:00
Remi Collet
eab0079c90
Fix #78269 password_hash uses weak options for argon2
2019-07-15 14:10:38 +02:00
Nikita Popov
193f28c7d5
Fixed bug #78010
...
Prevent the gc_info from becoming all zero for a registered root
by setting the top bit to one for compressed root addresses.
2019-07-15 12:00:30 +02:00
Nikita Popov
3eb057c4a7
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-15 10:23:51 +02:00
Andrew Collington
768ad70f70
Fix bug #78291 Missing opcache directives
...
New opcache directives have been added recently which are returned
if using `ini_get_all('zend opcache')` but are not listed in the
directives if using `opcache_get_configuration()`. This fix adds
those missing directives as well as if `opcache.mmap_base` is used
instead of `opcache.lockfile_path`. Also adds a test to ensure the
directives match with both methods of fetching.
2019-07-15 10:22:47 +02:00
Nikita Popov
3f73916f10
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-12 16:51:47 +02:00
Nikita Popov
a7de2af46c
Use TRY_ADDREF/TRY_DELREF in soap
...
The DELREF part is a possible fix for bug #78278 , the ADDREF part
is a drive-by fix.
2019-07-12 16:50:43 +02:00
Nikita Popov
9d141f9889
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-12 16:30:33 +02:00
Nikita Popov
4a91f66b8f
Fixed bug #78279
...
Even if we don't initialize the callback on every request, we
should still reset our globals to default values...
2019-07-12 16:29:18 +02:00
Christoph M. Becker
fa65f5ecf5
Fix #78212 : Segfault in built-in webserver
...
Since syslog's ident and facility parameters have been added to
config[1], vsyslog() segfaults on Windows, if openlog() has not been
called before. We bring back the removed lines to fix this.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=2475337bd8a0fad0dac03db3f5e7e9d331d53653 >
2019-07-11 13:09:54 +02:00
Nikita Popov
e7a83ec8df
Fix bug #78271
...
When cleaning nops in the dfa pass, we were always keeping the
smart branch inhibiting nop that occurs directly before the jump
instruction. However, as we skip unreachable blocks entirely, it
may happen that we need to keep a nop that occurs further back,
prior to the unreachable blocks. Account for that case now.
We should really do something about the smart branch situation,
this is very fragile...
2019-07-10 17:25:40 +02:00
Nikita Popov
3fa9f9cfae
Add CONFLICTS to recognized sections
...
It does nothing on 7.3, but this makes it easier to write tests in
3rd party extensions.
2019-07-10 13:09:06 +02:00
Nikita Popov
825f47564a
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-09 11:05:18 +02:00
Nikita Popov
22ed362810
Revert "Fixed bug #76980 "
...
This reverts commit 35353dc49a .
This changes causes issues for Symfony, see
https://github.com/symfony/symfony/issues/32395 . I'm reverting it
from PHP 7.2 and PHP 7.3 and only leaving it in PHP 7.4.
2019-07-09 11:04:16 +02:00
Christoph M. Becker
7404d756e9
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Upgrade to SQLite 3.28.0
2019-07-09 10:04:41 +02:00
Christoph M. Becker
40f7533cc1
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Upgrade to SQLite 3.28.0
2019-07-09 10:02:47 +02:00
Christoph M. Becker
e944ae6b2a
Upgrade to SQLite 3.28.0
...
Over the years, multiple security vulnerabilities[1] have been found
and fixed in SQLite3, so it makes sense to update our bundled libsqlite
to the latest available version.
[1] <https://www.cvedetails.com/vulnerability-list/vendor_id-9237/Sqlite.html >
2019-07-09 09:59:46 +02:00
Peter Kokot
4fcf8e9385
Update NEWS [ci skip]
2019-07-08 18:48:50 +02:00
Peter Kokot
ed4aa4b624
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS [ci skip]
2019-07-08 18:48:27 +02:00
Peter Kokot
f81be1aff6
Update NEWS [ci skip]
2019-07-08 18:47:55 +02:00
Nikita Popov
e3c701ea38
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-05 12:07:10 +02:00
Nikita Popov
5846e85283
Backport fe_reset_rw case
2019-07-05 12:06:52 +02:00
Nikita Popov
920283ff2b
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-05 11:40:45 +02:00
Nikita Popov
c353f17d42
Fix inference for compound object op on dim
2019-07-05 11:39:42 +02:00
George Wang
3ec8776940
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-04 12:04:08 -04:00
George Wang
32af676bd9
Updated to LiteSpeed SAPI V7.4.3
...
Increased response header count limit from 100 to 1000.
Added crash handler to cleanly shutdown PHP request.
Added CloudLinux mod_lsapi mode
Fixed bug #76058
2019-07-04 12:03:21 -04:00
Christoph M. Becker
807c755670
[ci skip] Remove NEWS entry
...
This commit already was contained in PHP 7.3.7, but doesn't need a NEWS
entry, since the regression had only been introduced with PHP 7.3.7RC1.
2019-07-04 14:50:23 +02:00
Fabien Villepinte
cb1237a3ed
Fix typo in NEWS [skip ci]
2019-07-04 14:43:45 +02:00
Nikita Popov
af3c854074
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-03 12:36:50 +02:00
Nikita Popov
0e48e35e04
Fixed bug #78231
2019-07-03 12:36:06 +02:00
Nikita Popov
4892bbc167
Fixed bug #78230
2019-07-03 10:20:07 +02:00
Christoph M. Becker
5e5b7cb4d4
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78241 : touch() does not handle dates after 2038 in PHP 64-bit
2019-07-03 10:02:22 +02:00
Christoph M. Becker
44c8b7414c
Fix #78241 : touch() does not handle dates after 2038 in PHP 64-bit
...
`time_t` defaults to `_time64` (which is 64bit signed) even on x86, but
`Int32x32To64()` truncates it to signed 32bit. We replace the macro
with the "manual" calculation.
2019-07-03 09:59:17 +02:00
Nikita Popov
9ad09ce905
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-02 16:12:24 +02:00
Nikita Popov
32c68428a9
Backport test fix
...
Closes GH-3816.
2019-07-02 16:11:54 +02:00
Christoph M. Becker
41949bb71e
Fix NEWS
...
Bug #78185 fixed a regression in PHP 7.3.7RC2, so should not be listed
here.
2019-07-02 15:08:10 +02:00
Nikita Popov
7174c44557
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-02 12:28:37 +02:00
Alex Scott
a4acff3e21
Fix bug #78138 : opcache.validate_permission incorrectly works with PHAR files
...
opcache incorrectly handles PHAR files when opcache.validate_permission
option enabled, because it calls
access("phar://path-to/file.phar/path/inside.php", R_OK);
rather than
access("path-to/file.phar", R_OK)
2019-07-02 12:25:50 +02:00
Christoph M. Becker
3e25ddb07b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add missing SKIPIFs
2019-07-01 18:12:28 +02:00
Christoph M. Becker
57688ad7bf
Add missing SKIPIFs
...
All these tests are meant to run with OPcache available, and some will
even fail inevitably without it, so we add OPcache as SKIPIF
requirement.
2019-07-01 18:11:13 +02:00
Christoph M. Becker
99e6c701e6
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add missing SKIPIFs
2019-07-01 17:22:55 +02:00
Christoph M. Becker
75bc3446f8
Add missing SKIPIFs
...
All these tests are meant to run with OPcache available, and some will
even fail inevitably without it, so we add OPcache as SKIPIF
requirement.
2019-07-01 17:21:16 +02:00
Christoph M. Becker
d714be0f57
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix brittle test
2019-07-01 16:43:47 +02:00
Christoph M. Becker
be559e6c37
Fix brittle test
...
This test is easily tripped by former test runs with other PHP
versions. To avoid such false positives, we check that there is at
least one respective OPcache file, and that all found OPcache user ID
folders have exactly 32 hexadecimal digits.
2019-07-01 16:42:55 +02:00
Peter Kokot
b039a4115f
Update NEWS [ci skip]
2019-07-01 02:54:42 +02:00
Peter Kokot
624488b5e8
Fix bug #78197 : PCRE2 version check
...
When external PCRE library version is of format ##.##-RC# the check
failed.
2019-07-01 02:42:29 +02:00
Derick Rethans
cc3fe3bd30
Fixed tests due to changed timezone data
2019-06-30 15:50:38 +01:00
Derick Rethans
aae5907cb7
Update timelib to 2018.02
2019-06-30 15:45:13 +01:00
Anatol Belski
07cdf0109f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS [ci skip]
2019-06-29 17:40:14 +02:00
Anatol Belski
a149f9f3c0
Update NEWS [ci skip]
2019-06-29 17:39:45 +02:00
Anatol Belski
b926690947
Fix typo
2019-06-29 13:30:35 +02:00
Joshua Westerheide
6cdeedb8de
Add tests from fix #78183 from PHP-7.2
2019-06-29 13:29:53 +02:00
Anatol Belski
0a31836bed
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78183 : finfo_file shows wrong mime-type for .tga file
2019-06-29 13:29:41 +02:00
Joshua Westerheide
855bbc88c9
Fix #78183 : finfo_file shows wrong mime-type for .tga file
...
Due to a bug in the underlying libmagic 5.31, .tga images returned mime type "image/x-tgaimage/x-tga".
2019-06-29 13:24:52 +02:00
Nikita Popov
19d0a51533
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-28 16:09:09 +02:00
sunnyeo
f7327b6244
Fix bugs in AST printer
...
Closes GH-4324.
2019-06-28 16:08:44 +02:00
Christoph M. Becker
646debaf38
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #78192 PDO SQLite SegFault when reuse statement after schema has changed
2019-06-28 12:36:55 +02:00
Vincent
05c00a832c
Fix bug #78192 PDO SQLite SegFault when reuse statement after schema has changed
...
Reset stmt->columns when column count changed on new execution of prepared statement
2019-06-28 12:36:02 +02:00
Christoph M. Becker
801ab18ea7
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Remove stream_socket_sendto.phpt
2019-06-26 17:01:29 +02:00
Nikita Popov
7d28a24c66
Remove stream_socket_sendto.phpt
...
Fails for me locally due to different number of warnings with
different messages. Rather than adding more wildcards I'm dropping
this test entirely, as it doesn't seem to test anything particularly
useful.
(cherry picked from commit 84333cad67 )
2019-06-26 16:58:37 +02:00
Christoph M. Becker
18bba63f39
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78202 : Opcache stats for cache hits are capped at 32bit NUM
2019-06-25 13:04:28 +02:00
Christoph M. Becker
4366f22dfc
Fix #78202 : Opcache stats for cache hits are capped at 32bit NUM
...
We use the proper format specifiers now.
2019-06-25 13:00:28 +02:00
Andrey Hristov
8326f95fe3
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-21 16:32:13 +03:00
Andrey Hristov
102c64e827
Add explicit cast to uint32_t.
...
It works even without it but explicit stuff is better. The compiler probably converts the 16-bit
uint16_t to uint32_t before doing the shift.
2019-06-21 16:31:56 +03:00
Nikita Popov
66e4b78519
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-21 15:07:59 +02:00
Nikita Popov
99f3e0f0ed
Fix PKCS12 leak in openssl
2019-06-21 15:07:37 +02:00
Nikita Popov
c939a67866
Fix d leak in ecc openssl_pkey_new
2019-06-21 15:07:32 +02:00
Nikita Popov
dfe6f0c1c6
Fix netscape spki leak in openssl
2019-06-21 15:07:26 +02:00
Nikita Popov
a0da2fb2b7
Fix X509 leak in openssl_pkcs7_verify()
2019-06-21 15:07:18 +02:00
Nikita Popov
e0bafc6da4
Fix CSR leaks in openssl
2019-06-21 15:07:10 +02:00
Nikita Popov
90cb3743be
Free cert in php_openssl_load_stream_cafile()
...
X509_STORE_add_cert() increments the refcount of the cert, so we
should free it here.
2019-06-21 15:07:00 +02:00
Nikita Popov
414db07bdb
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-21 12:55:12 +02:00
Niklas Keller
fea9f93166
Fix memory leak in TLS matches_san_list
2019-06-21 12:54:30 +02:00
Christoph M. Becker
a85254b898
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78189 : file cache strips last character of uname hash
2019-06-20 17:59:59 +02:00
Christoph M. Becker
fcd6f2de60
Fix #78189 : file cache strips last character of uname hash
...
We must not forget to increase `len` by one to cater to the directory
separator.
2019-06-20 17:58:32 +02:00
Christoph M. Becker
a0f370e78a
Update NEWS
2019-06-20 16:59:39 +02:00
Remi Collet
676b564f43
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
fix test for Windows and for parallel run
2019-06-20 11:58:49 +02:00
Remi Collet
d8202bf917
fix test for Windows and for parallel run
2019-06-20 11:58:32 +02:00
Remi Collet
d7597f73cc
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
improve test clean section
2019-06-20 11:51:51 +02:00
Remi Collet
b3cfeda3c7
improve test clean section
2019-06-20 11:51:18 +02:00
Remi Collet
27b5b46cb9
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
move NEWS entry
2019-06-20 10:41:21 +02:00
Remi Collet
c2ee2e4c74
move NEWS entry
2019-06-20 10:40:52 +02:00
Remi Collet
a197dc72c3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
add test for #78185
2019-06-20 10:28:00 +02:00
Remi Collet
63f2d88088
add test for #78185
2019-06-20 10:27:33 +02:00
Dmitry Stogov
35acda856a
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #78185 (File cache no longer works)
2019-06-20 09:05:50 +03:00
Dmitry Stogov
cd6a6e4cf2
Fixed bug #78185 (File cache no longer works)
2019-06-20 09:04:14 +03:00
Andrey Hristov
7ba1e6b34d
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-19 16:43:06 +03:00
Andrey Hristov
82021ad9df
Fix version comparison
2019-06-19 16:42:43 +03:00
Joe Watkins
a5db319463
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
fix setcookie Max-Age to use php_time
2019-06-19 12:42:25 +02:00
Joe Watkins
31a1c1e67c
fix setcookie Max-Age to use php_time
2019-06-19 12:42:00 +02:00
Joe Watkins
264536877d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
export php_time
2019-06-19 12:40:23 +02:00
Joe Watkins
599b94ff14
export php_time
2019-06-19 12:39:51 +02:00
Joe Watkins
025899e3b5
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
2019-06-19 08:59:04 +02:00
Joe Watkins
65067dff01
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
2019-06-19 08:56:20 +02:00
Christoph M. Becker
96663fd6ae
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78173 : XML-RPC mutates immutable objects during encoding
2019-06-18 17:08:58 +02:00
Asher Baker
d54220bc79
Fix #78173 : XML-RPC mutates immutable objects during encoding
...
With opcache.protect_memory=1 enabled, the XML-RPC extension causes a
segfault on PHP 7.2 as it is modifying the recursion counter of objects
it touches, without first checking if they are immutable or not.
This doesn't affect 7.3+
2019-06-18 17:08:11 +02:00
Christoph M. Becker
740d9ecdee
Update NEWS
2019-06-18 09:33:35 +02:00
Remi Collet
efa1388cd3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
move NEWS entry
2019-06-18 07:51:05 +02:00
Remi Collet
e59b986fa7
move NEWS entry
2019-06-18 07:50:44 +02:00
Nikita Popov
11b354dd54
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-17 13:30:56 +02:00
Nikita Popov
03db04c3ab
Accept null for preg_quote delimiter argument
...
Related to bug #78163 .
2019-06-17 13:30:15 +02:00
Erik Lundin
9f0515c40c
Add syslog.filter=raw
...
This passes through syslog message unchanged, without splitting
messages at newlines.
2019-06-17 13:13:25 +02:00
Dmitry Stogov
96a6f7f7f5
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Backport 96a12578c1
2019-06-14 13:29:30 +03:00
Dmitry Stogov
28808ca96d
Backport 96a12578c1
2019-06-14 13:29:13 +03:00
Dmitry Stogov
a5b39abd86
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Backport 91a6cdbff5
2019-06-14 13:25:06 +03:00
Dmitry Stogov
40f463b560
Backport 91a6cdbff5
2019-06-14 13:24:47 +03:00
Nikita Popov
98457b6d60
Fix some leaks in ldap
...
The result of zval_get_string() needs to be released. In some places
where it is inconvenient to manage, I went back to convert_to_string.
It is safe in those places due to existing array separations.
Also fix a preexisting leak when getting controls, the previous
value was not destroyed.
2019-06-14 11:11:24 +02:00
Côme Chilliet
5d2fe48785
Some more string conversion handling, fixing bug #77958
2019-06-13 22:12:34 +02:00
Côme Chilliet
c219d8d5c2
Avoid converting zval when not needed
...
Also added exception checks so that exception from __toString are
correctly handled in the future
2019-06-13 20:58:45 +02:00
Nikita Popov
bada2049ca
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-13 12:52:32 +02:00
Nikita Popov
f1a8138055
Fixed bug #78106
...
When disabling opcache during the request via opcache.enable ini
setting, make sure we also disable ZCG(accelerator_enabled).
2019-06-13 12:51:35 +02:00
Nikita Popov
ee137a7033
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-13 12:38:57 +02:00
Nikita Popov
f8a68fd935
Add test for bug #78106
...
Also add PHP_TEST_EXTRA_ARGS environment variable, which allows
to pass on -c, -d etc flags provided by run-tests.php. Otherwise
we won't get the built-in server to run with opcache.
2019-06-13 12:35:29 +02:00
Tyson Andre
5d3e3a62a2
Be more precise about possible types for mysqli methods
...
mysqli has an uncommon approach to 64-bit compatibility:
it will convert numbers that can't be represented on 32-bit
platforms to a string.
This is documented at
https://www.php.net/manual/en/mysqli-stmt.affected-rows.php#refsect1-mysqli-stmt.affected-rows-returnvalues
So if there's a query to a remote mysqli server that affects
more than 2.2 billion rows, then the opcache inference might be
incorrect.
(It's possible to add a MAY_BE_STRING_ON_32_BIT_PLATFORM bitflag macro to
account for this, but I don't think there's a need or want to?)
Patches 3162285b86
This is based on the list of php 7.4 functions using
MYSQLI_RETURN_LONG_INT in mysqli_api.c
2019-06-11 15:40:33 +02:00
Tyson Andre
07c63c6fdf
Fix opcache signatures for mysqli_stat
...
See mysqli_api.c and https://www.php.net/manual/en/mysqli.stat.php
2019-06-11 15:39:59 +02:00
Tyson Andre
7350e808c5
Fix bug in opcache flags for mysqli_get_charset
...
https://www.php.net/manual/en/mysqli.get-charset.php
tests/mysqli_field_seek.phpt has a test of this returning an object.
Looking at the source in ext/mysqli/mysqli_nonapi.c,
this should be object|null, not array|null
This might actually cause bugs in opcache's inferences,
(no proof of this)
so it might make sense to pull this patch into an earlier minor version.
2019-06-11 15:39:59 +02:00
Christoph M. Becker
bcf20963c1
Next is 7.3.8
2019-06-11 13:31:30 +02:00
Remi Collet
feb92adc5c
next is 7.2.21
2019-06-11 12:20:26 +02:00
Remi Collet
3080fc3971
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
next is 7.2.21
2019-06-11 12:19:17 +02:00
Remi Collet
05c60abfdb
next is 7.2.21
2019-06-11 12:18:43 +02:00
Christoph M. Becker
b215d1339f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77937 : preg_match failed
2019-06-11 08:44:07 +02:00
Christoph M. Becker
f3ff72e54b
Fix #77937 : preg_match failed
...
On some recent Windows systems, ext\pcre\tests\locales.phpt fails,
because 'pt_PT' is accepted by `setlocale()`, but not properly
supported by the ctype functions, which are used internally by PCRE2 to
build the localized character tables.
Since there appears to be no way to properly check whether a given
locale is fully supported, but we want to minimize BC impact, we filter
out typical Unix locale names, except for a few cases which have
already been properly supported on Windows. This way code like
setlocale(LC_ALL, 'de_DE.UTF-8', 'de_DE', 'German_Germany.1252');
should work like on older Windows systems.
It should be noted that the locale names causing trouble are not (yet)
documented as valid names anyway, see
<https://docs.microsoft.com/en-us/cpp/c-runtime-library/locale-names-languages-and-country-region-strings?view=vs-2019 >.
2019-06-11 08:42:32 +02:00
Dmitry Stogov
a0749fe483
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed possible misalignment in 32-bit build.
2019-06-10 12:52:50 +03:00
Dmitry Stogov
199eb2b110
Fixed possible misalignment in 32-bit build.
2019-06-10 12:51:59 +03:00
Peter Kokot
53b0f4ba4e
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Extend wildcard files section in EditorConfig [ci skip]
2019-06-09 22:54:59 +02:00
Peter Kokot
65ada39360
Extend wildcard files section in EditorConfig [ci skip]
...
Changes:
- Trim trailing whitespace for all files except patches. There isn't
really any practical reason to not trim the trailing whitespace in all
other files. Binary files or phpt files that include trailing
whitespace as part of the test should be manually set in editors/IDEs
or by disabling the editorconfig for particular editing.
- Add *.ac, *.d, *.l, *.skl, *.re, *.wsdl, *.dtd, *.html, *.rng, *.xml,
*.xsd, *.xsl, buildconf, and Makefile* files settings.
Closes #4156
2019-06-09 22:53:58 +02:00
Dmitry Stogov
15e01132cf
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Restored NEWS entry
2019-06-07 12:38:37 +03:00
Dmitry Stogov
10b208f28d
Restored NEWS entry
2019-06-07 12:37:49 +03:00
Nikita Popov
9569a0b8ca
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-07 10:57:43 +02:00
Nikita Popov
d7c7522be9
Enable STRICT_TRANS_TABLES in new test
...
The part testing error cases relies on this.
2019-06-07 10:57:09 +02:00
Dmitry Stogov
972223c342
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)
2019-06-07 11:48:57 +03:00
Dmitry Stogov
83cdb89f8a
Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)
2019-06-07 11:36:39 +03:00
Nikita Popov
a5f98139c9
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-07 09:49:01 +02:00
Cameron Porter
7d1aa7534d
Fixed bug #38546
...
Properly support binding boolean parameters with emulated prepared
statements disabled. Also add the necessary mysqlnd support for
MYSQL_TYPE_TINY.
2019-06-07 09:48:43 +02:00
Christoph M. Becker
5f2f6180b9
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test regarding Unix Domain Sockets on Windows
2019-06-06 15:00:35 +02:00
Christoph M. Becker
2df32942d3
Fix test regarding Unix Domain Sockets on Windows
...
Recent Windows versions actually support Unix Domain Sockets. Cf.
<https://github.com/curl/curl/pull/3939 >.
2019-06-06 14:59:58 +02:00
Christoph M. Becker
22a3fa0b2e
Fix #78114 : segfault when calling sodium_* functions from eval
...
We must not follow the NULL pointer.
2019-06-06 10:00:15 +02:00
Joe Watkins
249c20023d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
fix flaky posix test
2019-06-05 16:35:43 +02:00
Joe Watkins
f4474e5724
fix flaky posix test
2019-06-05 16:34:50 +02:00
Nikita Popov
d154301866
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-04 16:27:57 +02:00
Nikita Popov
a3e6b50442
Fixed bug #78050
...
This is a backport of a982125561 .
2019-06-04 16:26:34 +02:00
Nikita Popov
a4633b13d4
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-04 16:14:14 +02:00
Nikita Popov
2d3bc71e89
Reload tsrmls_id in release builds as well
...
If TSRM is shut down and started again (something that phpdbg does),
then tsrmls_id needs to be reloaded everywhere. As tsrmls_id
update is a rare operation, doing that shouldn't be a problem.
2019-06-04 16:12:59 +02:00
Remi Collet
9a495911c8
this was in 7.3.5, not 7.3.6
2019-06-04 07:19:29 +02:00
Nikita Popov
37bba7a678
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-03 15:15:07 +02:00
Nikita Popov
ac60007bec
Clear errors after SSL_CTX_load_verify_locations()
...
We report our own errors here. Make sure these don't clog up the
error queue.
2019-06-03 15:14:01 +02:00
Jakub Zelenka
8f69ca8dcd
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-02 19:13:18 +01:00
Jakub Zelenka
2e02579474
Fix bug #78079 (openssl_encrypt_ccm.phpt fails with OpenSSL 1.1.1c)
...
It also fixes invalid setting of tag length
2019-06-02 19:10:56 +01:00
Anatol Belski
793fd6bce9
Fix expect section
2019-06-01 14:50:14 +02:00
Anatol Belski
547665c720
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update SDK version for AppVeyor
2019-06-01 13:44:10 +02:00
Anatol Belski
59b0b38d3c
Update SDK version for AppVeyor
2019-06-01 13:43:31 +02:00
Anatol Belski
2205546edf
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Change ZPP only if compiled with ICU >= 64
Update tests for ICU 64
2019-06-01 02:26:07 +02:00
Anatol Belski
ee153deb1f
Change ZPP only if compiled with ICU >= 64
2019-06-01 02:18:56 +02:00
Nikita Popov
b01d9fdab1
Update tests for ICU 64
...
(cherry picked from commit 8a8bc5c452 )
2019-06-01 02:17:16 +02:00
Anatol Belski
06eef1f70f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix var name
2019-05-31 20:50:17 +02:00
Anatol Belski
d293f6dcff
Fix var name
2019-05-31 20:49:42 +02:00
Craig Duncan
370997fb5d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add a test for bug #65672
Ensure the internal properties cannot be overwritten
2019-05-30 18:55:55 +01:00
Craig Duncan
8b53c7232e
Add a test for bug #65672
2019-05-30 18:55:42 +01:00
Craig Duncan
dc586bff36
Ensure the internal properties cannot be overwritten
2019-05-30 18:55:36 +01:00
Nikita Popov
61a38bb274
SCCP: Fix leak when determining TYPE_CHECK from type info
...
As TYPE_CHECK is the only opcode where we do something like this,
I'm adding this hack.
2019-05-29 16:47:19 +02:00
Nikita Popov
de7d0256a3
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-29 09:47:43 +02:00
Craig Duncan
5d67271db0
Add tests for DatePeriod properties
2019-05-29 09:47:10 +02:00
Christoph M. Becker
f3cd6931ca
Update NEWS for 7.3.6
2019-05-29 09:27:23 +02:00
Remi Collet
582469eef2
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
add NEWS entries for sec fix
2019-05-29 08:53:42 +02:00
Remi Collet
3051147019
add NEWS entries for sec fix
2019-05-29 08:53:23 +02:00
Joe Watkins
6c73b2088a
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
disabled functions must not have return type
2019-05-29 08:30:41 +02:00
Joe Watkins
7821cc3b9f
disabled functions must not have return type
2019-05-29 08:30:08 +02:00
Craig Duncan
72c330f1e6
Restore the execute bit for run-tests.php
...
It looks like this was accidentally removed in 03f15f705a
2019-05-28 21:51:26 +01:00
Nikita Popov
817b50826e
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-28 16:41:08 +02:00
Nikita Popov
59dfaa3f99
Fix type inference of SEND_UNPACK with empty array
...
An empty array will not be turned into an array of references.
This violated the invariant than an array has values iff it has
keys.
2019-05-28 16:40:56 +02:00
Joe Watkins
dee977b7a7
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
bump version after release
2019-05-28 09:54:15 +02:00
Joe Watkins
d661a75d54
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
bump version after release
2019-05-28 09:53:32 +02:00
Joe Watkins
5533f2490a
bump version after release
2019-05-28 09:52:52 +02:00
Stanislav Malyshev
9d473f1eac
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
2019-05-27 21:36:05 -07:00
Stanislav Malyshev
fbb6a27212
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
2019-05-27 21:36:00 -07:00
Stanislav Malyshev
c34895e837
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
2019-05-27 18:48:48 -07:00
Stanislav Malyshev
13dffa9d32
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
2019-05-27 17:28:25 -07:00
Stanislav Malyshev
dc1d99e772
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
2019-05-27 17:28:20 -07:00
Stanislav Malyshev
73ff4193be
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
2019-05-27 17:28:09 -07:00
Stanislav Malyshev
e63b2ba310
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix function name
2019-05-27 17:21:23 -07:00
Stanislav Malyshev
9bca9ef6cf
Fix function name
2019-05-27 17:20:56 -07:00
Stanislav Malyshev
c7eb0feed8
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Fix #77973 : Uninitialized read in gdImageCreateFromXbm
2019-05-27 16:49:25 -07:00
Stanislav Malyshev
e77c8e45ba
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Update NEWS
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Fix #77973 : Uninitialized read in gdImageCreateFromXbm
2019-05-27 16:49:19 -07:00
Stanislav Malyshev
16e037bd46
Update NEWS
2019-05-27 16:48:32 -07:00
Stanislav Malyshev
7cf7148a8f
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
2019-05-27 16:32:42 -07:00
Christoph M. Becker
ed6dee9a19
Fix #77973 : Uninitialized read in gdImageCreateFromXbm
...
We have to ensure that `sscanf()` does indeed read a hex value here,
and bail out otherwise.
2019-05-27 16:11:32 -07:00
Nikita Popov
0cb43ec51c
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-27 17:43:13 +02:00
Michael Maroszek
a0c9d0849a
Fixed bug #76345
2019-05-27 17:42:20 +02:00
Nikita Popov
31ce1cbbb9
Func info: Fix calls to zero-arg varargs
...
The num_args does not include variadics, so a "zero-arg" function
may accept additional arguments through that. No functions seem
to be affected right now, but they will be after #4175 .
2019-05-27 16:14:51 +02:00
Jakub Zelenka
209b12e064
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-26 18:49:52 +01:00
Jakub Zelenka
8baf3ffde6
Add fpmi to the opcache supported sapis
2019-05-26 18:47:22 +01:00
Nikita Popov
6f9dfd9473
Fix bug #77955
...
Free metadata before freeing the arena. I don't have a repro script,
but the added assertion fails for many existing tests prior to this
change.
2019-05-23 13:40:52 +02:00
Nikita Popov
b394654c1e
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-23 11:12:59 +02:00
Nikita Popov
9a74b23297
Fixed bug #78038 socket_select with references
2019-05-23 11:12:15 +02:00
Dmitry Stogov
d4867e099e
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed race condition in opcache restart
2019-05-23 00:21:04 +03:00
Dmitry Stogov
fa6a4483e6
Fixed race condition in opcache restart
2019-05-23 00:20:35 +03:00
Dmitry Stogov
aa9c76d027
Fixed dump of constant flags
2019-05-22 22:59:40 +03:00
Nikita Popov
f308aa4e1e
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-22 12:45:16 +02:00
Sjon Hortensius
96404eb8e2
Fix #77956 - When mysqli.allow_local_infile = Off, return a client error
2019-05-22 12:44:55 +02:00
Christoph M. Becker
69c634a56d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test case for cURL 7.65.0
2019-05-22 12:02:03 +02:00
Christoph M. Becker
62fe6ba20c
Fix test case for cURL 7.65.0
...
Reported and patch provided by @Jan-E.
2019-05-22 12:01:23 +02:00
Nikita Popov
3a719696bc
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-22 11:43:26 +02:00
Nikita Popov
3a0de243c3
Use a different URL in bug44811.phpt
2019-05-22 11:41:51 +02:00
Rasmus Lerdorf
2d29263a9f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
2019-05-21 14:46:24 -07:00
Rasmus Lerdorf
7b42cdf95e
Fix precedence issue causing sub-second timeouts to be 0 in
...
curl_multi_select
2019-05-21 14:44:11 -07:00
Nikita Popov
97ba6b0d8b
Don't evaluate functions with partial array arguments
2019-05-21 17:35:03 +02:00
Nikita Popov
30f1b17262
Fix null check in sccp add_array_elem chain handling
...
We need to check result_use rather than result_def for a null zval.
Previously we were later assuming that the null zval is really a
partial array, which does not go well.
2019-05-21 17:15:07 +02:00
Nikita Popov
fc4836b193
Fix partial array handling in FE_RESET edge feasibility
2019-05-21 16:59:27 +02:00
Nikita Popov
cd188d0398
Handle partial arrays in zend_is_true() checks
2019-05-21 16:53:34 +02:00
Nikita Popov
bdce5849b7
Extract ct_eval_binary_op()
...
And use it in more places, though some of them are currently not
reachable by partial arrays to the best of my knowledge.
2019-05-21 16:43:41 +02:00
Nikita Popov
367788cbc3
Improve SCCP debug code
...
In particular properly dump partial arrays when tracing execution.
2019-05-21 16:42:13 +02:00
Christoph M. Becker
d23bc33dc1
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Prevent test case failure
2019-05-21 11:18:32 +02:00
Christoph M. Becker
e6a191de1b
Prevent test case failure
...
If opcache.log_verbosity_level is greater than 1, opcache will raise
warnings, which will be written to stderr in the default case. These
warnings are actually to be expected, but would break the test, so we
make sure that the log_verbosity_level is 1 when running this test.
2019-05-21 11:17:51 +02:00
Nikita Popov
4ebd9a5366
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-21 10:04:51 +02:00
Vincent JARDIN
5f8c22d415
Support content_type stream context option in soap
...
Allows overriding the HTTP header using the HTTP context:
$client = new SoapClient('http://url.wsdl&v=latest ', [
'stream_context' => stream_context_create([
'http' => [
'content_type' => 'foobarX',
],
]),
]);
This is a backport of c55af3c65a
to the PHP 7.2 branch.
2019-05-21 10:04:15 +02:00
Christoph M. Becker
11740abd6b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
use {TMP} placeholder in phpt tests
2019-05-21 09:03:01 +02:00
Holly Li (WIPRO LIMITED)
202e6936d6
use {TMP} placeholder in phpt tests
2019-05-21 09:02:37 +02:00
Dmitry Stogov
354a76bb80
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Prevent race condition in opcache_reset()
2019-05-21 00:08:03 +03:00
Dmitry Stogov
a8a019d68a
Prevent race condition in opcache_reset()
2019-05-21 00:07:17 +03:00
Christoph M. Becker
db8ef71353
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test wrt. opcache.error_log
2019-05-20 11:10:20 +02:00
Christoph M. Becker
64ec9f4dbe
Fix test wrt. opcache.error_log
...
Since the test expects log messages to be written to stderr, we have to
make sure that opcache.error_log is set correctly when running the
test.
2019-05-20 11:09:44 +02:00
Christoph M. Becker
fd607635a4
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78025 : segfault when accessing properties of DOMDocumentType
2019-05-17 13:32:13 +02:00
Christoph M. Becker
e246dea9fe
Fix #78025 : segfault when accessing properties of DOMDocumentType
...
Instead of following the NULL pointer, we return an empty string.
2019-05-17 13:31:18 +02:00
Nikita Popov
9d76fbd0c4
Fixed bug #78015
...
Don't try to evaluate various operations with partial array operands.
We could evaluate some of these, but let's be conservative for now...
2019-05-15 14:35:31 +02:00
Nikita Popov
5846119e50
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-15 12:48:35 +02:00
Nikita Popov
35353dc49a
Fixed bug #76980
...
If we perform a class fetch that is not marked as exception safe,
convert exceptions thrown by autoloaders into a fatal error.
Ideally fetching the interfaces would be exception safe, but as it
isn't right now, we must abort at this point.
2019-05-15 12:46:23 +02:00
Christoph M. Becker
714d2d8ae1
Update NEWS regarding re-tagging 7.3.6RC1
2019-05-15 11:31:53 +02:00
Sara Golemon
8511c204c3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Bump for 7.2.20
2019-05-14 20:23:25 -04:00
Sara Golemon
4fa32d67bf
Bump for 7.2.20
2019-05-14 20:22:00 -04:00
Dmitry Stogov
bb7ecb8704
Moved NEWS entry
2019-05-14 14:55:28 +03:00
Dmitry Stogov
a43678aa12
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed possible crashes, because of inconsistent PCRE cache and opcache SHM reset
2019-05-14 14:54:30 +03:00
Dmitry Stogov
5c4d125d4c
Fixed possible crashes, because of inconsistent PCRE cache and opcache SHM reset
2019-05-14 14:53:52 +03:00
Christoph M. Becker
2d93cce03a
Prepare 7.3.7-dev
2019-05-14 11:44:58 +02:00
Christoph M. Becker
1a98878bfe
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test case
2019-05-14 10:25:02 +02:00
Christoph M. Becker
704a0ab0c9
Fix test case
...
stderr is supposed to be redirected to NUL (which is roughly equivalent
to /dev/null on POSIX), but actually was redirected to a file.
2019-05-14 10:23:58 +02:00
Jakub Zelenka
aa74c30466
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-13 18:51:05 +01:00
Jakub Zelenka
ad63bd169b
Add ping to the fpm test for bug #77934
2019-05-13 18:50:24 +01:00
Christoph M. Becker
69bab6e5a5
Fix #78003 : strip_tags output change since PHP 7.3
...
A refactoring of the strip tags state machine[1] missed the special
treatment of `depth > 0` when a `>` is encountered in state 2 or 3. We
re-add it for BC reasons.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=5cf64742773ddbf9af69d962a4d12b567fcf0084 >
2019-05-13 13:10:24 +02:00
Nikita Popov
bec68d59a2
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-13 11:06:14 +02:00
Theodore Brown
b6b15fc65c
Fix #77993 : Wrong parse error for invalid hex literal on Windows
...
If a PHP file contains an invalid hex literal such as `0x_10`, the expected error
is `Parse error: syntax error, unexpected 'x_10' (T_STRING) in %s on line %d`.
This already worked correctly on Linux, but on Windows prior to this patch a different
error was produced: `Parse error: Invalid numeric literal in %s on line %d`.
2019-05-13 11:04:56 +02:00
Peter Kokot
43e6fd1e2b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Convert CRLF to LF
2019-05-13 03:53:31 +02:00
Peter Kokot
f95b27c6f6
Convert CRLF to LF
...
These files are tracked with CRLF line endings in Git and can be
converted to LF. Neither are parts of tests or code itself.
2019-05-13 03:51:00 +02:00
Jakub Zelenka
0cad701374
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-11 20:08:57 +01:00
Jakub Zelenka
cc5c51e7f0
Fix bug #77934 (php-fpm kill -USR2 not working)
2019-05-11 20:07:39 +01:00
Peter Kokot
bec22af8d7
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Convert CRLF to LF in *.wsdl files
2019-05-11 17:15:08 +02:00
Peter Kokot
b15bfb9129
Convert CRLF to LF in *.wsdl files
...
These EOL types are part of different environments and not part of the
tests themselves.
2019-05-11 17:12:28 +02:00
Christoph M. Becker
49b5ffe48c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix typo
2019-05-10 18:44:47 +02:00
Christoph M. Becker
3759c6316d
Fix typo
...
Since opcache.enable defaults to 1 anyway, this change is only
cosmetic.
2019-05-10 18:43:40 +02:00
George Wang
d2037b1bd4
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-09 18:14:11 -04:00
George Wang
af4143753f
Updated LiteSpeed SAPI to 7.3.2 to allow request header value length up to 64K.
2019-05-09 18:13:25 -04:00
Christoph M. Becker
fd1ffa4692
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix erroneous assertions
2019-05-09 16:55:35 +02:00
Christoph M. Becker
27f168cf63
Fix erroneous assertions
...
Since PHP strings are binary safe (i.e. they may contain NUL bytes), we
must not assume that strlen()/wcslen() actually return the length of
the string. Only if the given in_len is zero, it is safe to assert
this.
2019-05-09 16:54:11 +02:00
Nikita Popov
90318fbcbe
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-09 12:35:11 +02:00
Nikita Popov
35c80583f0
Fixed bug #75186
2019-05-09 12:33:53 +02:00
Christoph M. Becker
e46b3c3e70
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix log_verbosity_bug.phpt
2019-05-09 12:15:32 +02:00
Christoph M. Becker
e359812ce3
Fix log_verbosity_bug.phpt
...
This test may fail on Windows due to the file cache fallback. We
ensure that this will not happen.
2019-05-09 12:15:00 +02:00
Christoph M. Becker
236522529c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add {TMP} placeholder for PHPT INI sections
2019-05-08 19:22:21 +02:00
Christoph M. Becker
3d0a0f801b
Add {TMP} placeholder for PHPT INI sections
...
Several tests use `/tmp` in the `--INI--` section, but this is not
portable. We therefore introduce the `{TMP}` placeholder which
evaluates to the system's temporary directory using
`sys_get_temp_dir()`.
We also remove the doubtful `strpos()` optimization.
2019-05-08 19:21:38 +02:00
Nikita Popov
e2ef4e9e2f
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-08 11:37:49 +02:00
Nikita Popov
d19b6aa5ba
Fix resolution of "parent" during inheritance check
...
We can't assume that the method we're checking against is part of
the parent class...
2019-05-08 11:35:26 +02:00
Peter Kokot
d153fbc5a9
Convert CRLF line endings to LF
...
This patch simplifies line endings tracked in the Git repository and
syncs them to all include the LF style instead of the CRLF files.
Newline characters:
- LF (\n) (*nix and Mac)
- CRLF (\r\n) (Windows)
- CR (\r) (old Mac, obsolete)
To see which line endings are in the index and in the working copy the
following command can be used:
`git ls-files --eol`
Git additionally provides `.gitattributes` file to specify if some files
need to have specific line endings on all platforms (either CRLF or LF).
Changed files shouldn't cause issues on modern Windows platforms because
also Git can do output conversion is core.autocrlf=true is set on
Windows and use CRLF newlines in all files in the working tree.
Unless CRLF files are tracked specifically, Git by default tracks all
files in the index using LF newlines.
2019-05-07 04:34:37 +02:00
Jakub Zelenka
36a7d9fca4
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-05 21:05:55 +01:00
Jakub Zelenka
9977de0028
Fix OpenSSL online test for ca context
...
The php.net is redirected to https so use nginx.org
2019-05-05 21:04:28 +01:00
Javier Spagnoletti
78d24429f2
Update NEWS with changes made at #4093
2019-05-03 17:32:40 +02:00
Javier Spagnoletti
6b73e692c9
Add more missing CURL_VERSION_* constants
...
And also check for CURL_VERSION_* constants in the sync-constants.php
script.
Related to request #72189 : Add missing `CURL_VERSION_*` constants.
2019-05-02 15:11:42 +02:00
Christoph M. Becker
d91b643c87
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS wrt. sec fixes
2019-04-30 09:36:09 +02:00
Christoph M. Becker
1210c3b960
Update NEWS wrt. sec fixes
2019-04-30 09:34:53 +02:00
Stanislav Malyshev
66b32f25d5
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
2019-04-30 00:05:43 -07:00
Stanislav Malyshev
cb5af4e8a0
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
2019-04-30 00:05:32 -07:00
Stanislav Malyshev
f80ad18afa
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
...
I do not completely understand what is going on there, but I am pretty
sure dir_entry <= offset_base if not a normal situation, so we better not
to rely on such dir_entry.
2019-04-30 00:05:23 -07:00
Stanislav Malyshev
506a764089
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77821 : Potential heap corruption in TSendMail()
2019-04-29 22:09:10 -07:00
Stanislav Malyshev
2c3933821f
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #77821 : Potential heap corruption in TSendMail()
2019-04-29 22:09:04 -07:00
Christoph M. Becker
6c631ccfef
Fix #77821 : Potential heap corruption in TSendMail()
...
`zend_string_tolower()` returns a copy (not a duplicate) of the given
string, if it is already in lower case. In this case we must not not
`zend_string_free()` both strings. The cleanest solution is to call
` zend_string_release()` on both strings, which properly handles the
refcount.
2019-04-29 22:08:19 -07:00
Christoph M. Becker
a30b919872
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77943 : imageantialias($image, false); does not work
2019-04-29 17:23:45 +02:00
Christoph M. Becker
18a9ae412f
Fix #77943 : imageantialias($image, false); does not work
...
Firstly, we must not call `gdImageSetAntiAliased()` (which sets the
color to anti-alias), but rather modify the `gdImage.AA` flag.
Furthermore, we have to actually use the supplied boolean value.
We also make sure that we don't attempt to enable anti-aliasing for
palette images.
2019-04-29 17:23:16 +02:00
Christoph M. Becker
44494c09bc
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add tests for bug77943
2019-04-29 16:29:29 +02:00
Christoph M. Becker
3891e0d13a
Add tests for bug77943
2019-04-29 16:29:08 +02:00
Christoph M. Becker
3fc1bdc81c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77943 : imageantialias($image, false); does not work
2019-04-29 16:18:27 +02:00
Christoph M. Becker
cd94cf60a2
Fix #77943 : imageantialias($image, false); does not work
...
Firstly, we must not call `gdImageSetAntiAliased()` (which sets the
color to anti-alias), but rather modify the `gdImage.AA` flag.
Furthermore, we have to actually use the supplied boolean value.
We also make sure that we don't attempt to enable anti-aliasing for
palette images.
2019-04-29 16:16:46 +02:00
Nikita Popov
ff2b5bda59
Merge branch 'PHP-7.2' into PHP-7.3
2019-04-29 13:53:45 +02:00
Nikita Popov
5da0579259
Fixed bug #77945
...
Make sure that we proper distinguish between empty string key and
no key during SDL serialization.
2019-04-29 13:52:18 +02:00
Christoph M. Becker
7faaf5a89a
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix tests
2019-04-29 09:05:04 +02:00
Christoph M. Becker
9bf11045db
Fix tests
...
These tests are obviously meant to test successful and failing uri:
DSNs, but did not pass proper file:// URIs, so actually ended up
testing for invalid data source URIs twice. We fix this, and adjust
the expectations accordingly.
We also unfork the -win32 variant, since both test cases are almost
identical, and the expected error message may be either one.
2019-04-29 09:04:33 +02:00
Christoph M. Becker
06b130579e
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Make MySQLPDOTest::extractVersion() more liberal
2019-04-28 23:49:19 +02:00
Christoph M. Becker
fc9cdb723b
Make MySQLPDOTest::extractVersion() more liberal
...
MySQL/MariaDB version strings may have suffixes which may contain dots;
for instance, Debian stretch has 5.5.5-10.1.37-MariaDB-0+deb9u1 or
such. Therefore, we make the version extraction more liberal, and only
require that there are at least three parts separated by dot, and
ignore additional parts.
We also fix an erroneous test expectation, which would be triggered on
CI now, right away. This patch has been provided by petk@.
2019-04-28 23:48:27 +02:00
Peter Kokot
f83c207d60
Update NEWS
2019-04-28 00:51:18 +02:00
Peter Kokot
1bdd97a601
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS
Fix #77024 : SplFileObject::__toString() may return array
2019-04-28 00:50:54 +02:00
Peter Kokot
6d8892aacd
Update NEWS
2019-04-28 00:50:40 +02:00
Craig Duncan
91c6fb881e
Fix #77024 : SplFileObject::__toString() may return array
...
- Correct the behaviour of casting spl files to strings
- Add a test for Bug 77024
2019-04-28 00:44:48 +02:00
Christoph M. Becker
3309f2fbb9
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
PHP, meet MySQL
2019-04-27 19:22:10 +02:00
Christoph M. Becker
57d5dc5688
PHP, meet MySQL
...
All pdo_mysql tests are skipped on AppVeyor because "No such host is
known". We change the DSN to use semicolons instead of spaces to fix
that.
2019-04-27 19:21:51 +02:00
Christoph M. Becker
e561d4100b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77944 : Wrong meta pdo_type for bigint on LLP64
2019-04-27 18:47:32 +02:00
Christoph M. Becker
16609880f8
Fix #77944 : Wrong meta pdo_type for bigint on LLP64
...
When actually fetching the data, bigint (unsigned) column values are
returned as integers on LLP64 architectures, so their pdo_type has to
be PDO::PARAM_INT accordingly.
2019-04-27 18:46:27 +02:00
Christoph M. Becker
70239ea1d3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77940 : test using outdated mon_thousands_sep for Swedish
2019-04-25 23:29:03 +02:00
Christoph M. Becker
7ddfe73e69
Fix #77940 : test using outdated mon_thousands_sep for Swedish
...
Of course, we should expect a comma, not a period.
2019-04-25 23:28:41 +02:00
Christoph M. Becker
3e31ae5d70
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77940 : test using outdated mon_thousands_sep for Swedish
2019-04-25 19:40:05 +02:00
Christoph M. Becker
bfbfb9dabd
Fix #77940 : test using outdated mon_thousands_sep for Swedish
...
This time so that it works for all Windows 10 versions (hopefully).
2019-04-25 19:39:42 +02:00
Christoph M. Becker
dcba479848
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77940 : test using outdated mon_thousands_sep for Swedish
2019-04-25 08:59:09 +02:00
Christoph M. Becker
37ca6a7a2a
Fix #77940 : test using outdated mon_thousands_sep for Swedish
2019-04-25 08:58:13 +02:00
Christoph M. Becker
ad0acc0aa9
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77938 : socket_get_option error
2019-04-25 00:04:37 +02:00
Christoph M. Becker
fe202d99c8
Fix #77938 : socket_get_option error
...
Since tcp_socket/ssl streams are not representable, we suppress the
redirect to fix the test case.
2019-04-25 00:03:45 +02:00
Remi Collet
191e15309f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
news entry for litespeed
2019-04-24 09:46:06 +02:00
Remi Collet
5d21a15cc3
news entry for litespeed
2019-04-24 09:45:48 +02:00
Nikita Popov
68892410f7
Merge branch 'PHP-7.2' into PHP-7.3
2019-04-23 12:43:32 +02:00
Nikita Popov
4831e150c5
Fixed bug #77843
2019-04-23 12:43:07 +02:00
Nikita Popov
cedee4408b
Fixed bug #77931
2019-04-23 11:40:13 +02:00
George Wang
fb4c811835
Merge branch 'PHP-7.2' into PHP-7.3
2019-04-21 15:59:07 -04:00
George Wang
ce73841cdc
Improved LSAPI_End_Response_r() .
2019-04-21 15:04:54 -04:00
George Wang
ccf051c317
Fixed bug in litespeed_finish_request(), disable fastcgi_finish_request() alias for now.
2019-04-21 14:59:51 -04:00
Peter Kokot
0b8414832e
Update changelog
2019-04-20 19:13:06 +02:00
Peter Kokot
2549f7d220
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update changelog
Fix #77921 : static.php.net doesn't work anymore
2019-04-20 19:12:31 +02:00
Peter Kokot
295c66911f
Update changelog
2019-04-20 19:12:17 +02:00
Peter Kokot
4450288344
Fix #77921 : static.php.net doesn't work anymore
...
This embeds the PHP logo image in the FPM status HTML page instead of
using remote location. The phpinfo() output also uses such approach
and browser compatibility looks decent [1].
1: https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
2019-04-20 19:00:51 +02:00
Peter Kokot
d1bce98597
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update Git repository for Windows build tool kit
2019-04-19 21:11:01 +02:00
Peter Kokot
06fa35568e
Update Git repository for Windows build tool kit
2019-04-19 21:09:46 +02:00
Christoph M. Becker
fd4c42efab
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Use php-sdk-2.2.0beta5 on AppVeyor
2019-04-18 16:51:38 +02:00
Christoph M. Becker
a7ada30ac6
Use php-sdk-2.2.0beta5 on AppVeyor
2019-04-18 16:51:10 +02:00
Dmitry Stogov
3a04adce82
Check assert only when RC_DEBUG is enabled
2019-04-18 14:26:15 +03:00
Nikita Popov
b2f49c69b1
Add a dl() test to Travis
...
Compile the zend_test extension as shared and try loading it with dl()
to test for obvious issues. Doing this as a standalone call because this
is very specific to the CI setup.
2019-04-18 12:57:54 +02:00
Nikita Popov
e9aa0337ab
Fix more dl() interned string assertions
2019-04-18 12:14:07 +02:00
Dmitry Stogov
bfadd9fdaf
It's safe to keep old string if it's stored not in SHM.
2019-04-17 21:57:17 +03:00
Dmitry Stogov
ac12cc85aa
Fixed dl() function. It failed in DEBUG build without opcache because of assert during string interning.
2019-04-17 19:31:28 +03:00
Christoph M. Becker
f0ccd9ffc6
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77911 : Wrong warning for session.sid_bits_per_character
2019-04-17 17:24:15 +02:00
Christoph M. Becker
d20053a556
Fix #77911 : Wrong warning for session.sid_bits_per_character
2019-04-17 17:23:23 +02:00
Derick Rethans
6088713216
Merge branch 'PHP-7.2' into PHP-7.3
2019-04-17 09:40:18 +01:00
Ignace Nyamagana Butera
7b1a4e2400
Fixed bug #77909 : DatePeriod::__construct() with invalid recurrence count value
...
Improve error message on invalid reccurence count
Adding test when reccurence is -1
2019-04-17 09:39:03 +01:00
Christoph M. Becker
ec8457d982
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix tests for non English environments
2019-04-17 09:57:37 +02:00
Christoph M. Becker
6fe75f9e45
Fix tests for non English environments
2019-04-17 09:56:55 +02:00
Remi Collet
e90bce7f08
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
next is 7.2.19
2019-04-16 13:12:33 +02:00
Remi Collet
6c44a71e4a
next is 7.2.19
2019-04-16 13:11:23 +02:00
Nikita Popov
f9a755d0d2
Fix HT flags copying wrt iterator count
...
HT_FLAGS() includes the full flag word, including the iterator
count. When we're fully reassigning it, we need to make sure that
we either really do want to copy the iterator count (as in some
cases in array.c) or we need to mask only the actual flag byte.
Add an assert to hash_iterators_del() to make sure the iterator
count is non-zero (which is how I ran into this) and make sure that
the iterator count is correctly preserved during array splicing.
2019-04-16 12:14:45 +02:00
Christoph M. Becker
5ae49c43dc
Prepare main branch for PHP 7.3.6
2019-04-16 11:56:03 +02:00