------------------------------------------------------------
revno: 13216
revision-id: squid3@treenet.co.nz-20150201094341-celp7gf2xpkq0s7n
parent: squid3@treenet.co.nz-20150201094212-w3mu2drisuwjd4cm
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Sun 2015-02-01 01:43:41 -0800
message:
  Stop emitting (Proxy-)Authentication-Info for Negotiate
  
  This header is not defined for use by RFC 4559, and there seem to
  be no clients actually using it.
  
  The syntax Squid was using to emit the details was also clashing
  with the syntax defined for use in Digest which is becoming the
  standardized ABNF syntax for the header in general.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150201094341-celp7gf2xpkq0s7n
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: df17f2b87a89decf7073a24dfd912c5250d1d5fe
# timestamp: 2015-02-01 09:45:30 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20150201094212-\
#   w3mu2drisuwjd4cm
# 
# Begin patch
=== modified file 'src/auth/negotiate/UserRequest.cc'
--- src/auth/negotiate/UserRequest.cc	2015-01-18 11:02:13 +0000
+++ src/auth/negotiate/UserRequest.cc	2015-02-01 09:43:41 +0000
@@ -361,21 +361,3 @@
     delete r;
 }
 
-void
-Auth::Negotiate::UserRequest::addAuthenticationInfoHeader(HttpReply * rep, int accel)
-{
-    http_hdr_type type;
-
-    if (!server_blob)
-        return;
-
-    /* don't add to authentication error pages */
-    if ((!accel && rep->sline.status() == Http::scProxyAuthenticationRequired)
-            || (accel && rep->sline.status() == Http::scUnauthorized))
-        return;
-
-    type = accel ? HDR_AUTHENTICATION_INFO : HDR_PROXY_AUTHENTICATION_INFO;
-    httpHeaderPutStrf(&rep->header, type, "Negotiate %s", server_blob);
-
-    safe_free(server_blob);
-}

=== modified file 'src/auth/negotiate/UserRequest.h'
--- src/auth/negotiate/UserRequest.h	2013-04-04 06:15:00 +0000
+++ src/auth/negotiate/UserRequest.h	2015-02-01 09:43:41 +0000
@@ -28,8 +28,6 @@
     virtual Direction module_direction();
     virtual void module_start(AUTHCB *, void *);
 
-    virtual void addAuthenticationInfoHeader(HttpReply * rep, int accel);
-
     virtual const char * connLastHeader();
 
     /* we need to store the helper server between requests */