1 files changed, 13 insertions, 0 deletions
diff --git a/src/network/access/qspdyprotocolhandler.cpp b/src/network/access/qspdyprotocolhandler.cpp
index f12b9535fe2..d9d861f9b4e 100644
--- a/src/network/access/qspdyprotocolhandler.cpp
+++ b/src/network/access/qspdyprotocolhandler.cpp
@@ -912,6 +912,19 @@ void QSpdyProtocolHandler::parseHttpHeaders(char flags, const QByteArray &frameD
         } else if (name == "content-length") {
             httpReply->setContentLength(value.toLongLong());
         } else {
+            if (value.contains('\0')) {
+                QList<QByteArray> values = value.split('\0');
+                QByteArray binder(", ");
+                if (name == "set-cookie")
+                    binder = "\n";
+                value.clear();
+                Q_FOREACH (const QByteArray& ivalue, values) {
+                    if (value.isEmpty())
+                        value = ivalue;
+                    else
+                        value += binder + ivalue;
+                }
+            }
             httpReply->setHeaderField(name, value);
         }
     }