diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-02-02 13:42:01 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-02-02 13:42:01 +0000 |
| commit | a4a120d66aaf44cd0dc71f39a49998b924c2ef0e (patch) | |
| tree | f48300cf85374f82a437a42f3a2d4ed88867f34d /ext/session/mod_files.c | |
| parent | 8a7e2f8dd2116ff6ada654e301c593accf337250 (diff) | |
| parent | 05c309f2d85bcc33e95415d7f50d7748a7c27498 (diff) | |
| download | php-git-a4a120d66aaf44cd0dc71f39a49998b924c2ef0e.tar.gz | |
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
Diffstat (limited to 'ext/session/mod_files.c')
| -rw-r--r-- | ext/session/mod_files.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 004d9d4637..47140436e7 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -145,10 +145,12 @@ static void ps_files_open(ps_files *data, const char *key TSRMLS_DC) if (fstat(data->fd, &sbuf)) { close(data->fd); + data->fd = -1; return; } if (S_ISLNK(sbuf.st_mode) && php_check_open_basedir(buf TSRMLS_CC)) { close(data->fd); + data->fd = -1; return; } } @@ -342,6 +344,7 @@ PS_READ_FUNC(files) PS(send_cookie) = 1; } php_session_reset_id(TSRMLS_C); + PS(session_status) = php_session_active; } ps_files_open(data, PS(id) TSRMLS_CC); |