Fix the logic. Tested.

diff --git a/main/rfc1867.c b/main/rfc1867.c
index bc3d87f5907dcb56200062a6a2f9f28f1ac8d6ba..70ddeba927f50492280c37c7f2468994626d504e 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -35,7 +35,7 @@
 
 static void add_protected_variable(char *varname PLS_DC)
 {
-       int dummy=0;
+       int dummy=1;
 
        zend_hash_add(&PG(rfc1867_protected_variables), varname, strlen(varname)+1, &dummy, sizeof(int), NULL);
 }
@@ -211,7 +211,6 @@ static void php_mime_split(char *buf, int cnt, char *boundary, zval *array_ptr)
                                        } else {
                                                safe_php_register_variable(lbuf, filenamebuf, NULL ELS_CC PLS_CC);
                                        }
-                                       add_protected_variable(lbuf PLS_CC);
 
                                        /* Add $foo[name] */
                     if (is_arr_upload) {
@@ -350,6 +349,7 @@ static void php_mime_split(char *buf, int cnt, char *boundary, zval *array_ptr)
                                        }
                                }
                                safe_php_register_variable(namebuf, fn, NULL ELS_CC PLS_CC);
+                               add_protected_variable(namebuf PLS_CC);
 
                                /* Add $foo[tmp_name] */
                                if(is_arr_upload) {