Merge branch 'PHP-8.0'

* PHP-8.0:
Fix #80880: SSL_read on shutdown, ftp/proc_open

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #80880: SSL_read on shutdown, ftp/proc_open

Fix #80880: SSL_read on shutdown, ftp/proc_open

When `SSL_read()` after `SSL_shutdown()` fails with `SSL_ERROR_SYSCALL`,
we should not warn about this, because it is likely caused by the

Fix #80880: SSL_read on shutdown, ftp/proc_open

When `SSL_read()` after `SSL_shutdown()` fails with `SSL_ERROR_SYSCALL`,
we should not warn about this, because it is likely caused by the peer
having closed the connection without having sent a close_notify
shutdown alert.

Signed-off-by: Christoph M. Becker <cmbecker69@gmx.de>

Closes GH-6803.

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

Remove some unnecessary HAVE_EXTNAME guards

A recurring pattern in old extension: Putting the whole source
code behind HAVE_EXTNAME. This is pointless, as the code is only
compiled i

Remove some unnecessary HAVE_EXTNAME guards

A recurring pattern in old extension: Putting the whole source
code behind HAVE_EXTNAME. This is pointless, as the code is only
compiled if the extension is enabled.

This removes a couple of them, but not all.

show more ...

Remove proto comments from C files

Closes GH-5758

Merge branch 'PHP-7.4'

* PHP-7.4:
Fix #55857: ftp_size on large files

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #55857: ftp_size on large files

Fix #55857: ftp_size on large files

`atol()` returns a `long` which is not the same as `zend_long` on
LLP64; we use `ZEND_ATOL()` instead.

There is no need for a new test case,

Fix #55857: ftp_size on large files

`atol()` returns a `long` which is not the same as `zend_long` on
LLP64; we use `ZEND_ATOL()` instead.

There is no need for a new test case, since filesize_large.phpt already
tests for that behavior; unfortunately, the FTP test suite relies on
`pcntl_fork()` and therefore cannot be run on Windows.

show more ...

Fix [-Wundef] warning in FTP extension

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.

Remove mention of PHP major version in Copyright headers

Closes GH-4732.

Merge branch 'PHP-7.2' into PHP-7.3

Fix bug #77124

This is a backport of 6fcae63f614d1ed4aaeaff7b13a7a4627b1f1312
to PHP 7.2.

Fix SSL_CTX leak in ftp extension

SSL_CTX is a refcounted structure, which will be held by the SSL
handle, so we can free it here.

Avoid uninit warning in ftp

Merge branch 'PHP-7.3' into PHP-7.4

Merge branch 'PHP-7.2' into PHP-7.3

Fix FTPS passive mode of data channel event poll

Bugfix: when using passive mode of FTPS protocol, data channel events
should be polled when creating data connection channel, instead of

Fix FTPS passive mode of data channel event poll

Bugfix: when using passive mode of FTPS protocol, data channel events
should be polled when creating data connection channel, instead of polling
the event of ftp's self control channel, which may cause ftp transfer
problem while using ftps and passive mode.

show more ...

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

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
NEWS
NEWS
Fix #77151 ftp_close(): SSL_read on shutdown

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
NEWS
Fix #77151 ftp_close(): SSL_read on shutdown

Fix #77151 ftp_close(): SSL_read on shutdown

Regression introduced in fix for #76972

only display the error message when sslerror
or if errno is set (for SSL_ERROR_SYSCALL case)

Trim trailing whitespace in source code files