From 6c14dcfc973c04fe9aa32b900b9283fdf650b2d8 Mon Sep 17 00:00:00 2001 From: "C. Scott Ananian" Date: Fri, 19 Oct 2018 11:40:17 -0400 Subject: [PATCH] Deprecate $wgSquidPurgeUseHostHeader This header supports Squid in forward-proxy mode using HTTP/1.0 HTTP headers. It is not used in production. Change-Id: I99646c9c5519bd55b3d4988306e379f89d413bdc --- RELEASE-NOTES-1.33 | 2 ++ includes/DefaultSettings.php | 1 + includes/clientpool/SquidPurgeClient.php | 1 + 3 files changed, 4 insertions(+) diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33 index d487cf6d21..5da6863639 100644 --- a/RELEASE-NOTES-1.33 +++ b/RELEASE-NOTES-1.33 @@ -58,6 +58,8 @@ because of Phabricator reports. === Deprecations in 1.33 === * The configuration option $wgUseESI has been deprecated, and is expected to be removed in a future release. +* The configuration option $wgSquidPurgeUseHostHeader has been deprecated, + and is expected to be removed in a future release. * … === Other changes in 1.33 === diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 5e28036ae0..1e15524c23 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -2850,6 +2850,7 @@ $wgSquidServersNoPurge = []; * reverse). * * @since 1.21 + * @deprecated since 1.33, will always be true in a future release. */ $wgSquidPurgeUseHostHeader = true; diff --git a/includes/clientpool/SquidPurgeClient.php b/includes/clientpool/SquidPurgeClient.php index a531cd1b13..36d72c2b67 100644 --- a/includes/clientpool/SquidPurgeClient.php +++ b/includes/clientpool/SquidPurgeClient.php @@ -211,6 +211,7 @@ class SquidPurgeClient { $request[] = "PURGE $path HTTP/1.1"; $request[] = "Host: $host"; } else { + wfDeprecated( '$wgSquidPurgeUseHostHeader = false', '1.33' ); $request[] = "PURGE $url HTTP/1.0"; } $request[] = "Connection: Keep-Alive"; -- 2.20.1