php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 11:32:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
126,989 Commits 547 Branches 1,483 Tags
f1fc58ed8dc5807cbe90de1b1573671ec99dd89f
Commit Graph

126989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitry Stogov
b1b79c74fb Fix memory leak 
This fixes oss-fuzz #47088
 2022-05-11 11:43:01 +03:00
Jakub Zelenka
82eea0efc9 Merge branch 'PHP-8.0' into PHP-8.1 2022-05-10 21:39:31 +01:00
Jakub Zelenka
23a2030438 Fix bug #72185: php-fpm writes empty fcgi record causing nginx 502 
This issue might happen if there is change of the fcgi stream when
the buffer is full. Then the empty record is created which signals
end of stream which is incorrect.

The actual fix without a test was contributed by GitHub user @loveharmful
in GH-3198.
 2022-05-10 21:36:55 +01: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
Martin Vobruba
b388e951b8 Fix build with Valgrind without I_REPLACE_SONAME_FNNAME_ZU symbol 
Fixes #8453

Signed-off-by: George Peter Banyard <girgias@php.net>
 2022-05-07 16:45:03 +01:00
Arnaud Le Blanc
a82ee8e38b [ci skip] NEWS 2022-05-06 18:21:11 +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
b2be88954b Merge branch 'PHP-8.0' into PHP-8.1 2022-05-05 15:25:43 +01:00
Derick Rethans
95f5f9d21d Adding missing NEWS entry 2022-05-05 15:25:35 +01:00
Derick Rethans
7670ee4342 Merge branch 'PHP-8.0' into PHP-8.1 2022-05-05 15:24:10 +01:00
Derick Rethans
dadc8431a4 Merged pull request #8497 2022-05-05 15:24:07 +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
ec921305bd [ci skip] Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix zend_test tests
 2022-05-04 11:32:39 +02: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
Remi Collet
861b81b8f3 [ci skip] NEWS 2022-05-02 14:51:54 +02:00
Remi Collet
8ed93dab9d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  [ci skip] NEWS
  bug: Fix type for $index in ZipArchive::replaceFile
 2022-05-02 14:51:38 +02:00
Remi Collet
2d4cc0eb83 [ci skip] NEWS 2022-05-02 14:50:16 +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
Jakub Zelenka
1e4dcbfc0b Merge branch 'PHP-8.0' into PHP-8.1 2022-04-29 20:47:56 +01:00
Jakub Zelenka
82dae61c04 Move FPM ACS fix NEWS entry to 8.0.20 2022-04-29 20:46:38 +01:00
Jakub Zelenka
e28e0ad35e Update NEWS entry with correct version for FPM ACL fix 2022-04-29 20:43:50 +01:00
Jakub Zelenka
0332b62c35 Merge branch 'PHP-8.0' into PHP-8.1 2022-04-29 20:41:13 +01:00
David CARLIER
ef06f0f50b Fix FPM ACL build check on MacOS 
MacOS has got ACL support but without user/group support.
 2022-04-29 20:39:22 +01:00
Ilija Tovilo
1944c14ce7 Fix ReflectionProperty::__toString() of properties containing enums 
Fix GH-8444
 2022-04-28 19:48:23 +02:00
Jakub Zelenka
21d551ad0f Merge branch 'PHP-8.0' into PHP-8.1 2022-04-27 19:14:47 +01:00
Jakub Zelenka
0df28869f6 Add skip for FPM resource heavy tests 2022-04-27 19:11:47 +01:00
Ben Ramsey
fb819faa4e Prepare for PHP 8.1.7 2022-04-26 19:22:15 -05: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
Christoph M. Becker
4c0639df1c Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Haiku fix ZTS build disabling `tsrm_ls_cache` usage.
 2022-04-26 14:18:02 +02:00
David Carlier
4bb0dd49d8 Haiku fix ZTS build disabling tsrm_ls_cache usage. 2022-04-26 14:16:38 +02:00
Christoph M. Becker
990a8cd09c [ci skip] Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Prepare for PHP 8.0.20
 2022-04-26 10:48:17 +02:00
Gabriel Caruso
52a18a6620 Prepare for PHP 8.0.20 2022-04-26 10:17:50 +02:00