Re: cvs: php4(PHP_4_2_0) /main rfc1867.c

Okay..iirc, there was also some bug report about this..? (I really can't test this..so.. :) --Jani -- On Wed, 3 Jul 2002, Rui Hirokawa wrote: > >I did now. >I should check before commit to HEAD, because it has >chinese and korean support. > >Rui > >On Wed, 3 Jul 2002 03:47:35 +0300 (EEST) >Jani Taskinen <sniper@iki.fi> wrote: > >> >> Why do you only commit this into the branch?? >> Why not to HEAD too? >> >> --JAni >> >> >> -- >> >> On Tue, 2 Jul 2002, Rui Hirokawa wrote: >> >> >hirokawa Tue Jul 2 11:28:15 2002 EDT >> > >> > Modified files: (Branch: PHP_4_2_0) >> > /php4/main rfc1867.c >> > Log: >> > >> > >> >Index: php4/main/rfc1867.c >> >diff -u php4/main/rfc1867.c:1.94.2.5 php4/main/rfc1867.c:1.94.2.6 >> >--- php4/main/rfc1867.c:1.94.2.5 Sun Jun 23 13:26:03 2002 >> >+++ php4/main/rfc1867.c Tue Jul 2 11:28:14 2002 >> >@@ -16,7 +16,7 @@ >> > | Jani Taskinen <sniper@php.net> | >> > +----------------------------------------------------------------------+ >> > */ >> >-/* $Id: rfc1867.c,v 1.94.2.5 2002/06/23 17:26:03 sesser Exp $ */ >> >+/* $Id: rfc1867.c,v 1.94.2.6 2002/07/02 15:28:14 hirokawa Exp $ */ >> > >> > /* >> > * This product includes software developed by the Apache Group >> >@@ -32,6 +32,9 @@ >> > #include "php_variables.h" >> > #include "rfc1867.h" >> > >> >+#if HAVE_MBSTRING >> >+#include "ext/mbstring/mbstring.h" >> >+#endif >> > >> > #undef DEBUG_FILE_UPLOAD >> > >> >@@ -58,6 +61,8 @@ >> > #define UPLOAD_ERROR_D 4 /* No file uploaded */ >> > #define UPLOAD_ERROR_E 5 /* Uploaded file size 0 bytes */ >> > >> >+ >> >+ >> > static void add_protected_variable(char *varname TSRMLS_DC) >> > { >> > int dummy=1; >> >@@ -823,7 +828,11 @@ >> > sprintf(lbuf, "%s_name", param); >> > } >> > >> >+#if HAVE_MBSTRING >> >+ s = mbstr_strrchr(filename, '\\'); >> >+#else >> > s = strrchr(filename, '\\'); >> >+#endif >> > if (s && s > filename) { >> > safe_php_register_variable(lbuf, s+1, NULL, 0 TSRMLS_CC); >> > } else { >> > >> > >> > >> > > > >