iliaa           Sun Apr 16 16:55:25 2006 UTC

  Modified files:              
    /php-src/ext/standard       http_fopen_wrapper.c 
  Log:
  MFB51: Fixed bug #37045 (Fixed check for special chars for http redirects).
  
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.113&r2=1.114&diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.113 
php-src/ext/standard/http_fopen_wrapper.c:1.114
--- php-src/ext/standard/http_fopen_wrapper.c:1.113     Wed Apr 12 22:40:56 2006
+++ php-src/ext/standard/http_fopen_wrapper.c   Sun Apr 16 16:55:25 2006
@@ -19,7 +19,7 @@
    |          Sara Golemon <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
  */
-/* $Id: http_fopen_wrapper.c,v 1.113 2006/04/12 22:40:56 pollita Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.114 2006/04/16 16:55:25 iliaa Exp $ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -691,10 +691,11 @@
        }       \
 }      \
                        /* check for control characters in login, password & 
path */
-                       CHECK_FOR_CNTRL_CHARS(resource->user)
-                       CHECK_FOR_CNTRL_CHARS(resource->pass)
-                       CHECK_FOR_CNTRL_CHARS(resource->path)
-
+                       if (strncasecmp(newpath, "http://";, sizeof("http://";) - 
1) || strncasecmp(newpath, "https://";, sizeof("https://";) - 1) {
+                               CHECK_FOR_CNTRL_CHARS(resource->user)
+                               CHECK_FOR_CNTRL_CHARS(resource->pass)
+                               CHECK_FOR_CNTRL_CHARS(resource->path)
+                       }
                        stream = php_stream_url_wrap_http_ex(wrapper, new_path, 
mode, options, opened_path, context, --redirect_max, 0 STREAMS_CC TSRMLS_CC);
                } else {
                        php_stream_wrapper_log_error(wrapper, options 
TSRMLS_CC, "HTTP request failed! %s", tmp_line);

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

Reply via email to