com php-src: Revert "refix #69111 and one related test": ext/session/mod_files.c

From: Date: Fri, 29 Jan 2016 19:59:58 +0000
Subject: com php-src: Revert "refix #69111 and one related test": ext/session/mod_files.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90819@lists.php.net to get a copy of this message
Commit: 6891e6abdf3c29caa465aefe80587de1db3a91ff Author: Anatol Belski <ab@php.net> Fri, 29 Jan 2016 20:59:58 +0100 Parents: 3d90531d1eab2db2e9d4a24b3fa02b58bd78d6e2 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6891e6abdf3c29caa465aefe80587de1db3a91ff Log: Revert "refix #69111 and one related test" This reverts commit 80f7b0125875116fdbcdaf48cf8b1bbf93cb378c. Conflicts: ext/session/mod_files.c Bugs: https://bugs.php..net/69111 Changed paths: M ext/session/mod_files.c Diff: diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index e2a6303..b380cfe 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; }

« previous php.cvs (#90819) next »