From: Anatol Belski <ab@php.net>
Date: Fri, 29 Jan 2016 19:59:58 +0000 (+0100)
Subject: Revert "refix #69111 and one related test"
X-Git-Tag: php-7.2.0alpha1~620^2~42^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6891e6abdf3c29caa465aefe80587de1db3a91ff;p=php

Revert "refix #69111 and one related test"

This reverts commit 80f7b0125875116fdbcdaf48cf8b1bbf93cb378c.

Conflicts:
	ext/session/mod_files.c
---

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index e2a63036db..b380cfe86b 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -170,11 +170,6 @@ static void ps_files_open(ps_files *data, const char *key)
 		ps_files_close(data);
 
 		if (php_session_valid_key(key) == FAILURE) {
-			if (data->basedir) {
-				efree(data->basedir);
-				data->basedir = NULL;
-				data->basedir_len = 0;
-			}
 			php_error_docref(NULL, E_WARNING, "The session id is too long or contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,'");
 			return;
 		}