summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSara Golemon <pollita@php.net>2003-08-25 22:25:33 +0000
committerSara Golemon <pollita@php.net>2003-08-25 22:25:33 +0000
commita76f0dc8aeed3afcfa9d0317872cfd04bb1d7456 (patch)
treec86ff05aae6c0d82ec83e6e642b790d1d4267752
parent92e321294cdeb0f12d569fcbd88d0ee3074e272e (diff)
downloadphp-git-a76f0dc8aeed3afcfa9d0317872cfd04bb1d7456.tar.gz
Bugfix#25239 Closing control stream while data stream is open violates RFC959 section 2.3
-rw-r--r--ext/standard/ftp_fopen_wrapper.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index b586bc8e16..0edcd28a1c 100644
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -521,13 +521,6 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch
goto errexit;
}
- /* close control connection if not in ssl mode */
- if (!use_ssl) {
- php_stream_write_string(stream, "QUIT\r\n");
- php_stream_close(stream);
- stream = NULL;
- }
-
php_stream_context_set(datastream, context);
php_stream_notify_progress_init(context, 0, file_size);
@@ -685,13 +678,6 @@ php_stream * php_stream_ftp_opendir(php_stream_wrapper *wrapper, char *path, cha
goto opendir_errexit;
}
- /* close control connection if not in ssl mode */
- if (!use_ssl) {
- php_stream_write_string(stream, "QUIT\r\n");
- php_stream_close(stream);
- stream = NULL;
- }
-
php_stream_context_set(datastream, context);
if (use_ssl_on_data && (php_stream_xport_crypto_setup(stream,