Attachment 7493 Details for Bug 17816 – Patch squid-3.5-13990.patch backported to 3.4

[patch] Patch squid-3.5-13990.patch backported to 3.4

squid-3.4-13990.patch (text/plain), 2.04 KB, created by Nicolas Salguero on 2016-02-26 14:02:43 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Salguero

Created: 2016-02-26 14:02:43 CET

Size: 2.04 KB

patch

obsolete

>------------------------------------------------------------
>revno: 13990
>revision-id: rousskov@measurement-factory.com-20160218041533-8tmtd45c3nky2gyy
>parent: squid3@treenet.co.nz-20160215135848-ms0dmjsfouxcb8g2
>committer: Alex Rousskov <rousskov@measurement-factory.com>
>branch nick: 3.5
>timestamp: Wed 2016-02-17 21:15:33 -0700
>message:
>  Better handling of huge response headers. Fewer "BUG 3279" messages.
>  
>  When we failed to parse a response, do not store the fake half-baked
>  response (via a replaceHttpReply() call). Doing so leads to misleading
>  "BUG 3279: HTTP reply without Date" messages (at best).  The fake
>  response is only meant for continueAfterParsingHeader().
>  
>  Also removed a misleading XXX that may have caused Bug 4432 in v4.0
>  (trunk r14548).
>------------------------------------------------------------
># Bazaar merge directive format 2 (Bazaar 0.90)
># revision_id: rousskov@measurement-factory.com-20160218041533-\
>#   8tmtd45c3nky2gyy
># target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
># testament_sha1: 0a7978c0442191d33a9472c6185692a78da6c0b0
># timestamp: 2016-02-18 04:50:56 +0000
># source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
># base_revision_id: squid3@treenet.co.nz-20160215135848-\
>#   ms0dmjsfouxcb8g2
># 
># Begin patch
>=== modified file 'src/http.cc'
>--- src/http.cc	2016-01-31 05:39:09 +0000
>+++ src/http.cc	2016-02-18 04:15:33 +0000
>@@ -731,11 +731,8 @@
>         if (!parsed && error > 0) { // unrecoverable parsing error
>             debugs(11, 3, "processReplyHeader: Non-HTTP-compliant header: '" <<  readBuf->content() << "'");
>             flags.headers_parsed = true;
>-            // XXX: when sanityCheck is gone and Http::StatusLine is used to parse,
>-            //   the sline should be already set the appropriate values during that parser stage
>             newrep->sline.set(Http::ProtocolVersion(1,1), error);
>-            HttpReply *vrep = setVirginReply(newrep);
>-            entry->replaceHttpReply(vrep);
>+            setVirginReply(newrep);
>             ctx_exit(ctx);
>             return;
>         }
>

------------------------------------------------------------
revno: 13990
revision-id: rousskov@measurement-factory.com-20160218041533-8tmtd45c3nky2gyy
parent: squid3@treenet.co.nz-20160215135848-ms0dmjsfouxcb8g2
committer: Alex Rousskov <rousskov@measurement-factory.com>
branch nick: 3.5
timestamp: Wed 2016-02-17 21:15:33 -0700
message:
  Better handling of huge response headers. Fewer "BUG 3279" messages.
  
  When we failed to parse a response, do not store the fake half-baked
  response (via a replaceHttpReply() call). Doing so leads to misleading
  "BUG 3279: HTTP reply without Date" messages (at best).  The fake
  response is only meant for continueAfterParsingHeader().
  
  Also removed a misleading XXX that may have caused Bug 4432 in v4.0
  (trunk r14548).
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: rousskov@measurement-factory.com-20160218041533-\
#   8tmtd45c3nky2gyy
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 0a7978c0442191d33a9472c6185692a78da6c0b0
# timestamp: 2016-02-18 04:50:56 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160215135848-\
#   ms0dmjsfouxcb8g2
# 
# Begin patch
=== modified file 'src/http.cc'
--- src/http.cc	2016-01-31 05:39:09 +0000
+++ src/http.cc	2016-02-18 04:15:33 +0000
@@ -731,11 +731,8 @@
         if (!parsed && error > 0) { // unrecoverable parsing error
             debugs(11, 3, "processReplyHeader: Non-HTTP-compliant header: '" <<  readBuf->content() << "'");
             flags.headers_parsed = true;
-            // XXX: when sanityCheck is gone and Http::StatusLine is used to parse,
-            //   the sline should be already set the appropriate values during that parser stage
             newrep->sline.set(Http::ProtocolVersion(1,1), error);
-            HttpReply *vrep = setVirginReply(newrep);
-            entry->replaceHttpReply(vrep);
+            setVirginReply(newrep);
             ctx_exit(ctx);
             return;
         }

Actions: View | Diff

Attachments on bug 17816: 7493 | 7494