Merge branch 'PHP-7.1'

* PHP-7.1:
Detect invalid port in xp_socket parse ip address

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Detect invalid port in xp_socket parse ip address

Detect invalid port in xp_socket parse ip address

For historical reasons, fsockopen() accepts the port and hostname
separately: fsockopen('127.0.0.1', 80)

However, with the intr

Detect invalid port in xp_socket parse ip address

For historical reasons, fsockopen() accepts the port and hostname
separately: fsockopen('127.0.0.1', 80)

However, with the introdcution of stream transports in PHP 4.3,
it became possible to include the port in the hostname specifier:

fsockopen('127.0.0.1:80')
Or more formally: fsockopen('tcp://127.0.0.1:80')

Confusing results when these two forms are combined, however.
fsockopen('127.0.0.1:80', 443) results in fsockopen() attempting
to connect to '127.0.0.1:80:443' which any reasonable stack would
consider invalid.

Unfortunately, PHP parses the address looking for the first colon
(with special handling for IPv6, don't worry) and calls atoi()
from there. atoi() in turn, simply stops parsing at the first
non-numeric character and returns the value so far.

The end result is that the explicitly supplied port is treated
as ignored garbage, rather than producing an error.

This diff replaces atoi() with strtol() and inspects the
stop character. If additional "garbage" of any kind is found,
it fails and returns an error.

show more ...

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string

Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string

Update copyright headers to 2017

Update copyright headers to 2017

Update copyright headers to 2017

Remove Netware support

If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I can

Remove Netware support

If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.

show more ...

Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.

Merge branch 'PHP-7.0'

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
main/streams/xp_socket.c

Fixed bug #72439 (Stream socket with remote address leads to a segmentation fault)

Implement #51879 stream context socket option tcp_nodelay

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
Happy new year (Update copyright to 2016)

Happy new year (Update copyright to 2016)

Add support for IPV6_V6ONLY on sockets

Fixed bug #70198 Checking liveness does not work as expected

Revert "Revert "suggest parentheses around ‘&&’ within ‘||’""

This reverts commit ec1e8929c4e4c287d919945811475905e1391b7f.

Revert "suggest parentheses around ‘&&’ within ‘||’"

This reverts commit 4f2c0e045132de51473b643c68e07e5b2c2e218b.

suggest parentheses around ‘&&’ within ‘||’

add EAGAIN checks

EAGAIN and EWOULDBLOCK should be checked together and don't necessary,
have same value. So checking both is better for portability.

Fixed bug #70198 Checking liveness does not work as expected

bump year