From 844647be9744f1beb6035a5518d655ebee759d24 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 31 May 2011 05:50:48 +0000
Subject: [PATCH] * Fix hphpi mode in run-server, it wasn't quite working
 properly

---
 includes/actions/PurgeAction.php | 2 +-
 maintenance/hiphop/run-server    | 3 +++
 maintenance/hiphop/server.conf   | 5 +----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/actions/PurgeAction.php b/includes/actions/PurgeAction.php
index 74f6e7d9c5..29cbf3ae5b 100644
--- 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 3201689911..0ad4313410 100755
--- 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 e0ea149a76..16af0f2f17 100644
--- 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
 			}
 		}
 	}
 }
-
-- 
2.20.1