63761d1133
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fixed incorrect overflow detection
2020-02-27 23:38:19 +03:00
cb88184420
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fixed incorrect overflow detection
2020-02-27 23:38:09 +03:00
5b51b633e2
Fixed incorrect overflow detection
2020-02-27 23:37:41 +03:00
819a872cfa
Avoid more null arithmetic
2020-02-27 14:48:43 +01:00
5a90392c6a
Use EX_NUM_TO_VAR() in more places
...
Not sure why I missed these before.
2020-02-27 13:13:24 +01:00
1949a26aac
Remove more null arithmetic UB
...
Introduce an EX_NUM_TO_VAR macro to mirror EX_VAR_TO_NUM and
replace usages of the ZEND_CALL_VAR_NUM(NULL) pattern.
2020-02-27 12:54:48 +01:00
3ae04b05f5
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Add upgrading node regarding fix for bug #79271
2020-02-27 10:39:07 +01:00
ac2382d437
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Add upgrading node regarding fix for bug #79271
2020-02-27 10:37:52 +01:00
84854a72c7
Remove mergesort implementation
...
php_mergesort() isn't being used for anything, and hasn't been for
a long time. Even if we wanted to use a stable sort, this isn't
the implementation we'd use...
2020-02-27 10:36:01 +01:00
49762c84e0
Add upgrading node regarding fix for bug #79271
...
Cf. <https://github.com/php/php-src/pull/5180#issuecomment-590259750 >ff.
2020-02-27 10:33:20 +01:00
0427ef91a6
Avoid null arithmetic UB in EX_VAR_TO_NUM
2020-02-27 10:30:16 +01:00
4786207ecc
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fixed incorrect behavior of internal memory debugger
2020-02-27 12:28:09 +03:00
d9f56903ad
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fixed incorrect behavior of internal memory debugger
2020-02-27 12:27:58 +03:00
45b4368d5c
Fixed incorrect behavior of internal memory debugger
2020-02-27 12:27:22 +03:00
30d18b8ced
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix #64032 : mysqli reports different client_version
2020-02-27 09:40:31 +01:00
78e04759ad
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix #64032 : mysqli reports different client_version
2020-02-27 09:39:13 +01:00
8654c32b58
Fix #64032 : mysqli reports different client_version
...
While `mysqli_get_client_version()` calls `mysql_get_client_version()`
to retrieve the client version, `mysql::$client_version` is initialized
to `MYSQL_VERSION_ID`. Both should match though, and since the former
is the more useful information, we fix `mysql::$client_version`.
We do not add a regression test, because it would usually succeed
anyway, and we already have several tests with respective `assert()`s.
2020-02-27 09:35:04 +01:00
a51c98e696
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Add test for bug #60161
2020-02-26 16:48:41 +01:00
8c8f8c4193
Add test for bug #60161
...
This has been fixed in PHP 7.4, let's make sure it stays fixed.
2020-02-26 16:48:03 +01:00
960318ed95
Change argument error message format
...
Closes GH-5211
2020-02-26 15:00:08 +01:00
c7094d8926
Fix mbstring regex variable types to correspond to Oniguruma
...
The beginning and ending of a Oniguruma Regex are stored in a OnigRegion (which is a typedef to the Oniguruma re_registers struct) as as int* therefore change the type from size_t to int
Closes GH-5196
2020-02-26 11:24:03 +01:00
b35b0142e6
Require all internal functions to have arginfo
2020-02-26 10:05:20 +01:00
8d30d5f269
Add stubs for COMPersistHelper
2020-02-26 10:00:08 +01:00
1fdc53bc96
Remove deprecated capture_session_meta OpenSSL stream context
...
Closes GH-5200
2020-02-26 03:09:13 +01:00
81fee9f29f
Get rid of method mapping of BreakIterator classes
2020-02-25 23:05:24 +01:00
bcb7847139
Add stubs for Intl BreakIterator
...
Closes GH-5207
2020-02-25 23:05:03 +01:00
d594fba3ac
Reorder checks in object ref assignment
...
First check for IS_INDIRECT and de-indirect it directly there.
Handle the error cases later.
2020-02-25 17:30:54 +01:00
b4c74c54b2
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix #63206 : Fully support error/exception_handler stacking, even with null or inside the handler
2020-02-25 12:44:26 +01:00
1e50c81f6f
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix #63206 : Fully support error/exception_handler stacking, even with null or inside the handler
2020-02-25 12:44:11 +01:00
8c6a7c3326
Fix #63206 : Fully support error/exception_handler stacking, even with null or inside the handler
...
Always push the current user_error/exception_handler to the stack,
even when it is empty, so restore_error_handler() always works as
expected.
The user_error_handler is especially temporarily empty when we are inside
the error handler, which caused inconsistent behaviour before.
2020-02-25 12:43:42 +01:00
98ad4d3b5b
Give arginfo to SplFileInfo::_bad_state_ex()
...
We should really get rid of this hack though... Wow!
2020-02-25 11:18:25 +01:00
631c6e7f78
Add missing zend_test stubs
2020-02-25 11:18:15 +01:00
fabe6a310c
Add ext/mysqli stubs
...
Closes GH-4913.
2020-02-25 11:06:46 +01:00
aa79a22d32
Add preg_last_error_msg() function
...
Provides the last PCRE error as a human-readable message, similar
to functionality existing in other extensions, such as
json_last_error_msg().
Closes GH-5185.
2020-02-25 10:26:03 +01:00
bb6e2a1615
Avoid used of "named fn" in ext/standard
2020-02-25 10:21:31 +01:00
7956866ff4
Fix macro-expansion issues in ZEND_FE and friends
...
I noticed that we have various places where we work around macros
conflicting with PHP function names. Rather than require this,
fix our ZEND_FE etc macros to avoid pre-scan macro expansion.
This requires duplicating the ZEND_FN/ZEND_MN macros in places,
but that seems like a reasonable tradeoff.
2020-02-25 10:21:31 +01:00
16897aacce
Remove unnecessary checks in breakpoint iterator
...
The result of Z_INTL_BREAKITERATOR_P() cannot be NULL. This type
of macro in general can never be NULL.
2020-02-25 10:06:13 +01:00
a939805641
Use serialize_precision for var_dump()
...
var_dump() is debugging functionality, so it should print
floating-point numbers accurately. We do this by switching
to serialize_precision, which (by default) will print with
as much precision as necessary to preserve the exact value
of the float.
This also affects debug_zval_dump().
Closes GH-5172.
2020-02-25 09:51:32 +01:00
c3aa9132d6
Fix argon2 test if provided by sodium
2020-02-24 21:34:37 +01:00
7fc29c9924
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Enable ext/sodium in CI
Add skipif for argon2id in test
2020-02-24 12:41:49 +01:00
2d15845ae1
Enable ext/sodium in CI
2020-02-24 12:41:30 +01:00
6c0a33f2dc
Add skipif for argon2id in test
...
If argon2i is provided by libargon, then argon2id may not be
available here.
2020-02-24 12:41:24 +01:00
f69bad872a
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Don't treat any WS as start of header
2020-02-24 10:20:49 +01:00
c5128fb7fc
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Don't treat any WS as start of header
2020-02-24 10:20:43 +01:00
56cdbe63c2
Don't treat any WS as start of header
...
Check that the header occurs after \n, not other whitespace
characters.
2020-02-24 10:20:33 +01:00
e40b744b78
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Reduce code duplication in HTTP header checks
2020-02-24 10:07:28 +01:00
8d451fd24e
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Reduce code duplication in HTTP header checks
2020-02-24 10:03:30 +01:00
3d9c02364d
Reduce code duplication in HTTP header checks
2020-02-24 10:03:05 +01:00
cc704f5bb6
Reduce code duplication in HTTP header checks
2020-02-24 09:58:29 +01:00
ce2abdd42e
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fixes #79265 : Improper injection of Host header when using fopen for http requests
2020-02-24 09:51:55 +01:00
Dmitry Stogov