delta/php-git.git/ext/ftp, branch microseconds

Merge branch 'PHP-7.0' into PHP-7.1

2016-08-30T11:45:49+00:00

Merge branch 'PHP-5.6' into PHP-7.0

2016-08-30T11:44:59+00:00

Test case for bug #72771

2016-08-30T11:44:34+00:00

Merge branch 'PHP-7.0' into PHP-7.1

2016-08-13T19:42:51+00:00

Merge branch 'PHP-5.6' into PHP-7.0

2016-08-13T19:41:00+00:00

Bug 70195

2016-08-13T19:35:03+00:00

Many FTP-S servers now require FTP clients to re-use the SSL session
from the control connection on the data connection, to prove that the
same entity controls both connections. This patch updates PHP's FTP-S
client code to allow that possibility.

Merge branch 'PHP-7.0' into PHP-7.1

2016-08-05T21:10:12+00:00

Merge branch 'PHP-5.6' into PHP-7.0

2016-08-05T21:09:30+00:00

Conflicts:
	ext/standard/ftp_fopen_wrapper.c

Fix #72764

2016-08-05T20:56:54+00:00

Negotiate data channel encryption after NLST command.
This is to prevent issues with IIS and ProFTPD.

Merge branch 'PHP-7.0' into PHP-7.1

2016-07-27T13:59:23+00:00