From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 16 Jun 2008 20:18:49 +0000 (+0000)
Subject: * (bug 4977) Fix for possible squid purging errors when using HTTP purges
X-Git-Tag: 1.31.0-rc.0~46994
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=dcc1d530fe26c025719482ed26fe58893af56d4b;p=lhc%2Fweb%2Fwiklou.git

* (bug 4977) Fix for possible squid purging errors when using HTTP purges
  and multiple servers
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f5d3b56492..0a9a00b020 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -373,6 +373,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14520) Don't load nonexistent CSS files for Chick/Myskin/Simple skins
 * (bug 14551) Cancel upload no longer automatically suppresses warnings
 * (bug 13878) Deprecate Article::getDB() in favor of direct wfGetDB() calls
+* (bug 4977) Fix for possible squid purging errors when using HTTP purges
+  and multiple servers
 
 === API changes in 1.13 ===
 
diff --git a/includes/SquidUpdate.php b/includes/SquidUpdate.php
index 6a1172aad2..f69d1f0b2c 100644
--- a/includes/SquidUpdate.php
+++ b/includes/SquidUpdate.php
@@ -151,8 +151,9 @@ class SquidUpdate {
 					/* open the remaining sockets for this server */
 					list($server, $port) = explode(':', $wgSquidServers[$ss]);
 					if(!isset($port)) $port = 80;
-					$sockets[$so+1] = @fsockopen($server, $port, $error, $errstr, 2);
-					@stream_set_blocking($sockets[$so+1],false);
+					$socket = @fsockopen($server, $port, $error, $errstr, 2);
+					@stream_set_blocking($socket,false);
+					$sockets[] = $socket;
 				}
 				$so++;
 			}