diff -Nru pushpin-1.20.0/CHANGELOG.md pushpin-1.20.1/CHANGELOG.md --- pushpin-1.20.0/CHANGELOG.md 2019-02-20 03:40:44.000000000 +0000 +++ pushpin-1.20.1/CHANGELOG.md 2019-02-20 16:48:34.000000000 +0000 @@ -1,6 +1,10 @@ Pushpin Changelog ================= +v. 1.20.1 (2019-02-20) + + * WebSocket-Over-HTTP: don't forward Content-Length header. + v. 1.20.0 (2019-02-19) * WebSocket-Over-HTTP: break up response messages to fit session buffers. diff -Nru pushpin-1.20.0/debian/changelog pushpin-1.20.1/debian/changelog --- pushpin-1.20.0/debian/changelog 2019-02-20 08:36:05.000000000 +0000 +++ pushpin-1.20.1/debian/changelog 2019-02-21 17:17:01.000000000 +0000 @@ -1,3 +1,9 @@ +pushpin (1.20.1-1) unstable; urgency=medium + + * New upstream version + + -- Jan Niehusmann Thu, 21 Feb 2019 18:17:01 +0100 + pushpin (1.20.0-1) unstable; urgency=medium * New upstream version diff -Nru pushpin-1.20.0/debian/patches/debian-changes pushpin-1.20.1/debian/patches/debian-changes --- pushpin-1.20.0/debian/patches/debian-changes 2019-02-20 08:36:05.000000000 +0000 +++ pushpin-1.20.1/debian/patches/debian-changes 2019-02-21 17:17:01.000000000 +0000 @@ -4,8 +4,8 @@ Option single-debian-patch is used as the changes are tracked in git. ---- pushpin-1.20.0.orig/examples/config/pushpin.conf -+++ pushpin-1.20.0/examples/config/pushpin.conf +--- pushpin-1.20.1.orig/examples/config/pushpin.conf ++++ pushpin-1.20.1/examples/config/pushpin.conf @@ -16,7 +16,7 @@ stats_connection_ttl=120 [runner] @@ -29,7 +29,7 @@ # use this field to identify your organization in updates requests. if left # blank, updates requests will be anonymous --- /dev/null -+++ pushpin-1.20.0/header.AGPL ++++ pushpin-1.20.1/header.AGPL @@ -0,0 +1,19 @@ + * + * Pushpin is free software: you can redistribute it and/or modify it under @@ -50,8 +50,8 @@ + * contained in a written agreement between you and Fanout. For further + * information use the contact form at . + * ---- pushpin-1.20.0.orig/src/proxy/app.cpp -+++ pushpin-1.20.0/src/proxy/app.cpp +--- pushpin-1.20.1.orig/src/proxy/app.cpp ++++ pushpin-1.20.1/src/proxy/app.cpp @@ -301,7 +301,7 @@ public: QByteArray sigKey = parse_key(settings.value("proxy/sig_key").toString()); QByteArray upstreamKey = parse_key(settings.value("proxy/upstream_key").toString()); @@ -61,8 +61,8 @@ QString organizationName = settings.value("proxy/organization_name").toString(); int statsConnectionTtl = settings.value("global/stats_connection_ttl", 120).toInt(); ---- pushpin-1.20.0.orig/src/pushpin/internal.conf -+++ pushpin-1.20.0/src/pushpin/internal.conf +--- pushpin-1.20.1.orig/src/pushpin/internal.conf ++++ pushpin-1.20.1/src/pushpin/internal.conf @@ -9,13 +9,13 @@ m2a_in_stream_specs=ipc://{rundir}/{ipc_ m2a_out_specs=ipc://{rundir}/{ipc_prefix}m2zhttp-in,ipc://{rundir}/{ipc_prefix}m2zws-in diff -Nru pushpin-1.20.0/src/proxy/proxysession.cpp pushpin-1.20.1/src/proxy/proxysession.cpp --- pushpin-1.20.0/src/proxy/proxysession.cpp 2019-01-10 16:28:21.000000000 +0000 +++ pushpin-1.20.1/src/proxy/proxysession.cpp 2019-02-20 16:48:34.000000000 +0000 @@ -260,7 +260,8 @@ foreach(const HttpHeader &h, route.headers) { requestData.headers.removeAll(h.first); - requestData.headers += HttpHeader(h.first, h.second); + if(!h.second.isEmpty()) + requestData.headers += HttpHeader(h.first, h.second); } bool intReq = false; diff -Nru pushpin-1.20.0/src/proxy/websocketoverhttp.cpp pushpin-1.20.1/src/proxy/websocketoverhttp.cpp --- pushpin-1.20.0/src/proxy/websocketoverhttp.cpp 2019-02-20 03:40:44.000000000 +0000 +++ pushpin-1.20.1/src/proxy/websocketoverhttp.cpp 2019-02-20 16:48:34.000000000 +0000 @@ -285,6 +285,7 @@ requestData.headers.removeAll("Upgrade"); requestData.headers.removeAll("Accept"); requestData.headers.removeAll("Connection-Id"); + requestData.headers.removeAll("Content-Length"); // don't forward headers starting with Meta-* for(int n = 0; n < requestData.headers.count(); ++n) diff -Nru pushpin-1.20.0/src/proxy/wsproxysession.cpp pushpin-1.20.1/src/proxy/wsproxysession.cpp --- pushpin-1.20.0/src/proxy/wsproxysession.cpp 2019-02-20 03:40:44.000000000 +0000 +++ pushpin-1.20.1/src/proxy/wsproxysession.cpp 2019-02-20 16:48:34.000000000 +0000 @@ -425,7 +425,8 @@ foreach(const HttpHeader &h, route.headers) { requestData.headers.removeAll(h.first); - requestData.headers += HttpHeader(h.first, h.second); + if(!h.second.isEmpty()) + requestData.headers += HttpHeader(h.first, h.second); } clientAddress = inSock->peerAddress(); diff -Nru pushpin-1.20.0/version pushpin-1.20.1/version --- pushpin-1.20.0/version 2019-02-20 03:40:51.000000000 +0000 +++ pushpin-1.20.1/version 2019-02-20 16:48:43.000000000 +0000 @@ -1 +1 @@ -1.20.0 +1.20.1