Skip to content
forked from php/php-src

sync #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 453 commits into from
Mar 24, 2022
Merged

sync #15

merged 453 commits into from
Mar 24, 2022

Conversation

chopins
Copy link
Owner

@chopins chopins commented Mar 24, 2022

No description provided.

iluuu1994 and others added 30 commits January 31, 2022 00:10
Closes GH-7847
Closes GH-7852

Previously stripos/stristr would lowercase both the haystack and the
needle to reuse strpos. The approach in this PR is similar to strpos.
memchr is highly optimized so we're using it to search for the first
character of the needle in the haystack. If we find it we compare the
remaining characters of the needle manually.

The new implementation seems to perform about half as well as strpos (as
two memchr calls are necessary to find the next candidate).
Fixes oss-fuzz #44222
* PHP-8.0:
  Fix memory leak
* PHP-8.1:
  Fix memory leak
* PHP-8.1:
  Prevent array modification if it's captured by user error handler during index conversion
* PHP-8.0:
  JIT: Fix register alloction (missed store)
* PHP-8.1:
  JIT: Fix register alloction (missed store)
* PHP-8.0:
  Bump for 8.0.17-dev
* PHP-8.1:
  Bump for 8.0.17-dev
Pull requests with the "Waiting on Author" label should still not be
closed if they have the RFC label as closing them requires manual
action. Also avoid closing "Waiting on Review".
* PHP-8.1:
  Bump for 8.1.4-dev
If an output handler has not yet been started, calling `ob_clean()`
causes it to start.  If that happens, we must not forget to set the
`Content-Encoding` and `Vary` headers.

Closes GH-7960.
* PHP-8.0:
  Fix GH-7953: ob_clean() only does not set Content-Encoding
* PHP-8.1:
  Fix GH-7953: ob_clean() only does not set Content-Encoding
Don't call fchmod(-1), which is not only wrong, but also clobbers
errno and sets it to EBADF, breaking the following errno access for
the log message.
`error: comparison of integer expressions of different signedness: ‘size_t’ {aka
‘long unsigned int’} and ‘long int’ [-Werror=sign-compare]`

This is asserting `end >= haystack` as a precondition for callers (in debug
builds) and existing callers are correct.

An alternate option is to cast the left side to `int64_t`, but that may be
slightly inefficient for 32-bit builds.
* PHP-8.0:
  Haiku fix ZTS build, disabling tls model
* PHP-8.1:
  Haiku fix ZTS build, disabling tls model
We need to reset the shift state right after conversion, to cater to
potenially following plain encodings.  Also, there is no need to reset
the shift for plain encodings, because these are not state-dependent.

Closes GH-8025.
* PHP-8.0:
  Fix GH-7980: Unexpected result for iconv_mime_decode
* PHP-8.1:
  Fix GH-7980: Unexpected result for iconv_mime_decode
Expand ZE to Zend Engine and remove Zend Engine version.
per Christoph M. Becker's comment for PR-8008.

Signed-off-by: Su, Tao <[email protected]>

Closes GH-8057.
dstogov and others added 29 commits March 18, 2022 18:54
* PHP-8.0:
  JIT: Fix missing exception handling
* PHP-8.1:
  JIT: Fix missing exception handling
attempts to map on addr but does not replace it if already present.
Note on OpenBSD it has no effect, addr is used just as a hint.

Closes GH-7923.
The "accelerator_enabled" flag has been checked already in the
previous "if".
FSF mailing address was changed long time ago. This patch updates that address. Also updated year from 2021 to 2022.

Closes GH-8009.
* updated details for filling bugs to GitHub Issue

* Remove superfluous word in README.md

* Link new issue page directly

Co-authored-by: Ilija Tovilo <[email protected]>
* Zend/zend_alloc: make zend_mm_use_huge_pages static

This is an internal variable and it should not be exported.

* Zend/zend_alloc: convert zend_mm_use_huge_pages to bool

* Zend/zend_alloc: convert has_free_pages to bool

* Zend/zend_alloc: convert empty to bool
Refer to interfaces/enums instead of classes in more places.

Closes GH-7792
Closes GH-8187
Fixes oss-fuzz #45658
* PHP-8.0:
  JIT: Fix memory leak
* PHP-8.1:
  JIT: Fix memory leak
Fixes oss-fuzz #45604
* PHP-8.0:
  JIT: Fix missing type store
* PHP-8.1:
  JIT: Fix missing type store
Fixes oss-fuzz #45590
* PHP-8.0:
  JIT: Fix register clobbering
* PHP-8.1:
  JIT: Fix register clobbering
Move the inside the __unserialize() method as that's the only one which now needs this check

Closes GH-8207
These APIs always returned SUCCESS.

Closes GH-8195
@chopins chopins merged commit adf3789 into chopins:master Mar 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.