moriyoshi Mon Jan 24 11:47:40 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/main rfc1867.c Log: - MFH: revert irrelevant part. http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.159.2.7&r2=1.159.2.8&ty=u Index: php-src/main/rfc1867.c diff -u php-src/main/rfc1867.c:1.159.2.7 php-src/main/rfc1867.c:1.159.2.8 --- php-src/main/rfc1867.c:1.159.2.7 Thu Jan 20 12:57:06 2005 +++ php-src/main/rfc1867.c Mon Jan 24 11:47:39 2005 @@ -6,7 +6,6 @@ +----------------------------------------------------------------------+ | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | | http://www.php.net/license/3_0.txt. | | If you did not receive a copy of the PHP license and are unable to | @@ -18,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.159.2.7 2005/01/20 17:57:06 iliaa Exp $ */ +/* $Id: rfc1867.c,v 1.159.2.8 2005/01/24 16:47:39 moriyoshi Exp $ */ /* * This product includes software developed by the Apache Group @@ -33,7 +32,6 @@ #include "php_globals.h" #include "php_variables.h" #include "rfc1867.h" -#include "ext/standard/php_string.h" #define DEBUG_FILE_UPLOAD ZEND_DEBUG @@ -849,7 +847,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); @@ -1079,16 +1077,30 @@ 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 */ - php_basename(filename, strlen(filename), NULL, 0, &s, NULL TSRMLS_CC); - efree(filename); - filename = s; - + if (!is_anonymous) { - safe_php_register_variable(lbuf, filename, NULL, 0 TSRMLS_CC); + if (s && s > filename) { + safe_php_register_variable(lbuf, s+1, NULL, 0 TSRMLS_CC); + } else { + safe_php_register_variable(lbuf, filename, NULL, 0 TSRMLS_CC); + } } /* Add $foo[name] */ @@ -1097,7 +1109,11 @@ } else { sprintf(lbuf, "%s[name]", param); } - register_http_post_files_variable(lbuf, filename, http_post_files, 0 TSRMLS_CC); + if (s && s > filename) { + register_http_post_files_variable(lbuf, s+1, http_post_files, 0 TSRMLS_CC); + } else { + register_http_post_files_variable(lbuf, filename, http_post_files, 0 TSRMLS_CC); + } efree(filename); s = NULL;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php