Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/289254

Change subject: 4.1.2-1wm6: update 0005-handle-eof-http1.1.patch
......................................................................

4.1.2-1wm6: update 0005-handle-eof-http1.1.patch

Bug: T135515
Change-Id: I14700ba59ab92ed46168d60116cdea5c9de414c3
---
M debian/changelog
M debian/patches/0005-handle-eof-http1.1.patch
2 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish4 
refs/changes/54/289254/1

diff --git a/debian/changelog b/debian/changelog
index d55b393..5e0bbdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+varnish (4.1.2-1wm6) jessie-wikimedia; urgency=medium
+
+  * Update 0005-handle-eof-http1.1.patch (Bug: T135515).
+
+ -- Emanuele Rocca <e...@wikimedia.org>  Tue, 17 May 2016 19:41:43 +0200
+
 varnish (4.1.2-1wm5) jessie-wikimedia; urgency=medium
 
   * 0007-revert-grace-hits-hit-for-pass-objs.patch: revert
diff --git a/debian/patches/0005-handle-eof-http1.1.patch 
b/debian/patches/0005-handle-eof-http1.1.patch
index 54a8e94..2814962 100644
--- a/debian/patches/0005-handle-eof-http1.1.patch
+++ b/debian/patches/0005-handle-eof-http1.1.patch
@@ -22,7 +22,7 @@
        }
  
 -      if (hp->protover == 11)
-+      if (hp->protover == 11 && (request || !http_HdrIs(hp, H_Connection, 
"close")))
++      if (hp->protover == 11 && request)
                return (BS_NONE);
  
        if (http_HdrIs(hp, H_Connection, "keep-alive")) {
@@ -55,6 +55,8 @@
 +server s1 {
 +      rxreq
 +      txresp -nolen -bodylen 10
++      close
++      accept
 +      rxreq
 +      txresp -hdr "Connection: close" -nolen -bodylen 10
 +} -start
@@ -66,7 +68,7 @@
 +      txreq -url /1
 +      rxresp
 +      expect resp.status == 200
-+      expect resp.bodylen == 0
++      expect resp.bodylen == 10
 +      txreq -url /2
 +      rxresp
 +      expect resp.status == 200

-- 
To view, visit https://gerrit.wikimedia.org/r/289254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14700ba59ab92ed46168d60116cdea5c9de414c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish4
Gerrit-Branch: debian-wmf
Gerrit-Owner: Ema <e...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to