diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-08-11 11:38:41 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-08-11 11:38:41 +0400 |
| commit | 4c716e8b516146f0a10b0b89078ccd096a8b4b7b (patch) | |
| tree | f1bf735d4233ce2bf87763f5acc51ae1f1a3d489 /ext/ftp | |
| parent | 0ae305e62dad7542f7917823dac967488bcaffe2 (diff) | |
| parent | 97bb078bddef9ad0921d886c75ce6a77206145e3 (diff) | |
| download | php-git-4c716e8b516146f0a10b0b89078ccd096a8b4b7b.tar.gz | |
Merge branch 'master' into test
* master: (39 commits)
Add __debugInfo() to UPGRADING.
fix TS build
Update NEWS
Update NEWS
Update NEWS
Small tidy ups and raise visibility of GitHub PR process
Bug #41631: Observe socket read timeouts in SSL streams
wrap int8_t and int16_t with #ifdef to avoid possible clashes
- Updated to version 2014.6 (2014f)
Removed Countable::count() change info from UPGRADE.INTERNALS too
NEWS and UPGRADING for intdiv()
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
Fixed skip case for intdiv 64-bit test
Use callback structure
Add EXPECTF
Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
5.5.17 now
5.4.33-dev now
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
...
Conflicts:
ext/fileinfo/libmagic/softmagic.c
main/streams/xp_socket.c
Diffstat (limited to 'ext/ftp')
| -rw-r--r-- | ext/ftp/ftp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index a6b1c7ad5e..30f8e1d1bb 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -136,7 +136,7 @@ ftp_open(const char *host, short port, long timeout_sec TSRMLS_DC) ftp->fd = php_network_connect_socket_to_host(host, (unsigned short) (port ? port : 21), SOCK_STREAM, - 0, &tv, NULL, NULL, NULL, 0 TSRMLS_CC); + 0, &tv, NULL, NULL, NULL, 0, STREAM_SOCKOP_NONE TSRMLS_CC); if (ftp->fd == -1) { goto bail; } |