]> granicus.if.org Git - php/commitdiff
- Revert this, was not supposed to be merged yet
authorJani Taskinen <jani@php.net>
Tue, 26 May 2009 10:15:08 +0000 (10:15 +0000)
committerJani Taskinen <jani@php.net>
Tue, 26 May 2009 10:15:08 +0000 (10:15 +0000)
ext/session/mod_files.c

index 80ea2c2a156dba3a7e4c3c9665080c408c1a696a..a9333fe830656c70b189b6a10cfb1fbce8295f9e 100644 (file)
@@ -276,11 +276,13 @@ PS_OPEN_FUNC(files)
                /* if save path is an empty string, determine the temporary dir */
                save_path = php_get_temporary_directory();
 
-               if (PG(safe_mode) && (!php_checkuid(save_path, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
-                       return FAILURE;
-               }
-               if (php_check_open_basedir(save_path TSRMLS_CC)) {
-                       return FAILURE;
+               if (strcmp(save_path, "/tmp")) {
+                       if (PG(safe_mode) && (!php_checkuid(save_path, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+                               return FAILURE;
+                       }
+                       if (php_check_open_basedir(save_path TSRMLS_CC)) {
+                               return FAILURE;
+                       }
                }
        }