mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-19 06:50:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
117,195 Commits 503 Branches 1,387 Tags 836 MiB
98bfad738a
Commit Graph

117195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wbender
98bfad738a Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree 
If CONTEXT_DOCUMENT_ROOT is set use that rather than DOCUMENT_ROOT to
scan up the dir tree looking for .user.ini files.

Closes GH-5051.
 2020-01-24 15:33:55 +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
Christoph M. Becker
5d65641011 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Yet another check for php_strip_tags_ex()
 2020-01-24 13:04:26 +01:00
Christoph M. Becker
372b678e56 Yet another check for php_strip_tags_ex() 2020-01-24 13:02:02 +01:00
Christoph M. Becker
1b7343b93c Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Yet another check for php_strip_tags_ex()
 2020-01-24 12:51:02 +01:00
Christoph M. Becker
6d57476fd7 Yet another check for php_strip_tags_ex() 2020-01-24 12:50:24 +01:00
Nikita Popov
1d0247db7d Merge branch 'PHP-7.4' 
* PHP-7.4:
  Don't use CRLF when generating diffs
 2020-01-24 12:28:54 +01:00
Nikita Popov
c6cf354a9a Don't use CRLF when generating diffs 2020-01-24 12:28:37 +01:00
Nikita Popov
c2d0a413cc Also use zend_memnrstr in mbfl_strpos 2020-01-24 11:42:54 +01:00
Nikita Popov
d504ad5717 Base mbfl_strpos on zend_memnstr 
The same algorithm is also used by zend_memnstr, but it also has
a fast-path for short strings / needles, where a more naive
search performs better.
 2020-01-24 11:29:34 +01:00
Nikita Popov
73b31302ed Extract calculation of offset from pointer 2020-01-24 11:15:58 +01:00
Nikita Popov
9e0e8d5650 Handle mb_str(r)ipos offset consistently as well 2020-01-24 10:54:20 +01:00
Nikita Popov
ce6169832f Move offset error checking into mbfl_strpos 
This avoids calculating the full length only in order to validate
the offset, as mbfl_strpos needs to find the offset internally
anyway.
 2020-01-24 10:50:02 +01:00
Nikita Popov
0f6d223ddb Add #defines for mbfl_strpos error conditions 2020-01-24 10:02:41 +01:00
Nikita Popov
e72bf63691 Allow variadic arguments to replace non-variadic ones 
Any number of arguments can be replaced by a variadic one, so
long as the variadic argument is compatible (in the sense of
contravariance) with the subsumed arguments.

In particular this means that function(...$args) becomes a
near-universal signature: It is compatible with any function
signature that does not accept parameters by-reference.

This also fixes bug #70839, which describes a special case.

Closes GH-5059.
 2020-01-23 15:23:31 +01:00
Nikita Popov
4da7e67d12 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix bug76348.phpt
 2020-01-23 15:09:59 +01:00
Nikita Popov
47b1a58e96 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug76348.phpt
 2020-01-23 15:09:54 +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
Nikita Popov
a2e4392439 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #78902
  Add unit test for bug #78902
 2020-01-23 14:58:15 +01:00
Nikita Popov
6489e29831 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #78902
  Add unit test for bug #78902
 2020-01-23 14:58:10 +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
60f62359a0 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #79151
 2020-01-23 14:21:21 +01:00
Nikita Popov
3f020aef85 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #79151
 2020-01-23 14:21:14 +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
George Peter Banyard
2b5fb76de6 Apply custom format/length modifier removal to spprintf 
This mimicks the changes made to the custom snprintf implementation
by removing the custom 'v' format and custom 'I' length modifier
from the spprintf implementation.

Closes GH-5108
 2020-01-23 13:45:28 +01:00
Christoph M. Becker
28e650abf8 Revert "Merge branch 'PHP-7.4'" 
This reverts commit 046dcfb531, due to
segfaults on Travis.  This needs to be investigated.
 2020-01-23 13:12:16 +01:00
Nikita Popov
9c23a50939 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #79155
 2020-01-23 12:55:59 +01:00
Nikita Popov
2eb33818b6 Fixed bug #79155 
Make sure we only unset the NULLABLE flag temporarily for class
resolution, as the same type may be compiled multiple types.
 2020-01-23 12:54:14 +01:00
Christoph M. Becker
a93ce58862 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Enable UBSan in addition to ASan
 2020-01-23 12:00:50 +01:00
Christoph M. Becker
ea3afcbae3 Enable UBSan in addition to ASan 
UBSan is a useful tool, so we enable it for `--enable-sanitizer` in
addition to ASan.
 2020-01-23 12:00:11 +01:00
Christoph M. Becker
046dcfb531 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Make MSVCRT memory leak checking usable for the test suite
 2020-01-23 11:48:20 +01:00
Christoph M. Becker
4130fe437a Make MSVCRT memory leak checking usable for the test suite 
While basic support for MSVCRT debugging has been added long
ago[1], the leak checking is not usable for the test suite, because we
are no longer calling `xmlCleanupParser()` on RSHUTDOWN of
ext/libxml[2], and therefore a few bogus leaks are reported whenever
ext/libxml is unloaded.

We therefore ignore memory leaks for this case.  We introduce
`ZEND_IGNORE_LEAKS_BEGIN()` and `ZEND_IGNORE_LEAKS_END()` to keep
those ignores better readable, and also because these *might* be
useful for other leak checkers as well.

We also explicitly free the `zend_handlers_table` and the `p5s` to
avoid spurious leak reports.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=d756e1db2324c1f4ab6f9b52e329959ce6a02bc3>
[2] <http://git.php.net/?p=php-src.git;a=commit;h=8742276eb3905eb97a585417000c7b8df85006d4>
 2020-01-23 11:47:20 +01:00
Stanislav Malyshev
a698e36aa8 Merge branch 'PHP-7.4' 
* PHP-7.4:
  More checks for php_strip_tags_ex
 2020-01-22 23:06:35 -08:00
Stanislav Malyshev
984d508825 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  More checks for php_strip_tags_ex
 2020-01-22 23:06:28 -08: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
George Peter Banyard
0719035f9d Add ValueError for invalid mode in count() 
Closes GH-5106
 2020-01-23 00:14:20 +01:00
Máté Kocsis
4281c2a989
Add UPGRADING notes [skip ci] 2020-01-22 23:24:50 +01:00
Benjamin Eberlei
7a52bf21d3 Add ReflectionProperty::getDefaultValue and ReflectionProperty::hasDefaultValue 2020-01-22 21:24:36 +01:00
Máté Kocsis
476636841f
Fix #78649 Provide ICU RELATIVE_ constants 
Closes GH-5105
 2020-01-22 19:59:40 +01:00