From 7c7d49f8f01291aa60f1f3ea691e88eccb1507ad Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 30 Apr 2014 14:13:14 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/conf/vhost.conf.master | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index a99e0a0..c4269d9 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -333,11 +333,14 @@
</tmpl_if>
</Directory>
<FilesMatch "\.php[345]?$">
- SetHandler php5-fcgi
+ SetHandler hhvm-fcgi
</FilesMatch>
- Action php5-fcgi /php5-fcgi virtual
- Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
- FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket /var/run/hhvm/hhvm.<tmpl_var name='system_user'>.sock -pass-header Authorization
+ <FilesMatch "\.hh$">
+ SetHandler hhvm-fcgi
+ </FilesMatch>
+ Action hhvm-fcgi /hhvm-fcgi virtual
+ Alias /hhvm-fcgi {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
+ FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket /var/run/hhvm/hhvm.<tmpl_var name='system_user'>.sock -pass-header Authorization
</IfModule>
</tmpl_if>
--
Gitblit v1.9.1