* Fix hphpi mode in run-server, it wasn't quite working properly

diff --git a/includes/actions/PurgeAction.php b/includes/actions/PurgeAction.php
index 74f6e7d..29cbf3a 100644 (file)
--- a/includes/actions/PurgeAction.php
+++ b/includes/actions/PurgeAction.php
@@ -57,7 +57,7 @@ class PurgeAction extends FormAction {
        }
 
        /**
-        * purge is slightly wierd because it can be either formed or formless depending
+        * purge is slightly weird because it can be either formed or formless depending
         * on user permissions
         */
        public function show() {

diff --git a/maintenance/hiphop/run-server b/maintenance/hiphop/run-server
index 3201689..0ad4313 100755 (executable)
--- a/maintenance/hiphop/run-server
+++ b/maintenance/hiphop/run-server
@@ -41,6 +41,7 @@ class RunHipHopServer extends Maintenance {
                                '-c', "$thisDir/server.conf",
                                '-v', "Server.SourceRoot=$sourceBase",
                                '-v', "Server.IncludeSearchPaths.0=$sourceBase",
+                               '-v', 'ServerVariables.MW_COMPILED=1',
                                '--mode=server',
                                '--port=8080'
                        ),
@@ -55,6 +56,8 @@ class RunHipHopServer extends Maintenance {
                $sourceBase = realpath( "$IP/.." );
 
                passthru(
+                       'cd ' . wfEscapeShellArg( $sourceBase ) . " && " .
+                       'MW_INSTALL_PATH=' . wfEscapeShellArg( $IP ) . ' ' .
                        wfEscapeShellArg(
                                'hphpi',
                                '-c', "$thisDir/server.conf",

diff --git a/maintenance/hiphop/server.conf b/maintenance/hiphop/server.conf
index e0ea149..16af0f2 100644 (file)
--- a/maintenance/hiphop/server.conf
+++ b/maintenance/hiphop/server.conf
@@ -15,9 +15,6 @@ Server {
        EnableStaticContentFromDisk = false
        AlwaysUseRelativePath = true
 }
-ServerVariables {
-       MW_COMPILED = 1
-}
 VirtualHost {
        * {
                ServerName = localhost
@@ -26,8 +23,8 @@ VirtualHost {
                        * {
                                pattern = ^/wiki/(.*)$
                                to = /phase3/index.php?title=$1
+                               qsa = true
                        }
                }
        }
 }
-