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

[Sara Golemon]

pollita         Sat Jul 24 00:14:26 2004 EDT

  Modified files:              
    /php-src/ext/standard       ftp_fopen_wrapper.c 
  Log:
  Oh by the way, only use proxy mode for reading...
  
http://cvs.php.net/diff.php/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.76&r2=1.77&ty=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.76 
php-src/ext/standard/ftp_fopen_wrapper.c:1.77
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.76       Sat Jul 24 00:01:48 2004
+++ php-src/ext/standard/ftp_fopen_wrapper.c    Sat Jul 24 00:14:26 2004
@@ -18,7 +18,7 @@
    |          Sara Golemon <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.76 2004/07/24 04:01:48 pollita Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.77 2004/07/24 04:14:26 pollita Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -384,12 +384,6 @@
        int allow_overwrite = 0;
        int read_write = 0;
 
-       if (context &&
-               php_stream_context_get_option(context, "ftp", "proxy", &tmpzval) == 
SUCCESS) {
-               /* Use http wrapper to proxy ftp request */
-               return php_stream_url_wrap_http(wrapper, path, mode, options, 
opened_path, context STREAMS_CC TSRMLS_CC);
-       }
-
        tmp_line[0] = '\0';
 
        if (strpbrk(mode, "r+")) {
@@ -410,6 +404,18 @@
                /* No mode specified? */
                php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Unknown file 
open mode.");
                return NULL;
+       }
+
+       if (context &&
+               php_stream_context_get_option(context, "ftp", "proxy", &tmpzval) == 
SUCCESS) {
+               if (read_write == 1) {
+                       /* Use http wrapper to proxy ftp request */
+                       return php_stream_url_wrap_http(wrapper, path, mode, options, 
opened_path, context STREAMS_CC TSRMLS_CC);
+               } else {
+                       /* ftp proxy is read-only */
+                       php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "FTP 
proxy may only be used in read mode");
+                       return NULL;
+               }
        }
 
        stream = php_ftp_fopen_connect(wrapper, path, mode, options, opened_path, 
context, &reuseid, &resource, &use_ssl, &use_ssl_on_data TSRMLS_CC);

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