1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Commit Graph

130368 Commits

Author SHA1 Message Date
Bob Weinand
cd7e98a82b Merge branch 'PHP-8.2' 2022-11-02 16:02:38 +01:00
Bob Weinand
4935e10fc8 Fix hardcoded paths in test 2022-11-02 16:02:16 +01:00
George Peter Banyard
fb114bf45b Only use FCC for libxml entity loader callback 2022-11-02 14:52:54 +00:00
George Peter Banyard
d105958603 Only use FCC for SQLite3 user defined authorizer 2022-11-02 14:52:54 +00:00
George Peter Banyard
37aea43eed Only use FCC for SQLite3 user defined collations 2022-11-02 14:52:54 +00:00
George Peter Banyard
29bb426933 Only use FCC for SQLite3 user defined functions 2022-11-02 14:52:54 +00:00
George Peter Banyard
8d5d3fd035 Refactor SPL Callback filter to only use FCC 2022-11-02 14:52:54 +00:00
George Peter Banyard
de4cfff5f6 Add various APIs to handle FCC structures 2022-11-02 14:52:54 +00:00
George Peter Banyard
7c45b95894 Store a reference to closures in the FCC 2022-11-02 14:52:54 +00:00
Bob Weinand
98646e3e21 Merge branch 'PHP-8.2' 2022-11-02 15:33:17 +01:00
Bob Weinand
b30448f48f Fix observing inherited internal functions
Fixes GH-9871
2022-11-02 15:33:04 +01:00
Christoph M. Becker
d672c0430f Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix potential NULL pointer dereference Windows shm*() functions
2022-11-02 14:55:34 +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
a27c41a98f Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix GH-9829: Bug in refactoring Windows shmat() function
2022-11-02 14:05:54 +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
Christoph M. Becker
b2199f9559 Merge branch 'PHP-8.2'
* PHP-8.2:
  Don’t reset func in zend_closure_internal_handler
2022-11-02 14:02:34 +01:00
Kamil Tekiela
3508b07bd6 Tidy up buffer preparation in mysqlnd (#9834) 2022-11-02 12:06:03 +00: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
dfc760b6bc Updated to version 2022.6 (2022f) 2022-11-02 09:43:41 +00:00
Derick Rethans
9de7ac64d4 Empty merge 2022-11-02 09:43:41 +00: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
Pedro Nacht
0574e1e903 labeler.yml: set top-level read-only permissions (#9862) 2022-11-01 19:24:49 +01:00
George Peter Banyard
c0f2727e55 Use zend_call_known_function() in ext-mysqli instead of building FCI/FCC 2022-10-31 22:33:39 +00:00
George Peter Banyard
4f8d10791b Use zend_call_known_function() in ext-pgsql instead of building FCI/FCC 2022-10-31 22:33:24 +00:00
David CARLIER
4c4e72f149 socket add socket_atmark support.
checks whether the socket belongs to the out-of-band mark, thus allows to be
 processed accordingly (using the MSG_OOB flag on send/recv).

Closes #9846.
2022-10-31 16:38:18 +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
fd6d2ccfcb Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix memory leak
2022-10-31 12:22:40 +03:00
Dmitry Stogov
482ae71fda Fix memory leak 2022-10-31 12:20:28 +03:00
Jakub Zelenka
e00dadf43a Merge branch 'PHP-8.2' 2022-10-30 17:02:58 +00: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
Dominic H
e4a1b80a5f Match FPM status pool's expose_php with parent
If an installed php.ini turns expose_php on/off, and an FPM pool
overrides that with php_flag[expose_php]=off/on, a status pool
created with pm.status_listen in a pool config will have its expose_php
reflect the php.ini value, and not the pool config's override.

This change looks for an override set in
php_flag/php_value/php_admin_flag/php_admin_value and carries that
through.
2022-10-30 15:40:58 +00:00
Máté Kocsis
a14e125baf Merge branch 'PHP-8.2'
* PHP-8.2:
  Do not display the value of UNKNOWN constants in the manual (#9843)
2022-10-30 14:58:58 +01: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
6be16f644d Merge branch 'PHP-8.2' 2022-10-30 11:48:47 +00: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
5989953efb Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix pre-PHP 8.2 compatibility for php_mt_rand_range() with MT_RAND_PHP (#9839)
2022-10-28 16:53:18 +02: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