diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-08-17 16:56:02 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-08-17 16:56:02 +0800 |
| commit | 3956deb1b20f8f7a9cabb3015cb3c9bb79fbf0be (patch) | |
| tree | 0ae6df1d0f133795c8254aa7a7dd57b1753dac2e /ext/ftp/php_ftp.c | |
| parent | ed9d916c28b042d276a28998f92eb7e6cc56025a (diff) | |
| parent | abe00908afa2b7227cfd601ee948ff3b57c27eb7 (diff) | |
| download | php-git-3956deb1b20f8f7a9cabb3015cb3c9bb79fbf0be.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #72853 (stream_set_blocking doesn't work)
Conflicts:
main/streams/plain_wrapper.c
Diffstat (limited to 'ext/ftp/php_ftp.c')
0 files changed, 0 insertions, 0 deletions