Fix #1204

tdiary · Jan 21, 2025 · cbaffcd · cbaffcd
1 parent ea4e540
commit cbaffcd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/tdiary/dispatcher/index_main.rb b/lib/tdiary/dispatcher/index_main.rb
@@ -45,8 +45,9 @@ def run
 							head['pragma'] = 'no-cache'
 							head['cache-control'] = 'no-cache'
 							head['x-frame-options'] = conf.x_frame_options if conf.x_frame_options
-							head['cookie'] = tdiary.cookies if tdiary.cookies.size > 0
-							TDiary::Response.new( body, ::TDiary::Dispatcher.extract_status_for_legacy_tdiary( head ), head )
+							res = TDiary::Response.new( body, ::TDiary::Dispatcher.extract_status_for_legacy_tdiary( head ), head )
+							res.set_header('Set-Cookie', tdiary.cookies.map(&:to_s)) if tdiary && tdiary.cookies.size > 0
+							res
 						end
 					rescue TDiary::NotFound
 						body = %Q[
@@ -67,9 +68,10 @@ def run
 								</head>
 								<body>Wait or <a href="#{$!.path}">Click here!</a></body>
 								</html>]
-					head['cookie'] = tdiary.cookies if tdiary && tdiary.cookies.size > 0
 					# TODO return code should be 302? (current behaviour returns 200)
-					TDiary::Response.new( body, 200, head )
+					res = TDiary::Response.new( body, 200, head )
+					res.set_header('Set-Cookie', tdiary.cookies.map(&:to_s)) if tdiary && tdiary.cookies.size > 0
+					res
 				end
 			end
 

diff --git a/lib/tdiary/dispatcher/update_main.rb b/lib/tdiary/dispatcher/update_main.rb
@@ -41,9 +41,10 @@ def run
 								</head>
 								<body>Wait or <a href="#{$!.path}">Click here!</a></body>
 								</html>]
-					head['cookie'] = tdiary.cookies if tdiary.cookies.size > 0
 					# TODO return code should be 302? (current behaviour returns 200)
-					TDiary::Response.new( body, 200, head )
+					res = TDiary::Response.new( body, 200, head )
+					res.set_header('Set-Cookie', tdiary.cookies.map(&:to_s)) if tdiary && tdiary.cookies.size > 0
+					res
 				end
 			end