Note incorrect docs in DefaultSettings.php

[lhc/web/wiklou.git] / includes / SquidUpdate.php

diff --git a/includes/SquidUpdate.php b/includes/SquidUpdate.php
index db2750c..b1f0192 100644 (file)
--- a/includes/SquidUpdate.php
+++ b/includes/SquidUpdate.php
@@ -1,10 +1,13 @@
 <?php
 /**
  * See deferred.txt
+ * @file
+ * @ingroup Cache
  */
 
 /**
- *
+ * Handles purging appropriate Squid URLs given a title (or titles)
+ * @ingroup Cache
  */
 class SquidUpdate {
        var $urlArr, $mMaxTitles;
@@ -49,13 +52,17 @@ class SquidUpdate {
                return new SquidUpdate( $blurlArr );
        }
 
-       static function newFromTitles( &$titles, $urlArr = array() ) {
+       /**
+        * Create a SquidUpdate from an array of Title objects, or a TitleArray object
+        */
+       static function newFromTitles( $titles, $urlArr = array() ) {
                global $wgMaxSquidPurgeTitles;
-               if ( count( $titles ) > $wgMaxSquidPurgeTitles ) {
-                       $titles = array_slice( $titles, 0, $wgMaxSquidPurgeTitles );
-               }
+               $i = 0;
                foreach ( $titles as $title ) {
                        $urlArr[] = $title->getInternalURL();
+                       if ( $i++ > $wgMaxSquidPurgeTitles ) {
+                               break;
+                       }
                }
                return new SquidUpdate( $urlArr );
        }
@@ -81,7 +88,7 @@ class SquidUpdate {
                        echo implode("<br />\n", $urlArr) . "<br />\n";
                        return;
                }*/
-               
+
                if( empty( $urlArr ) ) {
                        return;
                }
@@ -148,8 +155,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++;
                        }
@@ -219,10 +227,10 @@ class SquidUpdate {
 
                        foreach ( $urlArr as $url ) {
                                if( !is_string( $url ) ) {
-                                       wfDebugDieBacktrace( 'Bad purge URL' );
+                                       throw new MWException( 'Bad purge URL' );
                                }
                                $url = SquidUpdate::expand( $url );
-                               
+
                                // Construct a minimal HTCP request diagram
                                // as per RFC 2756
                                // Opcode 'CLR', no response desired, no auth
@@ -260,7 +268,7 @@ class SquidUpdate {
                        wfDebug( $text );
                }
        }
-       
+
        /**
         * Expand local URLs to fully-qualified URLs using the internal protocol
         * and host defined in $wgInternalServer. Input that's already fully-
@@ -282,4 +290,3 @@ class SquidUpdate {
                return $url;
        }
 }
-