Merge branch 'master' into 'master'

Added Hack language

Author: Marius Cramer

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>