Index: SquidUpdate.php

• SquidUpdate.php (revision 96381)

+++ SquidUpdate.php (working copy)
@@ -208,11 +208,15 @@

• @return string */ static function expand( $url ) {

+ ### WMF EMERGENCY PATCH FOR BUG 30792 -- TS
+ return wfExpandUrl( $url, PROTO_HTTP );
+ /*

		global $wgInternalServer, $wgServer;
		$server = $wgInternalServer !== false ? $wgInternalServer : $wgServer;
		if( $url !== '' && $url[0] == '/' ) {
			return $server . $url;
		}
		return $url;

+ */

	}

}

Assigned to Roan Kattouw.

Hm, I guess we're only setting $wgInternalServer in secure.php but not during normal operation. I'll poke in a minute.

(In reply to comment #3)

Hm, I guess we're only setting $wgInternalServer in secure.php but not during
normal operation. I'll poke in a minute.

Fixed by setting $wgInternalServer to the value of $wgCanonicalServer in CommonSettings.php .

(In reply to comment #4)

(In reply to comment #3)

Hm, I guess we're only setting $wgInternalServer in secure.php but not during
normal operation. I'll poke in a minute.

Fixed by setting $wgInternalServer to the value of $wgCanonicalServer in
CommonSettings.php .

Lies! The issue was something else. Fixed properly in r96437 and deployed to the cluster. I watched the Squid purge stream on tcpdump to make sure no purges for protocol-relative URLs were sent.