jenkins-bot has submitted this change and it was merged. Change subject: Revert "Disable hhvm until I figure out why it doesn't work" ......................................................................
Revert "Disable hhvm until I figure out why it doesn't work" https://github.com/facebook/hhvm/pull/2965 is now resolved. This reverts commit 0df2a3984d97de58872daf210b4271bc7cf57c29. Change-Id: Ideec90505b1ce35b209439a9e90d8e02e87a4f1a --- M TranslatewikiSettings.php M puppet/modules/nginx/files/translatewiki.net 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php index 3055a9d..b2eb479 100644 --- a/TranslatewikiSettings.php +++ b/TranslatewikiSettings.php @@ -461,7 +461,7 @@ # Dynamic code starts here -/*$wgHooks['GetBetaFeaturePreferences'][] = function ( $user, &$prefs ) { +$wgHooks['GetBetaFeaturePreferences'][] = function ( $user, &$prefs ) { $prefs['hhvm-beta'] = array( 'label-message' => 'hhvm-beta-label', 'desc-message' => 'hhvm-beta-desc', @@ -469,7 +469,7 @@ 'info-link' => 'http://www.hhvm.com/blog/', 'discussion-link' => '/wiki/Thread:Support/HHVM', ); -};*/ +}; $wgHooks['BeforePageDisplay'][] = function ( OutputPage $out ) { $req = $out->getRequest(); $user = $out->getUser(); diff --git a/puppet/modules/nginx/files/translatewiki.net b/puppet/modules/nginx/files/translatewiki.net index 7861fa7..0d98d27 100644 --- a/puppet/modules/nginx/files/translatewiki.net +++ b/puppet/modules/nginx/files/translatewiki.net @@ -42,9 +42,9 @@ location ~ ^/w/(i|index|load|api|opensearch_desc|profileinfo|webfiles/jserror)\.php$ { set $fastcgi_pass_value unix:/var/run/php5-fpm.sock; -# if ($cookie_hhvm = "1") { -# set $fastcgi_pass_value 127.0.0.1:9000; -# } + if ($cookie_hhvm = "1") { + set $fastcgi_pass_value 127.0.0.1:9000; + } fastcgi_pass $fastcgi_pass_value; fastcgi_buffers 16 4k; -- To view, visit https://gerrit.wikimedia.org/r/141260 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ideec90505b1ce35b209439a9e90d8e02e87a4f1a Gerrit-PatchSet: 2 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit <[email protected]> Gerrit-Reviewer: Nikerabbit <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
