From 728ac431bea61cc0281d21e0cf9fe541dfd130d6 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sun, 1 Feb 2015 01:43:41 -0800 Subject: [PATCH] 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. --- src/auth/negotiate/UserRequest.cc | 18 ------------------ src/auth/negotiate/UserRequest.h | 2 -- 2 files changed, 20 deletions(-) diff --git a/src/auth/negotiate/UserRequest.cc b/src/auth/negotiate/UserRequest.cc index 64cffc98c6..e1dc1939ca 100644 --- a/src/auth/negotiate/UserRequest.cc +++ b/src/auth/negotiate/UserRequest.cc @@ -361,21 +361,3 @@ Auth::Negotiate::UserRequest::HandleReply(void *data, const HelperReply &reply) 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); -} diff --git a/src/auth/negotiate/UserRequest.h b/src/auth/negotiate/UserRequest.h index 98276841d4..7dc4f46bec 100644 --- a/src/auth/negotiate/UserRequest.h +++ b/src/auth/negotiate/UserRequest.h @@ -28,8 +28,6 @@ public: 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 */ -- 2.47.2