------------------------------------------------------------
revno: 13014
revision-id: squid3@treenet.co.nz-20131024150727-sjkxqohus0nu8i7d
parent: squid3@treenet.co.nz-20131023051215-za61w7i9m3fgp3kl
author: Nathan Hoad <nathan@getoffmalawn.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Thu 2013-10-24 09:07:27 -0600
message:
  Append Connection:close to OPTIONS requests when icap_persistent_connections is off.
  
  This brings OPTIONS requests behavior inline with REQMOD and RESPMOD.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131024150727-sjkxqohus0nu8i7d
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: eb8b67ab775d0a43a5f448f8f8e336112f394bf8
# timestamp: 2013-10-24 15:12:12 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20131023051215-\
#   za61w7i9m3fgp3kl
# 
# Begin patch
=== modified file 'src/adaptation/icap/OptXact.cc'
--- src/adaptation/icap/OptXact.cc	2013-03-16 04:57:43 +0000
+++ src/adaptation/icap/OptXact.cc	2013-10-24 15:07:27 +0000
@@ -51,6 +51,10 @@
     buf.Printf("OPTIONS " SQUIDSTRINGPH " ICAP/1.0\r\n", SQUIDSTRINGPRINT(uri));
     const String host = s.cfg().host;
     buf.Printf("Host: " SQUIDSTRINGPH ":%d\r\n", SQUIDSTRINGPRINT(host), s.cfg().port);
+
+    if (!TheConfig.reuse_connections)
+        buf.Printf("Connection: close\r\n");
+
     if (TheConfig.allow206_enable)
         buf.Printf("Allow: 206\r\n");
     buf.append(ICAP::crlf, 2);