Máté Kocsis
cffff1fb03
Merge branch 'PHP-7.4'
...
* Fix #78666 mysqli_options generates Warning on var_dump()
2020-01-28 18:51:00 +01:00
Máté Kocsis
d39edebbce
Fix #78666 mysqli_options generates Warning on var_dump()
...
Closes GH-5121
2020-01-28 18:44:02 +01:00
Nikita Popov
38d205a5b1
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix memory leak in mb_str_split
2020-01-28 17:40:07 +01:00
Nikita Popov
9fcaf25c93
Fix memory leak in mb_str_split
2020-01-28 17:39:49 +01:00
Nikita Popov
7d3a6e7149
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix mysqli_get_warnings() with multi queries
2020-01-28 17:17:07 +01:00
Nikita Popov
8a5bc8c6be
Fix mysqli_get_warnings() with multi queries
...
In this case warning_count may be non-zero, but php_get_warnings()
may still return no warnings. In this case we should return false
rather than returning a corrupted mysqli_warning object.
2020-01-28 17:13:43 +01:00
Christoph M. Becker
0563dfee1b
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix #79174 : cookie values with spaces fail to round-trip
2020-01-28 15:37:51 +01:00
Christoph M. Becker
addc3c92f2
Fix #79174 : cookie values with spaces fail to round-trip
...
The fix for bug #78929 disabled the conversion of spaces in cookie
values to plus signs, but failed to adapt `php_setcookie()`
accordingly, so that it uses raw URL encoding as well.
2020-01-28 15:37:01 +01:00
Nikita Popov
7db3a51884
Only fetch to_encoding once in mb_convert_encoding()
...
Instead of doing it on every conversion. This is both more efficient
and avoids generating multiple warnings.
2020-01-28 15:12:24 +01:00
Nikita Popov
b0d7b126a2
Make BG(syslog_device) per request
...
This is not supposed to be retained across requests. Explicitly
free it at the end of a request, and use the per-request allocator.
2020-01-28 14:44:52 +01:00
Christoph M. Becker
3b9e822e11
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Enable support for LIBZIP_VERSION
2020-01-28 13:35:20 +01:00
Christoph M. Becker
d7052765ed
Enable support for LIBZIP_VERSION
...
This is already supported by non Windows builds for libzip >= 1.3.1,
and since we're using at least libzip 1.4.0 on Windows, we should
support it there as well.
2020-01-28 13:34:07 +01:00
Nikita Popov
648f16c2ec
Fix rel_date leak on DateInterval construction failure
2020-01-28 13:11:49 +01:00
Nikita Popov
2342c06584
Throw an exception if default_dir not set, but required
...
Previously the RETURN_THROWS() assertion failed for this case.
2020-01-28 12:35:35 +01:00
Remi Collet
d91abf76e0
zip: fix lib check
2020-01-28 11:32:42 +01:00
Remi Collet
ac9a265f01
- bump zip extension version to 1.16.0 - add ZipArchive::setMtimeName and ZipArchive::setMtimeIndex methods
2020-01-28 10:53:49 +01:00
Christoph M. Becker
9a5ea0de69
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix #76584 : PharFileInfo::decompress not working
2020-01-28 10:40:00 +01:00
Christoph M. Becker
e197f65b35
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix #76584 : PharFileInfo::decompress not working
2020-01-28 10:33:10 +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
Christoph M. Becker
7e5a8d9faa
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix #79172 : STRUCT_OFFSET() relies on undefined behavior
2020-01-28 09:19:45 +01:00
Christoph M. Becker
412b476b7f
Fix #79172 : STRUCT_OFFSET() relies on undefined behavior
...
Since this pattern is understood by compilers, not a real issue, but
certainly cleaner this way.
2020-01-28 09:18:05 +01:00
Tyson Andre
5f92a085cc
Convert ZEND_ECHO operand to string after sccp
...
And filter out echoes of the empty string (e.g. false/null)
Split out of #5097 (on GitHub)
Closes GH-5118
2020-01-27 20:21:24 -05:00
George Peter Banyard
9a76a2a032
Convert some warnings into ValueErrors in the standard file extension
...
Closes GH-5007
2020-01-27 23:20:40 +01:00
Remi Collet
cb1b26ac9c
Merge branch 'PHP-7.4'
...
* PHP-7.4:
- bump zip extension version to 1.15.6 - add ZipArchive::LIBZIP_VERSION - skip bug53885.phpt with libzip 1.6.0 (empty file is no more valid archive)
2020-01-27 16:48:54 +01:00
Remi Collet
5215f072af
- bump zip extension version to 1.15.6
...
- add ZipArchive::LIBZIP_VERSION
- skip bug53885.phpt with libzip 1.6.0 (empty file is no more valid archive)
2020-01-27 16:47:28 +01:00
Nikita Popov
8dd91f52a5
Remove state pointer argument from php_strip_tags
2020-01-27 16:13:36 +01:00
Máté Kocsis
d6a6a60ef9
Merge branch 'PHP-7.4'
2020-01-27 14:04:19 +01:00
Máté Kocsis
ea1b878877
Fix #78969 Make PASSWORD_DEFAULT match PASSWORD_BCRYPT instead of being null
...
It was an unintentional BC break.
2020-01-27 13:57:00 +01:00
Nikita Popov
16f194c75e
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix bug #78323 : Code 0 is returned on invalid options
2020-01-27 13:32:51 +01:00
Nikita Popov
1cccbb8ff1
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix bug #78323 : Code 0 is returned on invalid options
2020-01-27 13:32:38 +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
Christoph M. Becker
2fe86669c9
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Add CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0
2020-01-26 14:14:52 +01:00
Christoph M. Becker
41e1891e0c
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Add CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0
2020-01-26 14:13:52 +01:00
Florian Smeets
b836d9cdc1
Add CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0
2020-01-26 14:12:53 +01:00
Anatol Belski
378010a120
Fix bundled PCRE2 compilation on ARM64
2020-01-25 17:44:18 +01:00
Anatol Belski
52d07834df
Upgrade bundled PCRE2 to 10.34
2020-01-25 13:37:37 +01:00
George Peter Banyard
ba82e18755
Allow empty needle in mb_strrchr()
2020-01-25 12:22:01 +01:00
George Peter Banyard
986da2a436
Convert warnings to ValueError in mb_strpos function family.
...
Closes GH-5109
2020-01-24 23:59:22 +01:00
Nikita Popov
ebd00c5b65
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fixed bug #79128
2020-01-24 16:20:30 +01:00
Nikita Popov
3291891408
Fixed bug #79128
...
We need to extend the hash table before performing raw append
operations.
This doesn't matter if preloading happens in the same process,
as the tables will be large enough to hold all entries as a
side-effect of the preloading process. However, if preloading
happens in a different process, we need to reserve space here.
2020-01-24 16:18:48 +01:00
Nikita Popov
9b9436d9b0
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix mysqli ssl test for tls1.3
2020-01-24 15:15:36 +01:00
Nikita Popov
c14df824d1
Fix mysqli ssl test for tls1.3
...
Specifying AES256-SHA results in TLS_AES_256_GCM_SHA384 if the
connection uses TLS v1.3.
2020-01-24 15:14:52 +01:00
Nikita Popov
dc6ede092f
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fixed bug #79011
Fix memory leaks in mysqlnd debug functionality
2020-01-24 14:55:00 +01:00
Nikita Popov
bb5cdd9b74
Fixed bug #79011
...
auth_plugin_data_len here is 21, including the trailing null byte.
Directly use SCRAMBLE_LENGTH instead. Also add a sanity check that
the provided scramble is long enough.
2020-01-24 14:54:46 +01:00
Nikita Popov
555567468a
Fix memory leaks in mysqlnd debug functionality
2020-01-24 14:54:46 +01:00
Christoph M. Becker
c8eceba2c7
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Make test independent of online XSD schema
Yet another check for php_strip_tags_ex()
2020-01-24 14:20:59 +01:00
Christoph M. Becker
1ea5d2e5ad
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Make test independent of online XSD schema
Yet another check for php_strip_tags_ex()
2020-01-24 14:19:17 +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
Remi Collet
a1d3f999c1
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Add ZipArchive::CM_LZMA2 constant (since libzip 1.6.0)
2020-01-24 14:06:38 +01:00
Remi Collet
b9dff1160e
Add ZipArchive::CM_LZMA2 constant (since libzip 1.6.0)
2020-01-24 14:06:19 +01:00