]> granicus.if.org Git - php/commitdiff
Revert "refix #69111 and one related test"
authorAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 19:59:58 +0000 (20:59 +0100)
committerAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 19:59:58 +0000 (20:59 +0100)
This reverts commit 80f7b0125875116fdbcdaf48cf8b1bbf93cb378c.

Conflicts:
ext/session/mod_files.c

ext/session/mod_files.c

index e2a63036db04b00ff23e0b328ddf8006f7b6201b..b380cfe86b2887dee11a4ee454221039fd472b3c 100644 (file)
@@ -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;
                }