From: Jani Taskinen <jani@php.net>
Date: Tue, 26 May 2009 10:15:08 +0000 (+0000)
Subject: - Revert this, was not supposed to be merged yet
X-Git-Tag: php-5.2.10RC1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b90c2e7cb17e2f60b0a128281d5f30645091ee36;p=php

- Revert this, was not supposed to be merged yet
---

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 80ea2c2a15..a9333fe830 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -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;
+			}
 		}
 	}