php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
127,250 Commits 549 Branches 1,486 Tags
cf1664e91d64ff8c7d3b15d72541b1c0d5fd5704
Commit Graph

127250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker cf1664e91d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-9155: dba_open("non-existing", "c-", "flatfile") segfaults
 2022-07-27 12:13:32 +02:00
Christoph M. Becker a442e29485 Fix GH-9155: dba_open("non-existing", "c-", "flatfile") segfaults 
We must not assume that the lock file has been opened.

Closes GH-9156.
 2022-07-27 12:08:36 +02:00
Christoph M. Becker 7d36703a8f Initialize blacklist_path_length 
For some reason, GCC warns[1]:

| ‘blacklist_path_length’ may be used uninitialized in this function
| [-Werror=maybe-uninitialized]

This looks like a false positive to me, but it doesn't hurt to
explicitly initialize the variable.

[1] <https://github.com/php/php-src/runs/7502212969?check_suite_focus=true>

Closes GH-9129.
 2022-07-25 19:10:42 +02:00
Christoph M. Becker 4834cfea1a Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-9033: Loading blacklist file can fail due to negative length
 2022-07-25 16:32:18 +02:00
Christoph M. Becker 35fd97c3c9 Fix GH-9033: Loading blacklist file can fail due to negative length 
If the blacklist file contains a line with a single double-quote, we
called `zend_strndup(pbuf, -1)` what causes an unnecessary bail out;
instead we just ignore that line.

If the blacklist file contains an empty line, we may have caused an OOB
read; instead we just ignore that line.

Closes GH-9036.
 2022-07-25 16:30:19 +02:00
Dmitry Stogov d50875c822 Fix type inference 
Fixes oss-fuzz #49423 and #49474
 2022-07-25 15:53:06 +03:00
Dmitry Stogov e70d282077 JIT: Fix missing type stote 
Fixes oss-fuzz #49402
 2022-07-25 15:24:26 +03:00
Dmitry Stogov cc465ba0bb Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix memory leak
 2022-07-25 12:08:00 +03:00
Dmitry Stogov 44b86aee31 Fix memory leak 
Fixes oss-fuzz #49272
 2022-07-25 12:04:46 +03:00
Derick Rethans 0ae9942801 Merge remote-tracking branch 'derickr/timelib-2021-15-sync' into PHP-8.1 2022-07-22 13:07:28 +01:00
Derick Rethans 7831a1cae6 Add test case for GH-8964 2022-07-22 13:06:32 +01:00
Derick Rethans 0d3061d225 Import timelib 2021.15 2022-07-22 13:06:32 +01:00
Ilija Tovilo 5c10aa43c2 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix spl test cleanup
 2022-07-21 17:21:18 +02:00
Ilija Tovilo 3962f00b01 Fix spl test cleanup 2022-07-21 17:20:30 +02:00
Ilija Tovilo 37b351ba94 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Re-add MSAN in nightly
 2022-07-21 16:51:17 +02:00
Ilija Tovilo ad136e6a6d Re-add MSAN in nightly 
This was lost when migrating to GitHub actions. I'll move this one to
GitHub as well at a later point.
 2022-07-21 16:49:52 +02:00
George Peter Banyard 6cdfaf97e0 Update NEWS 2022-07-21 14:09:27 +01:00
George Peter Banyard c7a0439d60 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix memory leak in LMDB driver
 2022-07-21 14:08:40 +01:00
George Peter Banyard 5b83b3a933 Fix memory leak in LMDB driver 2022-07-21 14:05:48 +01:00
Derick Rethans 3edf93d7ee Update NEWS 2022-07-21 12:34:45 +01:00
Derick Rethans b66b04dde4 Merge remote-tracking branch 'derickr/timelib-sync-tests' into PHP-8.1 2022-07-21 12:29:13 +01:00
Derick Rethans 557e02bf9f Merge timelib 2021.14 2022-07-21 12:11:42 +01:00
Derick Rethans 355995735b Fixed diff, again 2022-07-21 12:11:42 +01:00
Derick Rethans 37d460b64a Fixed #81263: Wrong result from DateTimeImmutable::diff 2022-07-21 12:11:42 +01:00
Derick Rethans cc9c57722a Fixed GH-8730: DateTime::diff miscalculation is same time zone of different type 2022-07-21 12:11:42 +01:00
Derick Rethans eea2283693 Merge timelib 2021.13 2022-07-21 11:42:35 +01:00
Christoph M. Becker c2bdaa48e1 Fix GH-9008: mb_detect_encoding(): wrong results with null $encodings 
Passing `null` to `$encodings` is supposed to behave like passing the
result of `mb_detect_order()`.  Therefore, we need to remove the non-
encodings from the `elist` in this case as well.  Thus, we duplicate
the global `elist`, so we can modify it.

Closes GH-9063.
 2022-07-20 16:58:55 +02:00
Christoph M. Becker d430652935 Fix --CGI-- support of run-tests.php 
The `--CGI--` section is supposed to be just a marker, and to be empty
as such.  However, a previous refactoring[1] broke that.

[1] <https://github.com/php/php-src/commit/9140c9038a83ff55a78f357f8485de086d83d94e>

Closes GH-9061.
 2022-07-20 14:41:28 +02:00
Patrick Allaert 9af3327176 PHP-8.1 is now for PHP 8.1.10-dev 2022-07-20 06:48:52 +02:00
Christoph M. Becker 32d55f7422 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-9017: php_stream_sock_open_from_socket could return NULL
 2022-07-19 17:07:27 +02:00
Heiko Weber 3b7babf9b3 Fix GH-9017: php_stream_sock_open_from_socket could return NULL 
Closes GH-9020.
 2022-07-19 17:06:02 +02:00
Christoph M. Becker aa1fa8cabf Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Prepare for PHP 8.0.23
  Revert "FPM: Downgrade occasional "failed to acquire scoreboard" warning"
 2022-07-19 17:00:05 +02:00
Gabriel Caruso a670d2be74 Prepare for PHP 8.0.23 2022-07-19 10:31:08 +02:00
David CARLIER 9a8ae45c4b Revert "FPM: Downgrade occasional "failed to acquire scoreboard" warning" 
This reverts commit 3040f75f43.
 2022-07-18 14:21:54 +01:00
David CARLIER 2a5b2cca85 Revert "FPM: Downgrade occasional "failed to acquire scoreboard" warning" 
This reverts commit 3040f75f43.
 2022-07-18 14:21:07 +01:00
David Carlier edb173c200 Merge branch 'PHP-8.0' into PHP-8.1 2022-07-18 12:40:47 +01:00
Felix Wiedemann 3040f75f43 FPM: Downgrade occasional "failed to acquire scoreboard" warning 
With request timeouts configured, php-fpm occasionally prints the
following warning:

   WARNING: failed to acquire scoreboard

This is happens when php-fpm checks the child scoreboards for timeouts,
but fails to acquire a lock immediately.  As this can (and does) occur
during normal operation, this commit downgrades this to a notice.
Closes #9019.
 2022-07-18 12:40:16 +01:00
Dmitry Stogov 82d3ad64df Fix type inference 
Fixes oss-fuzz #48908
 2022-07-18 14:20:06 +03:00
Arnaud Le Blanc 4b38779a48 [ci skip] NEWS 2022-07-18 12:35:24 +02:00
Arnaud Le Blanc f2381ae4ba Fix JIT crash with large number of match/switch arms (#8961) 
Switch statements may generate a large number of exit points. Once the max
number of exit points is reached, get_exit_addr() returns NULL. This was not
checked, and this resulted in a jump table with some 0 addresses.
 2022-07-18 12:34:20 +02:00
Dmitry Stogov b734d45626 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix type inference for FETCH_DI_UNSET
 2022-07-18 13:15:03 +03:00
Dmitry Stogov bd30eff5de Fix type inference for FETCH_DI_UNSET 
Fixes oss-fuzz #48507
 2022-07-18 13:14:15 +03:00
David Carlier f15cfba39b Merge branch 'PHP-8.0' into PHP-8.1 2022-07-15 12:48:09 +01:00
David CARLIER d830a1f6f0 random extension macOs handling update. 
Not such as fix but taking more precautions.
Indeed, the arc4random has two little flaws in this platform,
one already caught upfront by the extension (ie size 0), also
internal use of ccrng_generate which can silently fail in few rare
cases.

Closes #7824.
 2022-07-15 12:43:43 +01:00
Arnaud Le Blanc aadb24e817 Merge branch 'PHP-8.0' into PHP-8.1 2022-07-15 13:15:05 +02:00
Arnaud Le Blanc 20473374fa [ci skip] NEWS 2022-07-15 13:14:17 +02:00
Tobias Bachert ede92a86f2 Fix WeakMap object reference offset causing TypeError (#8995) 2022-07-15 13:00:48 +02:00
David Carlier b44a17c02a Merge branch 'PHP-8.0' into PHP-8.1 2022-07-14 12:13:21 +01:00
guoyiyuan 789a37f144 Prevent potential buffer overflow for large value of php_cli_server_workers_max 
Fixes #8989.
Closes #9000.
 2022-07-14 12:12:25 +01:00
Christoph M. Becker 5a459f6783 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-8923: error_log on Windows can hold the file write lock
 2022-07-12 13:38:35 +02:00