[PHP-CVS] cvs: php-src /ext/standard ftp_fopen_wrapper.c

[Sara Golemon]

pollita         Mon Aug 25 18:25:33 2003 EDT

  Modified files:              
    /php-src/ext/standard       ftp_fopen_wrapper.c 
  Log:
  Bugfix#25239 Closing control stream while data stream is open violates RFC959 
section 2.3
  
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.60 
php-src/ext/standard/ftp_fopen_wrapper.c:1.61
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.60       Wed Aug 20 17:59:29 2003
+++ php-src/ext/standard/ftp_fopen_wrapper.c    Mon Aug 25 18:25:33 2003
@@ -18,7 +18,7 @@
    |          Sara Golemon <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.60 2003/08/20 21:59:29 pollita Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.61 2003/08/25 22:25:33 pollita Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -521,13 +521,6 @@
                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 @@
                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,

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php