From c4999dd2792135735b8141b6cc7b2b6ce081a3f5 Mon Sep 17 00:00:00 2001
From: xmh0511 <970252187@qq.com>
Date: Tue, 8 May 2018 16:55:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AF=8F=E6=AC=A1=E8=BF=94?=
=?UTF-8?q?=E5=9B=9Ecookie=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 221 +++++++++++++++++++++++++++-----------------
main.cpp | 3 +-
response.hpp | 3 +-
session.hpp | 14 +++
4 files changed, 154 insertions(+), 87 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 98465bf1..6172d58e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,11 +14,8 @@
-
-
-
@@ -33,11 +30,9 @@
-
-
-
-
-
+
+
+
@@ -45,11 +40,9 @@
-
-
-
-
-
+
+
+
@@ -67,10 +60,10 @@
-
+
-
+
@@ -79,10 +72,10 @@
-
+
-
+
@@ -91,11 +84,9 @@
-
-
-
-
-
+
+
+
@@ -103,8 +94,8 @@
-
-
+
+
@@ -113,11 +104,11 @@
-
-
+
+
-
-
+
+
@@ -126,8 +117,8 @@
-
-
+
+
@@ -153,8 +144,8 @@
-
+
@@ -240,6 +231,7 @@
1525656717913
+
1525657080582
@@ -252,23 +244,23 @@
-
+
-
+
-
+
-
-
+
+
-
+
+
-
@@ -297,21 +289,96 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
@@ -328,7 +395,7 @@
-
+
@@ -338,8 +405,8 @@
-
-
+
+
@@ -357,7 +424,7 @@
-
+
@@ -367,7 +434,6 @@
-
@@ -396,86 +462,73 @@
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
diff --git a/main.cpp b/main.cpp
index f06c7e14..877154b9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -58,7 +58,7 @@ int main() {
server.set_http_handler("/login",[](const request& req, response& res) {
auto session = res.start_session(req.get_header_value("host"));
session->set_data("userid",std::string("1"));
- session->set_max_age(10);
+ session->set_max_age(-1);
res.set_status_and_content(status_type::ok, "login");
});
@@ -69,7 +69,6 @@ int main() {
res.set_status_and_content(status_type::ok, "没有登录", res_content_type::string);
return;
}
-
res.set_status_and_content(status_type::ok, "已经登录",res_content_type::string);
});
diff --git a/response.hpp b/response.hpp
index e5240a96..1895ffef 100644
--- a/response.hpp
+++ b/response.hpp
@@ -26,10 +26,11 @@ namespace cinatra {
std::vector to_buffers() {
std::vector buffers;
add_header("Host", "cinatra");
- if(session_ != nullptr)
+ if(session_ != nullptr && session_->is_need_update())
{
auto cookie_str = session_->get_cookie().to_string();
add_header("Set-Cookie",cookie_str.c_str());
+ session_->set_need_update(false);
}
buffers.reserve(headers_.size() * 4 + 5);
buffers.emplace_back(to_buffer(status_));
diff --git a/session.hpp b/session.hpp
index 9df54d26..a5231ef1 100644
--- a/session.hpp
+++ b/session.hpp
@@ -64,6 +64,7 @@ namespace cinatra {
void set_max_age(const std::time_t seconds)
{
std::unique_lock lock(mtx_);
+ is_update_ = true;
expire_ = seconds == -1 ? 600 : seconds;
std::time_t now = std::time(nullptr);
time_stamp_ = now + expire_;
@@ -79,6 +80,18 @@ namespace cinatra {
return time_stamp_;
}
+ bool is_need_update()
+ {
+ std::unique_lock lock(mtx_);
+ return is_update_;
+ }
+
+ void set_need_update(bool flag)
+ {
+ std::unique_lock lock(mtx_);
+ is_update_ = flag;
+ }
+
private:
session() = delete;
@@ -88,5 +101,6 @@ namespace cinatra {
std::map data_;
std::mutex mtx_;
cookie cookie_;
+ bool is_update_ = true;
};
}
\ No newline at end of file