[PHP-CVS] cvs: php-src(PHP_4_3) /main rfc1867.c

[Moriyoshi Koizumi]

moriyoshi               Mon Jan 24 11:47:53 2005 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/main       rfc1867.c 
  Log:
  - MFH: revert irrelevant part.
  
  
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.122.2.29&r2=1.122.2.30&ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.29 php-src/main/rfc1867.c:1.122.2.30
--- php-src/main/rfc1867.c:1.122.2.29   Thu Jan 20 12:57:41 2005
+++ php-src/main/rfc1867.c      Mon Jan 24 11:47:53 2005
@@ -16,7 +16,7 @@
    |          Jani Taskinen <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
  */
-/* $Id: rfc1867.c,v 1.122.2.29 2005/01/20 17:57:41 iliaa Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.30 2005/01/24 16:47:53 moriyoshi Exp $ */
 
 /*
  *  This product includes software developed by the Apache Group
@@ -31,7 +31,6 @@
 #include "php_globals.h"
 #include "php_variables.h"
 #include "rfc1867.h"
-#include "ext/standard/php_string.h"
 
 #undef DEBUG_FILE_UPLOAD
 
@@ -843,7 +842,7 @@
        while (!multipart_buffer_eof(mbuff TSRMLS_CC))
        {
                char buff[FILLUNIT];
-               char *cd=NULL,*param=NULL,*filename=NULL;
+               char *cd=NULL,*param=NULL,*filename=NULL, *tmp=NULL;
                int blen=0, wlen=0;
 
                zend_llist_clean(&header);
@@ -1065,14 +1064,23 @@
                                        str_len = strlen(filename);
                                        
php_mb_gpc_encoding_converter(&filename, &str_len, 1, NULL, NULL TSRMLS_CC);
                                }
+                               s = php_mb_strrchr(filename, '\\' TSRMLS_CC);
+                               if ((tmp = php_mb_strrchr(filename, '/' 
TSRMLS_CC)) > s) {
+                                       s = tmp;
+                               }
                                num_vars--;
+                       } else {
+                               s = strrchr(filename, '\\');
+                               if ((tmp = strrchr(filename, '/')) > s) {
+                                       s = tmp;
+                               }
+                       }
+#else
+                       s = strrchr(filename, '\\');
+                       if ((tmp = strrchr(filename, '/')) > s) {
+                               s = tmp;
                        }
 #endif
-                       /* ensure that the uploaded file name only contains the 
path */
-                       s = php_basename(filename, strlen(filename), NULL, 0);
-                       efree(filename);
-                       filename = s;
-
                        if (s && s > filename) {
                                safe_php_register_variable(lbuf, s+1, NULL, 0 
TSRMLS_CC);
                        } else {

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