update relnotes

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

diff --git a/includes/SquidUpdate.php b/includes/SquidUpdate.php
index ef6d620..700fc8e 100644 (file)
--- a/includes/SquidUpdate.php
+++ b/includes/SquidUpdate.php
@@ -1,17 +1,15 @@
 <?php
 /**
  * See deferred.txt
- * @package MediaWiki
  */
 
 /**
  *
- * @package MediaWiki
  */
 class SquidUpdate {
        var $urlArr, $mMaxTitles;
 
-       function SquidUpdate( $urlArr = Array(), $maxTitles = false ) {
+       function __construct( $urlArr = Array(), $maxTitles = false ) {
                global $wgMaxSquidPurgeTitles;
                if ( $maxTitles === false ) {
                        $this->mMaxTitles = $wgMaxSquidPurgeTitles;
@@ -29,9 +27,7 @@ class SquidUpdate {
                wfProfileIn( $fname );
 
                # Get a list of URLs linking to this page
-               $id = $title->getArticleID();
-
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE );
                $res = $dbr->select( array( 'links', 'page' ),
                        array( 'page_namespace', 'page_title' ),
                        array(
@@ -54,6 +50,10 @@ class SquidUpdate {
        }
 
        /* static */ function newFromTitles( &$titles, $urlArr = array() ) {
+               global $wgMaxSquidPurgeTitles;
+               if ( count( $titles ) > $wgMaxSquidPurgeTitles ) {
+                       $titles = array_slice( $titles, 0, $wgMaxSquidPurgeTitles );
+               }
                foreach ( $titles as $title ) {
                        $urlArr[] = $title->getInternalURL();
                }
@@ -77,10 +77,10 @@ class SquidUpdate {
        /* static */ function purge( $urlArr ) {
                global $wgSquidServers, $wgHTCPMulticastAddress, $wgHTCPPort;
 
-               if ( $wgSquidServers == 'echo' ) {
-                       echo implode("<br />\n", $urlArr);
+               /*if ( (@$wgSquidServers[0]) == 'echo' ) {
+                       echo implode("<br />\n", $urlArr) . "<br />\n";
                        return;
-               }
+               }*/
 
                if ( $wgHTCPMulticastAddress && $wgHTCPPort )
                        SquidUpdate::HTCPPurge( $urlArr );
@@ -90,7 +90,7 @@ class SquidUpdate {
 
                $maxsocketspersquid = 8; //  socket cap per Squid
                $urlspersocket = 400; // 400 seems to be a good tradeoff, opening a socket takes a while
-               $firsturl = $urlArr[0];
+               $firsturl = SquidUpdate::expand( $urlArr[0] );
                unset($urlArr[0]);
                $urlArr = array_values($urlArr);
                $sockspersq =  max(ceil(count($urlArr) / $urlspersocket ),1);
@@ -143,8 +143,8 @@ class SquidUpdate {
                                        /* open the remaining sockets for this server */
                                        list($server, $port) = explode(':', $wgSquidServers[$ss]);
                                        if(!isset($port)) $port = 80;
-                                       $sockets[] = @fsockopen($server, $port, $error, $errstr, 2);
-                                       @stream_set_blocking($sockets[$s],false);
+                                       $sockets[$so+1] = @fsockopen($server, $port, $error, $errstr, 2);
+                                       @stream_set_blocking($sockets[$so+1],false);
                                }
                                $so++;
                        }
@@ -164,7 +164,8 @@ class SquidUpdate {
                                                }
                                        }
                                        $urindex = $r + $urlspersocket * ($s - $sockspersq * floor($s / $sockspersq));
-                                       $msg = 'PURGE ' . $urlArr[$urindex] . " HTTP/1.0\r\n".
+                                       $url = SquidUpdate::expand( $urlArr[$urindex] );
+                                       $msg = 'PURGE ' . $url . " HTTP/1.0\r\n".
                                        "Connection: Keep-Alive\r\n\r\n";
                                        #$this->debug($msg);
                                        @fputs($sockets[$s],$msg);
@@ -196,9 +197,11 @@ class SquidUpdate {
                $htcpOpCLR = 4;                 // HTCP CLR
 
                // FIXME PHP doesn't support these socket constants (include/linux/in.h)
-               define( "IPPROTO_IP", 0 );
-               define( "IP_MULTICAST_LOOP", 34 );
-               define( "IP_MULTICAST_TTL", 33 );
+               if( !defined( "IPPROTO_IP" ) ) {
+                       define( "IPPROTO_IP", 0 );
+                       define( "IP_MULTICAST_LOOP", 34 );
+                       define( "IP_MULTICAST_TTL", 33 );
+               }
 
                // pfsockopen doesn't work because we need set_sock_opt
                $conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP );
@@ -210,13 +213,18 @@ class SquidUpdate {
                                        $wgHTCPMulticastTTL );
 
                        foreach ( $urlArr as $url ) {
+                               if( !is_string( $url ) ) {
+                                       wfDebugDieBacktrace( 'Bad purge URL' );
+                               }
+                               $url = SquidUpdate::expand( $url );
+                               
                                // Construct a minimal HTCP request diagram
                                // as per RFC 2756
                                // Opcode 'CLR', no response desired, no auth
                                $htcpTransID = rand();
 
                                $htcpSpecifier = pack( 'na4na*na8n',
-                                       4, 'NONE', strlen( $url ), $url,
+                                       4, 'HEAD', strlen( $url ), $url,
                                        8, 'HTTP/1.0', 0 );
 
                                $htcpDataLen = 8 + 2 + strlen( $htcpSpecifier );
@@ -247,5 +255,26 @@ 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-
+        * qualified will be passed through unchanged.
+        *
+        * This is used to generate purge URLs that may be either local to the
+        * main wiki or include a non-native host, such as images hosted on a
+        * second internal server.
+        *
+        * Client functions should not need to call this.
+        *
+        * @return string
+        */
+       static function expand( $url ) {
+               global $wgInternalServer;
+               if( $url != '' && $url{0} == '/' ) {
+                       return $wgInternalServer . $url;
+               }
+               return $url;
+       }
 }
 ?>