In case that cookie file is given and cookie header inside request file clashes with one of contained cookies, give cookie file greater priority

stamparm · stamparm · commit ed5599f48942 · 2013-04-12T19:20:33.000+02:00
diff --git a/lib/request/basic.py b/lib/request/basic.py
@@ -58,8 +58,13 @@ def forgeHeaders(items=None):
     if conf.cj:
         if HTTP_HEADER.COOKIE in headers:
             for cookie in conf.cj:
+                if cookie.domain_specified and not conf.hostname.endswith(cookie.domain):
+                    continue
+
                 if ("%s=" % cookie.name) in headers[HTTP_HEADER.COOKIE]:
-                    if kb.mergeCookies is None:
+                    if conf.loadCookies:
+                        conf.httpHeaders = filter(None, ((item if item[0] != HTTP_HEADER.COOKIE else None) for item in conf.httpHeaders))
+                    elif kb.mergeCookies is None:
                         message = "you provided a HTTP %s header value. " % HTTP_HEADER.COOKIE
                         message += "The target URL provided its own cookies within "
                         message += "the HTTP %s header which intersect with yours. " % HTTP_HEADER.SET_COOKIE
