From c0d060f5c02db168f1de895b41afffbc6e3cacfb Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:04:26 +0800 Subject: Bump year --- ext/session/mod_files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/session/mod_files.c') diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 1665ba53aa..615db85471 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 | -- cgit v1.2.1 From 47c902777297ce895aa915c13efdb00881af3669 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:06:16 +0800 Subject: Bump year --- ext/session/mod_files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/session/mod_files.c') diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 004d9d4637..c365760eb7 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 | -- cgit v1.2.1 From f52c251f60c8c6d1bd01f3d87d69ed45f7a1bfa4 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Wed, 15 Jan 2014 11:03:07 +0900 Subject: Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1 --- ext/session/mod_files.c | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/session/mod_files.c') diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index c365760eb7..4d5a18b36b 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -342,6 +342,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); -- cgit v1.2.1 From f5e097d1ed5ab34cbaac49dee542b0af92f941f5 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Thu, 30 Jan 2014 14:15:29 +0900 Subject: Fixed bug data->fd not set to -1 for open_basedir failure. --- ext/session/mod_files.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ext/session/mod_files.c') diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 615db85471..86a2235845 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -176,10 +176,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; } } -- cgit v1.2.1