Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from php:master #440

Open
wants to merge 10,000 commits into
base: master
Choose a base branch
from
Open

[pull] master from php:master #440

wants to merge 10,000 commits into from

Conversation

pull[bot]
Copy link

@pull pull bot commented Dec 4, 2021

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

bukka and others added 20 commits November 8, 2024 16:44
* PHP-8.4:
  [skip ci] Fix array_any() and array_all() descriptions
* PHP-8.4:
  [skip ci] Fix typo in test name
On NixOS we run `make` & `make check` inside `ext/soap` which broke the test
like this:

    001+ Fatal error: Uncaught SoapFault exception: [WSDL] SOAP-ERROR: Parsing WSDL: Couldn't load from 'ext/soap/tests/gh15711.wsdl' : failed to load "ext/soap/tests/gh15711.wsdl": No such file or directory
    002+  in /build/php-8.3.13/ext/soap/tests/gh15711.php:29
    003+ Stack trace:
    004+ #0 /build/php-8.3.13/ext/soap/tests/gh15711.php(29): SoapClient->__construct('ext/soap/tests/...', Array)
    005+ #1 {main}
    006+   thrown in /build/php-8.3.13/ext/soap/tests/gh15711.php on line 29

Fix is to make the path dependant on `__DIR__` as it's the case in other
testcases including WSDLs.

Closes GH-16733.
* PHP-8.3:
  ext/soap: fix `make check` being invoked in `ext/soap`
* PHP-8.4:
  ext/soap: fix `make check` being invoked in `ext/soap`
When passing an array, the key entry can get converted to a string if it
is an object, but this actually modifies the original array entry.
The test originally outputted:

```
array(2) {
  [0]=>
  string(...) => ...
  [1]=>
  string(0) ""
}
```

This is unexpected. Use zval_try_get_string() to prevent this behaviour.

Closes GH-16693.
* PHP-8.2:
  Fix memory leak in php_openssl_pkey_from_zval()
  Fix various memory leaks related to openssl exports
  Prevent unexpected array entry conversion when reading key
* PHP-8.3:
  Fix memory leak in php_openssl_pkey_from_zval()
  Fix various memory leaks related to openssl exports
  Prevent unexpected array entry conversion when reading key
* PHP-8.4:
  Fix memory leak in php_openssl_pkey_from_zval()
  Fix various memory leaks related to openssl exports
  Prevent unexpected array entry conversion when reading key
cmb69 and others added 30 commits November 20, 2024 13:54
* PHP-8.4:
  Make MySQLnd protocol stmt test work on 32bit
There are compile errors with 8.4 that we are no longer fixing.
* PHP-8.1:
  [skip ci] Don't test mysqli with libmysqlclient 8.4
* PHP-8.2:
  [skip ci] Don't test mysqli with libmysqlclient 8.4
* PHP-8.3:
  [skip ci] Don't test mysqli with libmysqlclient 8.4
* PHP-8.4:
  [skip ci] Don't test mysqli with libmysqlclient 8.4
* PHP-8.1:
  Move FreeBSD build to GitHub actions with QEMU
* PHP-8.2:
  [skip ci] Add --no-progress to FreeBSD build
  Move FreeBSD build to GitHub actions with QEMU
* PHP-8.3:
  [skip ci] Add --no-progress to FreeBSD build
  Move FreeBSD build to GitHub actions with QEMU
* PHP-8.4:
  Enable -Werror for FreeBSD build
  [skip ci] Add --no-progress to FreeBSD build
  Move FreeBSD build to GitHub actions with QEMU
While the test obviously succeeds on Windows, it may occasionally
conflict with file_put_contents_variation7-win32.phpt[1], so we skip it
like we do for many other of these tests which have win32 pendants.

[1] <https://github.com/php/php-src/actions/runs/11527743659/job/32093951818>

Closes GH-16722.
* PHP-8.2:
  Skip file_put_contents_variation7.phpt on Windows
* PHP-8.3:
  Skip file_put_contents_variation7.phpt on Windows
* PHP-8.4:
  Skip file_put_contents_variation7.phpt on Windows
There doesn't seem to be a thread post-startup hook that runs after
zend_startup_cb() that could be used for this

this fix is similar to accel_startup_ok() as seen here: https://github.com/php/php-src/blob/fc1db70f106525e81f9a24539340b7cf2e82e844/ext/opcache/ZendAccelerator.c#L2631-L2634

Closes GH-16853.
* PHP-8.2:
  Fix GH-16851: JIT_G(enabled) not set correctly on other threads
* PHP-8.3:
  Fix GH-16851: JIT_G(enabled) not set correctly on other threads
* PHP-8.4:
  Fix GH-16851: JIT_G(enabled) not set correctly on other threads
This reverts commit ae62779, reversing
changes made to 19e685e.

This was a bad merge; I'll have a look shortly.
* PHP-8.4:
  Revert "Merge branch 'PHP-8.3' into PHP-8.4"
This reverts commit 83ca374, and
fixes the previous bad merge.
* PHP-8.4:
  Reapply "Merge branch 'PHP-8.3' into PHP-8.4"
Allows to select an alternate TCP stack. For example with RACK,
a fast loss detection relying on timestamp per packet.

While it works system-wide, it can also apply in an individual socket level too.

close GH-16842
It seems at one point these were (partially) rewritten, changing their
meaning. This patch fixes this.
* PHP-8.4:
  [ci skip] UPGRADING fixes (#16893)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.