Merge branch 'PHP-8.0'

* PHP-8.0:
Fix #81302: Stream position after stream filter removed

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #81302: Stream position after stream filter removed

Fix #81302: Stream position after stream filter removed

When flushing the stream filters actually causes data to be written to
the stream, we need to update its position, because that is

Fix #81302: Stream position after stream filter removed

When flushing the stream filters actually causes data to be written to
the stream, we need to update its position, because that is not done by
the streams' write methods.

Closes GH-7354.

show more ...

Merge branch 'PHP-8.0'

* PHP-8.0:
Fix #81294: Segfault when removing a filter

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #81294: Segfault when removing a filter

Fix #81294: Segfault when removing a filter

We need to call the proper method.

Closes GH-7308.

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 ...

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.

Merge branch 'PHP-7.4'

* PHP-7.4:
Fix #76859 stream_get_line skips data if used with data-generating filter

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #76859 stream_get_line skips data if used with data-generating filter

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
Fix #76859 stream_get_line skips data if used with data-generating filter

Fix #76859 stream_get_line skips data if used with data-generating filter

stream_get-line repeatedly calls php_stream_fill_read_buffer until
enough data is accumulated in buffer. However

Fix #76859 stream_get_line skips data if used with data-generating filter

stream_get-line repeatedly calls php_stream_fill_read_buffer until
enough data is accumulated in buffer. However, when stream contains
filters attached to it, then each call to fill buffer essentially
resets buffer read/write pointers and new data is written over old.
This causes stream_get_line to skip parts of data from stream
This patch fixes such behavior, so fill buffer call will append.

show more ...

Remove mention of PHP major version in Copyright headers

Closes GH-4732.

Replace strncat in filter implementation

In this case we already know exactly where we need to write, no
need to use strncat at all.

Remove local variables

This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly

Remove local variables

This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly used by Vim and Emacs editors
yet with recent changes the once working definitions don't work
anymore in Vim without custom plugins or additional configuration.
Neither are these settings synced across the PHP code base.

A simpler and better approach is EditorConfig and fixing code
using some code style fixing tools in the future instead.

This patch also removes the so called modelines for Vim. Modelines
allow Vim editor specifically to set some editor configuration such as
syntax highlighting, indentation style and tab width to be set in the
first line or the last 5 lines per file basis. Since the php test
files have syntax highlighting already set in most editors properly and
EditorConfig takes care of the indentation settings, this patch removes
these as well for the Vim 6.0 and newer versions.

With the removal of local variables for certain editors such as
Emacs and Vim, the footer is also probably not needed anymore when
creating extensions using ext_skel.php script.

Additionally, Vim modelines for setting php syntax and some editor
settings has been removed from some *.phpt files. All these are
mostly not relevant for phpt files neither work properly in the
middle of the file.

show more ...

Remove yearly range from copyright notice

Remove unused Git attributes ident

The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
use

Remove unused Git attributes ident

The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
user who changed it.

In Git this functionality is different and can be done with Git attribute
ident. These need to be defined manually for each file in the
.gitattributes file and are afterwards replaced with 40-character
hexadecimal blob object name which is based only on the particular file
contents.

This patch simplifies handling of $Id$ keywords by removing them since
they are not used anymore.

show more ...

Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence.

year++

year++

Move constants into read-only data segment

Fixed memory leaks

Use interned strings for persistent stream wrappers and filters

Use per-request heap instead of system one

Remove superfluous allocation checks around ZMM-based functions