jani Tue May 26 10:15:08 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/session mod_files.c
Log:
- Revert this, was not supposed to be merged yet
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.100.2.3.2.14&r2=1.100.2.3.2.15&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.14
php-src/ext/session/mod_files.c:1.100.2.3.2.15
--- php-src/ext/session/mod_files.c:1.100.2.3.2.14 Mon May 18 17:23:42 2009
+++ php-src/ext/session/mod_files.c Tue May 26 10:15:08 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mod_files.c,v 1.100.2.3.2.14 2009/05/18 17:23:42 jani Exp $ */
+/* $Id: mod_files.c,v 1.100.2.3.2.15 2009/05/26 10:15:08 jani Exp $ */
#include "php.h"
@@ -276,11 +276,13 @@
/* 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;
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
