Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
Fix use after free

Fix use after free

This fixes oss-fuzz #47997

Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
Fix leak of invalid stream_read() return value

Fix leak of invalid stream_read() return value

Fixes oss-fuzz 6225190686687232 (part of #38542).

Fixed some spaces used instead of tabs

Update http->https in license (#6945)

1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as

Update http->https in license (#6945)

1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as 3.0 states "php 5.1.1, 4.1.1, and earlier".
3. In some license comments is "at through the world-wide-web" while most is without "at", so deleted.
4. fixed indentation in some files before |

show more ...

Replace zend_bool uses with bool

We're starting to see a mix between uses of zend_bool and bool.
Replace all usages with the standard bool type everywhere.

Of course, zend_bool

Replace zend_bool uses with bool

We're starting to see a mix between uses of zend_bool and bool.
Replace all usages with the standard bool type everywhere.

Of course, zend_bool is retained as an alias.

show more ...

Merge branch 'PHP-7.4' into master

* PHP-7.4:
Fix #76943: Inconsistent stream_wrapper_restore() errors

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #76943: Inconsistent stream_wrapper_restore() errors

Fix #76943: Inconsistent stream_wrapper_restore() errors

If restoring of any not registered built-in wrapper is requested, the
function is supposed to fail with a warning, so we have to

Fix #76943: Inconsistent stream_wrapper_restore() errors

If restoring of any not registered built-in wrapper is requested, the
function is supposed to fail with a warning, so we have to check this
condition first.

Furthermore, to be able to detect whether a built-in wrapper has been
changed, it is not sufficient to check whether *any* userland wrapper
has been registered, but rather whether the specific wrapper has been
modified.

Closes GH-6183.

show more ...

Refactor user streams to use ZPP class check

Closes GH-5876

Simplify user_stream_create_object

Remove no_separation flag

Remove proto comments from C files

Closes GH-5758

Avoid some unnecessary uses of no_separation=0

For the rare cases where references are part of the API,
construct them explicitly. Otherwise do not allow separation.

Remove unnecessary uses of CHECK_SILENT

If no error is passed, it is always silent.

Make error messages more consistent by fixing capitalization

Closes GH-5066 As a first step, let's capitalize their initial letter when it is applicable.

Use RETURN_THROWS() during ZPP in main, sapi, win32, and Zend

Merge branch 'PHP-7.4'

* PHP-7.4:
NEWS
Fix #78662: stream_write bad error detection

Fix #78662: stream_write bad error detection

Merge branch 'PHP-7.4'

Also check for exception after stream_eof

Merge branch 'PHP-7.4'

Report error if stream_read is not implemented

We need to return -1 in this case. Slightly restructure the code
to avoid unnecessary conditions.

Remove mention of PHP major version in Copyright headers

Closes GH-4732.