From d7d786d3b548a6a2a0df9ab1b753326fe0d0e367 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 15 Dec 2015 11:29:37 +0100
Subject: [PATCH] Fixes #1607

---
 lib/request/connect.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/request/connect.py b/lib/request/connect.py
index 93414961e..ccb3588d1 100644
--- a/lib/request/connect.py
+++ b/lib/request/connect.py
@@ -456,6 +456,9 @@ class Connect(object):
                     for cookie in conf.cj:
                         if cookie.value is None:
                             cookie.value = ""
+                        else:
+                            for char in (r"\r", r"\n"):
+                                cookie.value = re.sub(r"(%s)([^ \t])" % char, r"\g<1>\t\g<2>", cookie.value)
 
                 conn = urllib2.urlopen(req)