Commit: 3c51e182523ceb4f4cce262a5e3fd0776e1dd175 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 3c51e182523ceb4f4cce262a5e3fd0776e1dd175 (tree)
• Time: 2008-12-14 12:15:36
• Author: h677 <h677>
• Commiter: h677

Log Message

Cookie確認でIPアドレス（ホスト名）が変わっているときに、
IPアドレス以外のCookieが空になる不具合の修正

Change Summary

• modified: Editor.pas

Incremental Difference

--- a/Editor.pas
+++ b/Editor.pas
@@ -1882,31 +1882,61 @@ const
 	VAL_PON		= 'PON=';
 	EXPIRES_MARK = 'expires=';
 var
-//	i: Integer;
+	i, pos: Integer;
 	tmp : string;
 	val : string;
+    curCookies : TStringList;
+    tmpCookieName : string;
 begin
+    // 2008.12.14 –³ðŒƒNƒŠƒA‚µ‚Ä‚Í‚¢‚¯‚È‚¢ by ‚à‚¶‚ã
+    curCookies := TStringList.Create;
+    curCookies.Delimiter := ';';
+    curCookies.DelimitedText := ABoard.Cookie;
 	ABoard.Cookie := '';
-	while  (AnsiPos(COOKIE_MARK, Rawtext) > 0 ) do begin
-		//i := 0;
-		tmp := Copy(Rawtext, AnsiPos(COOKIE_MARK, Rawtext) + Length(COOKIE_MARK), Length(Rawtext));
-		Delete(Rawtext, 1, AnsiPos('Set-Cookie', Rawtext)+ Length(COOKIE_MARK));
-		//Cookie‚ðØ‚èo‚·
-		val := Trim(GikoSys.GetTokenIndex(tmp, ';', 0));
-		if( AnsiPos(VAL_SPID, val) > 0 ) then begin
-			ABoard.SPID := Copy(val, AnsiPos(VAL_SPID, val) + Length(VAL_SPID), Length(val));
-		end else if( AnsiPos(VAL_PON, val) > 0 ) then begin
-			ABoard.PON := Copy(val, AnsiPos(VAL_PON, val) + Length(VAL_PON), Length(val));
-		end else begin
-			ABoard.Cookie := ABoard.Cookie + val + '; ';
-		end;
-		//expires‚ðØ‚èo‚·
-		val := Trim(GikoSys.GetTokenIndex(tmp, ';', 1));
-		if( AnsiPos(EXPIRES_MARK, val) > 0) then begin
-			Delete(val, 1, AnsiPos(EXPIRES_MARK, val) + Length(EXPIRES_MARK) - 1);
-			ABoard.Expires := GMTToLocalDateTime(val);
-		end;
-	end;
+    try
+        while  (AnsiPos(COOKIE_MARK, Rawtext) > 0 ) do begin
+            tmp := Copy(Rawtext, AnsiPos(COOKIE_MARK, Rawtext) + Length(COOKIE_MARK), Length(Rawtext));
+            Delete(Rawtext, 1, AnsiPos('Set-Cookie', Rawtext)+ Length(COOKIE_MARK));
+            //Cookie‚ðØ‚èo‚·
+            val := Trim(GikoSys.GetTokenIndex(tmp, ';', 0));
+            if( AnsiPos(VAL_SPID, val) > 0 ) then begin
+                ABoard.SPID := Copy(val, AnsiPos(VAL_SPID, val) + Length(VAL_SPID), Length(val));
+            end else if( AnsiPos(VAL_PON, val) > 0 ) then begin
+                ABoard.PON := Copy(val, AnsiPos(VAL_PON, val) + Length(VAL_PON), Length(val));
+            end else begin
+                // Šù‘¶‚ÌCookie‚̏ꍇ‚Í’l‚¾‚¯•t‚¯‘Ö‚¦‚é
+                pos := AnsiPos('=', val);
+                if pos > 0 then begin
+                    tmpCookieName := Copy(val, 0, pos - 1);
+                    for i := 0 to curCookies.Count - 1 do begin
+                        if (curCookies.IndexOfName(tmpCookieName) >= 0) then begin
+                            curCookies.Values[tmpCookieName] := Copy(val, pos + 1, Length(val));
+                            tmpCookieName := '';
+                            break;
+                        end;
+                    end;
+                    if (tmpCookieName <> '') then begin
+                        curCookies.Add(val);
+                    end;
+                end;
+                //tmpCookie := tmpCookie + val + '; ';
+            end;
+            //expires‚ðØ‚èo‚·
+            val := Trim(GikoSys.GetTokenIndex(tmp, ';', 1));
+            if( AnsiPos(EXPIRES_MARK, val) > 0) then begin
+                Delete(val, 1, AnsiPos(EXPIRES_MARK, val) + Length(EXPIRES_MARK) - 1);
+                ABoard.Expires := GMTToLocalDateTime(val);
+            end;
+        end;
+        for i := 0 to curCookies.Count - 1 do begin
+            if (curCookies.Strings[i] <> '') then begin
+                ABoard.Cookie := ABoard.Cookie + curCookies.Strings[i] + '; ';
+            end;
+        end;
+
+    finally
+        curCookies.Free;
+    end;
 end;
 //! hiddenƒf[ƒ^Žæ“¾
 procedure TEditorForm.GetHiddenParameter(Rawtext: String; ABoard: TBoard);