php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
127,001 Commits 547 Branches 1,483 Tags
aad5fbac85afe8a497df4cdc17bd6c06bba8f1f4
Commit Graph

60987 Commits

Author SHA1 Message Date
Dmitry Stogov
aad5fbac85 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix type inference
 2022-05-16 12:42:04 +03:00
Dmitry Stogov
05375602a7 Fix type inference 
This fixes oss-fuzz #47422
 2022-05-16 12:41:25 +03:00
Jakub Zelenka
74f75db0c3 Fix bug #79589: ssl3_read_n:unexpected eof while reading 
The unexpected EOF failure was introduced in OpenSSL 3.0 to prevent
truncation attack. However there are many non complaint servers and
it is causing break for many users including potential majority
of those where the truncation attack is not applicable. For that reason
we try to keep behavior consitent with older OpenSSL versions which is
also the path chosen by some other languages and web servers.

Closes GH-8369
 2022-05-15 16:52:12 +01:00
Arnaud Le Blanc
33b8ef9958 Do not optimize out ini_get() when the entry does not exist during compilation (#8507) 
The entry may exist later if dl is enabled

Fixes GH-8466
 2022-05-13 12:39:29 +02:00
Arnaud Le Blanc
332bd03782 Do not optimize out ini_get() when the entry does not exist during compilation (#8507) 
The entry may exist later if dl is enabled

Fixes GH-8466
 2022-05-13 12:35:00 +02:00
Dmitry Stogov
6c25413183 Add JIT guards for INIT_FCALL instructions and functions that may be modified 
For methods we reuse mechanism of polymorphic calls.
For regular function we invalidate the whole root trace.

This fixes https://github.com/php/php-src/issues/8461
 2022-05-12 18:44:12 +03:00
Dmitry Stogov
84c1e99ecf Fix type inference 
This fizes oss-fuzz #47044
 2022-05-11 12:39:26 +03:00
Dmitry Stogov
f1fc58ed8d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix type inference
 2022-05-11 12:09:53 +03:00
Dmitry Stogov
3f1e1b9ddf Fix type inference 
This fixes oss-fuzz #47049
 2022-05-11 12:09:11 +03:00
Christoph M. Becker
e9e2cf0230 Fix test wrt. deprecation of float to int conversions 
Instead of passing `1073746742.75` to an int parameter, we just do the
calculation upfront (and round up), since the actual calculation does
not matter here anyway.
 2022-05-09 14:05:57 +02:00
Christoph M. Becker
8e688e0cf2 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix mysqli tests wrt. MySQL 8.0.28
 2022-05-09 10:57:30 +02:00
Christoph M. Becker
a7a590211e Fix mysqli tests wrt. MySQL 8.0.28 
As of MySQL 8.0.28, `utf8mb3` charset is reported by the server, but
mysqlnd doesn't support it yet.  As a stop-gap measure, we ignore that
charset for now.

Closes GH-8480.
 2022-05-09 10:55:32 +02:00
Arnaud Le Blanc
f07a08df5c Fix unregistering ini entries of dynamically loaded extension (#8435) 
Fixes GH-8185
 2022-05-06 15:25:44 +02:00
Derick Rethans
7670ee4342 Merge branch 'PHP-8.0' into PHP-8.1 2022-05-05 15:24:10 +01:00
Derick Rethans
92f8f19d50 Fixed GH-8471: Segmentation fault when converting immutable and mutable DateTime instances created using reflection 2022-05-05 12:10:50 +01:00
Christoph M. Becker
710294c9a5 Fix zend_test tests 
The `--EXTENSIONS--` directive isn't properly supported prior to PHP
8.1.0, so we use the classic `--SKIPIF--` instead.
 2022-05-04 11:29:08 +02:00
Máté Kocsis
510061b595 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix get_function_or_method_name when included file is scoped
 2022-05-03 21:36:42 +02:00
vajexal
74924ada93 Fix get_function_or_method_name when included file is scoped (#8467) 2022-05-03 21:34:01 +02:00
Christoph M. Becker
59272266ee Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix test for curl 7.83.0
 2022-05-03 15:08:43 +02:00
Christoph M. Becker
722e9b9fa5 Fix test for curl 7.83.0 
libcurl 7.83.0 removed some trailing exclamation marks from error
messages[1]; we have to cater to that.

[1] <6968fb9d54>

(cherry picked from commit a4179e4c92)
 2022-05-03 15:07:50 +02:00
Christoph M. Becker
e004e1a93b Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-8235: iterator_count() may run indefinitely
 2022-05-03 12:59:39 +02:00
Christoph M. Becker
ad7b9f4e50 Fix GH-8235: iterator_count() may run indefinitely 
We need to prevent integer overflow to eventually stop the iteration.

A test case doesn't appear sensible for this, because even on 32bit
architectures a respective test easily runs for a few minutes.

Closes GH-8447.
 2022-05-03 12:57:58 +02:00
Christoph M. Becker
7612ea8121 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix PDO URI test
 2022-05-03 12:43:14 +02:00
Michael Voříšek
136ef6f129 Fix PDO URI test 
Especially for remote servers, the respective part of the test may fail
for a lot of different reasons; instead of trying to catch all, we
rewrite to not fail, still testing for the contained NUL byte.

Closes GH-8451.
 2022-05-03 12:12:41 +02:00
Martin Rehberger
62a650ab7d bug: Fix type for $index in ZipArchive::replaceFile 2022-05-02 14:22:17 +02:00
Martin Rehberger
389d11308c bug: Fix type for $index in ZipArchive::replaceFile 2022-05-02 14:08:19 +02:00
Christoph M. Becker
c9fba10242 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix test XFAIL, update phar to use spl_autoload_register
 2022-05-02 14:00:19 +02:00
Michael Voříšek
60487621c1 Fix test XFAIL, update phar to use spl_autoload_register 
Closes GH-8449.
 2022-05-02 13:58:25 +02:00
Ilija Tovilo
1944c14ce7 Fix ReflectionProperty::__toString() of properties containing enums 
Fix GH-8444
 2022-04-28 19:48:23 +02:00
Derick Rethans
97ffd75b13 Merge branch 'PHP-8.0' into PHP-8.1 2022-04-26 17:57:55 +01:00
Derick Rethans
b461c4673b Use the new RETURN_THROWS() instead of just returning NULL 2022-04-26 17:57:47 +01:00
Derick Rethans
bc43e69822 Merge branch 'PHP-8.0' into PHP-8.1 2022-04-26 16:45:01 +01:00
Derick Rethans
87f341b1c2 Return early when the timezone info is NULL. 
The guess_timezone function does throw an error, but throwing an error doesn't
immediate make the PHP_FUNCTION return.

This check is really only necessary for distributions that patch PHP's timelib
to use system tzdata, but not correct enough to account for their
implementation to guarantee to return a timezone.
 2022-04-26 16:43:30 +01:00
Dmitry Stogov
e9d65c8e2b Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed tests
 2022-04-26 08:32:28 +03:00
Dmitry Stogov
3564eaff42 Fixed tests 2022-04-26 08:31:42 +03:00
Christoph M. Becker
e063243d2e Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-8218: ob_end_clean does not reset Content-Encoding header
 2022-04-25 14:29:44 +02:00
Christoph M. Becker
30f4c725cb Fix GH-8218: ob_end_clean does not reset Content-Encoding header 
The fix for GH-7953 introduced a regression by being to deliberate
adding the respective headers.  These must only be added, if the
handler starts, but is not finalizing.

Closes GH-8353.
 2022-04-25 14:26:56 +02:00
Dmitry Stogov
948ef10dd0 Fix ISSET_ISEMPTY_VAR missoptimization 
This fixes oss-fuzz #46909
 2022-04-25 13:31:01 +03:00
Dmitry Stogov
1aa5e9392d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Reorder optimization passes to avoid miss-optimization
 2022-04-25 13:09:31 +03:00
Dmitry Stogov
3b735456c6 Reorder optimization passes to avoid miss-optimization 2022-04-25 13:09:05 +03:00
Dmitry Stogov
e14dc15e13 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix type inference
 2022-04-25 12:17:07 +03:00
Dmitry Stogov
3e78964742 Fix type inference 
Use MAY_BE_NULL result (insted of empty) for ASSIGN_DIM with invalid arguments
This fixes oss-fuzz #46840
 2022-04-25 12:15:55 +03:00
Dmitry Stogov
2cff0e674d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix type narrowing warning during type inference of ZEND_FETCH_DIM_W
 2022-04-25 11:17:04 +03:00
Dmitry Stogov
8286de2fd3 Fix type narrowing warning during type inference of ZEND_FETCH_DIM_W 
Fixes oss-fuzz #45820
 2022-04-25 11:16:10 +03:00
Bob Weinand
ff6b813557 Merge branch 'PHP-8.0' into PHP-8.1 2022-04-24 18:04:37 +02:00
Bob Weinand
a74b865123 Add missing SKIPIF for new ext/ffi test 2022-04-24 18:02:46 +02:00
Bob Weinand
01b91cb3b1 Merge branch 'PHP-8.0' into PHP-8.1 2022-04-24 14:53:51 +02:00
Bob Weinand
2397e7685e Fix GH-8433: Assigning function pointers to structs in FFI leaks memory 2022-04-24 14:53:18 +02:00
Christoph M. Becker
1c0dc2a6c9 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-8364: msgfmt_format $values may not support references
 2022-04-24 12:45:22 +02:00
Christoph M. Becker
f5d9e7c031 Fix GH-8364: msgfmt_format $values may not support references 
We need to deref any references passed in the `$values` array.  While
we could handle this in the type switch, doing it right away in the
foreach loop makes that more explicit, and also circumvents the missing
range checks for integers which are not passed as int or double.

Closes GH-8407.
 2022-04-24 12:43:08 +02:00