Merge "Deprecate $wgSquidPurgeUseHostHeader"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index d487cf6..5da6863 100644 (file)
--- 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 5e28036..1e15524 100644 (file)
--- 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 a531cd1..36d72c2 100644 (file)
--- 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";