1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 08:58:28 +02:00
Commit Graph

130033 Commits

Author SHA1 Message Date
Ilija Tovilo 46d693b82f Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix ext section
2022-11-03 15:20:22 +01:00
Ilija Tovilo bca1e1f557 Fix ext section
Ugh, sorry.
2022-11-03 15:19:44 +01:00
Ilija Tovilo 4382c092c2 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix duplicate SKIPIF section
2022-11-03 15:18:44 +01:00
Ilija Tovilo d2c663441d Fix duplicate SKIPIF section 2022-11-03 15:18:13 +01:00
Ilija Tovilo b08901b63f Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Migrate i386 to GitHub actions
2022-11-03 14:37:59 +01:00
Ilija Tovilo ed1e703716 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Migrate i386 to GitHub actions
2022-11-03 14:37:17 +01:00
Ilija Tovilo 75970077b0 Migrate i386 to GitHub actions
Closes GH-9856
2022-11-03 14:34:54 +01:00
Ilija Tovilo cc9dddea38 Fix fake closure leaking when called from internal func
Introduced in 8e49d7f32f.

ZEND_CALL_RELEASE_THIS was previously not handled for internal calls but
just for user calls in the zend_leave_helper.

Closes GH-9884
2022-11-03 14:31:47 +01:00
Martin Schröder fdd088fc81 Properly deal with internal attributes used on promoted properties.
Closes GH-9661
2022-11-03 14:29:22 +01:00
Bob Weinand 8e49d7f32f Delay releasing closures until after observer end 2022-11-02 16:55:13 +01:00
Bob Weinand 4935e10fc8 Fix hardcoded paths in test 2022-11-02 16:02:16 +01:00
Bob Weinand b30448f48f Fix observing inherited internal functions
Fixes GH-9871
2022-11-02 15:33:04 +01:00
Christoph M. Becker 79d4fdad52 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix potential NULL pointer dereference Windows shm*() functions
2022-11-02 14:54:48 +01:00
Christoph M. Becker 8bf6266e65 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix potential NULL pointer dereference Windows shm*() functions
2022-11-02 14:53:30 +01:00
Christoph M. Becker d1c9ff5642 Fix potential NULL pointer dereference Windows shm*() functions
`shm_get()` (not to be confused with `shmget()`) returns `NULL` if
reallocation fails; we need to cater to that when calling the function.

Closes GH-9872.
2022-11-02 14:51:59 +01:00
Christoph M. Becker 1e3915c8c7 Fix GH-9829: Bug in refactoring Windows shmat() function
`shm->addr` cannot be `NULL` here, so the whole check is completely
pointless.

Given that this is merely a clean-up and not an actual bug fix, we do
without a NEWS entry.

Closes GH-9873.
2022-11-02 14:05:36 +01:00
Florian Sowade 8dabbda8bc Don’t reset func in zend_closure_internal_handler
The pointer is used in _zend_observe_fcall_begin().
2022-11-02 11:46:43 +01:00
Derick Rethans 605136204e Updated to version 2022.6 (2022f) 2022-11-02 09:43:40 +00:00
Derick Rethans 271361d44a Empty merge 2022-11-02 09:43:40 +00:00
Derick Rethans bee083e2b8 Updated to version 2022.6 (2022f) 2022-11-02 09:43:39 +00:00
Derick Rethans 65f31a49cd Empty merge 2022-11-02 09:43:39 +00:00
Derick Rethans 2b5bed904e Updated to version 2022.6 (2022f) 2022-11-02 09:43:37 +00:00
Derick Rethans e821773aaa Merge branch 'PHP-8.1' into PHP-8.2 2022-10-31 15:03:14 +00:00
Derick Rethans 1e9b2700a3 Merge branch 'PHP-8.0' into PHP-8.1 2022-10-31 15:03:06 +00:00
Derick Rethans 4f2955c179 Merge branch 'PHP-7.4' into PHP-8.0 2022-10-31 15:02:56 +00:00
Derick Rethans 004cb82750 Bumb versions 2022-10-31 15:02:21 +00:00
Dmitry Stogov 482ae71fda Fix memory leak 2022-10-31 12:20:28 +03:00
Jakub Zelenka 22f25532ed Merge branch 'PHP-8.1' into PHP-8.2 2022-10-30 17:02:32 +00:00
Jakub Zelenka a04a021105 Merge branch 'PHP-8.0' into PHP-8.1 2022-10-30 17:02:08 +00:00
Jakub Zelenka 8229649045 Fix GH-9770: Add small timeout in status-listen test
This is to allow more time to switch for active to idle in scoreboard as
it seems that Travis is quite short on resources and might not switch it
quickly enough.
2022-10-30 17:00:40 +00:00
Máté Kocsis 721e604a69 Do not display the value of UNKNOWN constants in the manual (#9843) 2022-10-30 14:58:16 +01:00
Jakub Zelenka eb9cf18703 Merge branch 'PHP-8.1' into PHP-8.2 2022-10-30 11:46:06 +00:00
Jakub Zelenka 29f7c4613e Merge branch 'PHP-8.0' into PHP-8.1 2022-10-30 11:43:11 +00:00
Jakub Zelenka 1c5844aa3e Fix GH-9754: SaltStack hangs when running php-fpm 8.1.11
SaltStack uses Python subprocess and redirects stderr to stdout which is
then piped to the returned output. If php-fpm starts in daemonized mode,
it should close stderr. However a fix introduced in GH-8913 keeps stderr
around so it can be later restored. That causes the issue reported in
GH-9754. The solution is to keep stderr around only when php-fpm runs in
foreground as the issue is most likely visible only there. Basically
there is no need to restore stderr when php-fpm is daemonized.
2022-10-30 11:41:33 +00:00
Tim Düsterhus 7f0b228f48 Fix pre-PHP 8.2 compatibility for php_mt_rand_range() with MT_RAND_PHP (#9839)
* Fix pre-PHP 8.2 compatibility for php_mt_rand_range() with MT_RAND_PHP

As some left-over comments indicated:

> Legacy mode deliberately not inside php_mt_rand_range()
> to prevent other functions being affected

The broken scaler was only used for `php_mt_rand_common()`, not
`php_mt_rand_range()`. The former is only used for `mt_rand()`, whereas the
latter is used for `array_rand()` and others.

With the refactoring for the introduction of ext/random `php_mt_rand_common()`
and `php_mt_rand_range()` were accidentally unified, thus introducing a
behavioral change that was reported in FakerPHP/Faker#528.

This commit moves the checks for `MT_RAND_PHP` from the general-purpose
`range()` function back into `php_mt_rand_common()` and also into
`Randomizer::getInt()` for drop-in compatibility with `mt_rand()`.

* [ci skip] NEWS for `MT_RAND_PHP` compatibility
2022-10-28 16:52:43 +02:00
Kamil Tekiela 0db2e666a5 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Add NEWS entry for #9841
2022-10-28 11:25:51 +01:00
Kamil Tekiela bce12f4e57 Add NEWS entry for #9841 2022-10-28 11:23:37 +01:00
Kamil Tekiela 646b8f6b5c Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Add NEWS entry for #9841
  Add a temporary fix for insufficient buffer size in mysqlnd (#9835)
  mysqli_query throws warning despite using silenced error mode (#9842)
2022-10-27 18:34:14 +01:00
Kamil Tekiela ec1f58c871 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Add NEWS entry for #9841
  Add a temporary fix for insufficient buffer size in mysqlnd (#9835)
  mysqli_query throws warning despite using silenced error mode (#9842)
2022-10-27 18:31:38 +01:00
Kamil Tekiela 96049867d8 Add NEWS entry for #9841
Closes GH-9841
2022-10-27 18:29:17 +01:00
Kamil Tekiela e713a8e8e5 Add a temporary fix for insufficient buffer size in mysqlnd (#9835) 2022-10-27 18:25:17 +01:00
Kamil Tekiela 5b60370906 mysqli_query throws warning despite using silenced error mode (#9842) 2022-10-27 18:24:28 +01:00
George Peter Banyard a27ae67c0f Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Add missing EXTENSION section to tests
2022-10-27 14:42:17 +01:00
George Peter Banyard a4acba9e52 Add missing EXTENSION section to tests 2022-10-27 14:39:43 +01:00
Ilija Tovilo 1d6b32f65c Remove unnecessary ast eval bailout
We can just reset the filename_override to NULL in php_request_shutdown.

Closes GH-9805
2022-10-27 10:54:59 +02:00
Remi Collet 9bf61d6577 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  move CVEs in 8.1.12 changelog
2022-10-26 17:10:47 +02:00
Remi Collet c84d7cc27e move CVEs in 8.1.12 changelog 2022-10-26 17:10:29 +02:00
Remi Collet 86e18a9fe7 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  move CVEs in 8.0.25 changelog
2022-10-26 15:28:03 +02:00
Remi Collet 9c7234b24d Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  move CVEs in 8.0.25 changelog
2022-10-26 15:27:42 +02:00
Remi Collet db28ee8fd0 move CVEs in 8.0.25 changelog 2022-10-26 15:27:23 +02:00