indeyets                Sun Aug 31 14:49:58 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/session        mod_files.c 
    /php-src/ext/session/tests  session_save_path_variation5.phpt 
  Log:
  remove special treatment of /tmp path
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.100.2.3.2.10.2.1&r2=1.100.2.3.2.10.2.2&diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.100.2.3.2.10.2.1 
php-src/ext/session/mod_files.c:1.100.2.3.2.10.2.2
--- php-src/ext/session/mod_files.c:1.100.2.3.2.10.2.1  Mon Dec 31 07:17:13 2007
+++ php-src/ext/session/mod_files.c     Sun Aug 31 14:49:57 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mod_files.c,v 1.100.2.3.2.10.2.1 2007/12/31 07:17:13 sebastian Exp $ */
+/* $Id: mod_files.c,v 1.100.2.3.2.10.2.2 2008/08/31 14:49:57 indeyets Exp $ */
 
 #include "php.h"
 
@@ -278,13 +278,11 @@
                /* if save path is an empty string, determine the temporary dir 
*/
                save_path = php_get_temporary_directory();
 
-               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;
-                       }
+               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;
                }
        }
        
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/session_save_path_variation5.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/session/tests/session_save_path_variation5.phpt
diff -u php-src/ext/session/tests/session_save_path_variation5.phpt:1.1.2.3 
php-src/ext/session/tests/session_save_path_variation5.phpt:1.1.2.4
--- php-src/ext/session/tests/session_save_path_variation5.phpt:1.1.2.3 Wed Apr 
30 15:20:18 2008
+++ php-src/ext/session/tests/session_save_path_variation5.phpt Sun Aug 31 
14:49:58 2008
@@ -36,10 +36,6 @@
 var_dump(chdir($sessions));
 ini_set("session.save_path", $directory);
 var_dump(session_save_path());
-var_dump(session_start());
-var_dump(session_save_path());
-var_dump(session_destroy());
-var_dump(session_save_path());
 var_dump(rmdir($sessions));
 
 echo "Done";
@@ -57,9 +53,5 @@
 Warning: ini_set(): open_basedir restriction in effect. File(%s) is not within 
the allowed path(s): (.) in %s on line %d
 string(0) ""
 bool(true)
-string(0) ""
-bool(true)
-string(0) ""
-bool(true)
 Done
 



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

Reply via email to