http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89204
Revision: 89204
Author: tstarling
Date: 2011-05-31 05:50:48 +0000 (Tue, 31 May 2011)
Log Message:
-----------
* Fix hphpi mode in run-server, it wasn't quite working properly
Modified Paths:
--------------
trunk/phase3/includes/actions/PurgeAction.php
trunk/phase3/maintenance/hiphop/run-server
trunk/phase3/maintenance/hiphop/server.conf
Modified: trunk/phase3/includes/actions/PurgeAction.php
===================================================================
--- trunk/phase3/includes/actions/PurgeAction.php 2011-05-31 04:36:19 UTC
(rev 89203)
+++ trunk/phase3/includes/actions/PurgeAction.php 2011-05-31 05:50:48 UTC
(rev 89204)
@@ -57,7 +57,7 @@
}
/**
- * 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() {
Modified: trunk/phase3/maintenance/hiphop/run-server
===================================================================
--- trunk/phase3/maintenance/hiphop/run-server 2011-05-31 04:36:19 UTC (rev
89203)
+++ trunk/phase3/maintenance/hiphop/run-server 2011-05-31 05:50:48 UTC (rev
89204)
@@ -41,6 +41,7 @@
'-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 @@
$sourceBase = realpath( "$IP/.." );
passthru(
+ 'cd ' . wfEscapeShellArg( $sourceBase ) . " && " .
+ 'MW_INSTALL_PATH=' . wfEscapeShellArg( $IP ) . ' ' .
wfEscapeShellArg(
'hphpi',
'-c', "$thisDir/server.conf",
Modified: trunk/phase3/maintenance/hiphop/server.conf
===================================================================
--- trunk/phase3/maintenance/hiphop/server.conf 2011-05-31 04:36:19 UTC (rev
89203)
+++ trunk/phase3/maintenance/hiphop/server.conf 2011-05-31 05:50:48 UTC (rev
89204)
@@ -15,9 +15,6 @@
EnableStaticContentFromDisk = false
AlwaysUseRelativePath = true
}
-ServerVariables {
- MW_COMPILED = 1
-}
VirtualHost {
* {
ServerName = localhost
@@ -26,8 +23,8 @@
* {
pattern = ^/wiki/(.*)$
to = /phase3/index.php?title=$1
+ qsa = true
}
}
}
}
-
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
