Skip to content

[pull] master from php:master #15

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

Merged
merged 7,622 commits into from
Mar 14, 2024
Merged

[pull] master from php:master #15

merged 7,622 commits into from
Mar 14, 2024

Conversation

pull[bot]
Copy link

@pull pull bot commented Feb 7, 2022

See Commits and Changes for more details.


Created by pull[bot]

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

@trafico-bot trafico-bot bot added the 🔍 Ready for Review Pull Request is not reviewed yet label Feb 7, 2022
@pull pull bot added ⤵️ pull and removed 🔍 Ready for Review Pull Request is not reviewed yet labels Feb 7, 2022
@trafico-bot trafico-bot bot added the 🔍 Ready for Review Pull Request is not reviewed yet label Feb 7, 2022
@dstogov dstogov force-pushed the master branch 2 times, most recently from 63c8ce8 to 7dc352e Compare October 11, 2023 06:58
@iluuu1994 iluuu1994 force-pushed the master branch 4 times, most recently from 49b8168 to 6d3d4df Compare October 13, 2023 09:46
nielsdos and others added 18 commits February 23, 2024 23:52
Now that ext/imap is unbundled, `libc-client-dev*` packages are no longer necessary.
This simplifies the check and defines the symbol with description.
When AC_DEFINE is called after some macro that has already defined the
symbol with description (help text), it can be called with two arguments
to make things easier.

[ci skip]
…streams_context

This was previously untested and the branch was not covered according to
codecov.
The value will always be overwritten.
The libtool --silent option for PHP build invocation is already set in
the configure.ac.
arnaud-lb and others added 27 commits March 11, 2024 15:13
* PHP-8.2:
  [ci skip] NEWS
  Fix GH-13508: JITed QM_ASSIGN may be optimized out when op1 is null (#13610)
* PHP-8.3:
  [ci skip] NEWS
  [ci skip] NEWS
  Fix GH-13508: JITed QM_ASSIGN may be optimized out when op1 is null (#13610)
The embed SAPI has been around for quite a while now, and many apps
already use it in production. It can be marked as non experimental to
avoid confusion.

[skip ci]
This was tested on OpenBSD sparc64 and all fiber related tests pass.
On OpenBSD stackghost prevents the modification of the return address
and therefor an extra trampoline is needed in make_fcontext(). This
should not matter on other OS implementing sysv ABI and the trampoline
should work there as well.

Close GH-13382.
This fixes two warnings when building litespeed SAPI:

```
.../php-src/sapi/litespeed/lscriu.c:312:14: warning:
'LSCRIU_Error_File_Name' defined but not used
[-Wunused-function]
  312 | static char *LSCRIU_Error_File_Name(char *pchFile, int max_len)
      |              ^~~~~~~~~~~~~~~~~~~~~~
.../php-src/sapi/litespeed/lscriu.c:102:12: warning:
's_criu_debug' defined but not used [-Wunused-variable]
  102 | static int s_criu_debug = 0;
      |            ^~~~~~~~~~~~
```
…ted comments (#13684)

- Remove a check for an always-true curl version check
- Remove a `TODO` comment for curl_version_info check that should be always available since libcurl 7.10
This now works in spec-compliant DOM.

Test by: greatwhitepine at bigfoot dot com
Signed-off-by: guoguangwu <[email protected]>
It's illegal to return from a bailout because that doesn't restore the
original bailout data. Return outside of it.

Test by YuanchengJiang

Closes GH-13689.
* PHP-8.2:
  Fix GH-13680: Segfault with session_decode and compilation error
* PHP-8.3:
  Fix GH-13680: Segfault with session_decode and compilation error
IR commit: 1d3df9f7dd82fe49001e714a4c31962387b526f6
…lt_status()` (#13690)

This is not just an issue due to missing initialization since moving the state
struct directly into the module globals. In earlier versions changing the mode
to `MT_RAND_PHP` within a single request would also affect the mode for
subsequent requests.

Original commit message follows:

This is a follow-up fix for GH-13579. The issue was detected in the nightly
MSAN build.

(cherry picked from commit bf0abd1)
* PHP-8.2:
  random: Initialize the `mode` field when seeding in `php_random_default_status()` (#13690)
* PHP-8.3:
  random: Initialize the `mode` field when seeding in `php_random_default_status()` (#13690)
normally should no longer need off64_t with glibc anyway.
to be more in line with the proper usage ; normally domain should not
be empty strings.

Close GH-13691
Strict error checking is always true for classes in "new DOM".
This means that we always throw an error when calling
`php_dom_throw_error`, and therefore the false return value is not
actually possible.
Also change the stub to reflect this.
In the same time, let's not verify implementation aliases since they may now legitimately differ from their aliased function/method counterparts (think about the ext/dom refactoring where e.g. many return type declarations have changed). Additionally, unnecessary `@no-verify` tags are cleaned up.
@pull pull bot merged commit 94d18cb into ConnectionMaster:master Mar 14, 2024
@trafico-bot trafico-bot bot added ✨ Merged Pull Request has been merged successfully and removed 🔍 Ready for Review Pull Request is not reviewed yet labels Mar 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull ✨ Merged Pull Request has been merged successfully
Projects
None yet
Development

Successfully merging this pull request may close these issues.