X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fclientpool%2FSquidPurgeClient.php;h=dffe6e14fae363df11c2aa29f2c31eb1f378b2e0;hb=af80076034fb734d652eb043c523c1d8df974e51;hp=49d9d1c7f0980f3ab4bba8aa1037d860b2510512;hpb=e9a27a78e455de664144d0c3cfc789bcc411fab2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/clientpool/SquidPurgeClient.php b/includes/clientpool/SquidPurgeClient.php
index 49d9d1c7f0..dffe6e14fa 100644
--- a/includes/clientpool/SquidPurgeClient.php
+++ b/includes/clientpool/SquidPurgeClient.php
@@ -68,9 +68,8 @@ class SquidPurgeClient {
 
 	/**
 	 * @param string $server
-	 * @param array $options
 	 */
-	public function __construct( $server, $options = [] ) {
+	public function __construct( $server ) {
 		$parts = explode( ':', $server, 2 );
 		$this->host = $parts[0];
 		$this->port = $parts[1] ?? 80;
@@ -151,7 +150,7 @@ class SquidPurgeClient {
 			if ( IP::isIPv4( $this->host ) ) {
 				$this->ip = $this->host;
 			} elseif ( IP::isIPv6( $this->host ) ) {
-				throw new MWException( '$wgSquidServers does not support IPv6' );
+				throw new MWException( '$wgCdnServers does not support IPv6' );
 			} else {
 				Wikimedia\suppressWarnings();
 				$this->ip = gethostbyname( $this->host );
@@ -192,11 +191,11 @@ class SquidPurgeClient {
 	/**
 	 * Queue a purge operation
 	 *
-	 * @param string $url
+	 * @param string $url Fully expanded URL (with host and protocol)
 	 */
 	public function queuePurge( $url ) {
 		global $wgSquidPurgeUseHostHeader;
-		$url = CdnCacheUpdate::expand( str_replace( "\n", '', $url ) );
+		$url = str_replace( "\n", '', $url ); // sanity
 		$request = [];
 		if ( $wgSquidPurgeUseHostHeader ) {
 			$url = wfParseUrl( $url );