From a900cba77ca779031a4e899d4629a9603378a9e7 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Sun, 13 Jan 2013 18:03:35 +0200
Subject: [PATCH] switching from addhandler to sethandler

---
 install/0.9.7/rhel/templates/web/apache_phpcgi.stpl   | 9 +++++----
 install/0.9.7/rhel/templates/web/apache_phpcgi.tpl    | 9 +++++----
 install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl | 9 +++++----
 install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl  | 9 +++++----
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/install/0.9.7/rhel/templates/web/apache_phpcgi.stpl b/install/0.9.7/rhel/templates/web/apache_phpcgi.stpl
index 4a4a386c0..b56dbc37a 100755
--- a/install/0.9.7/rhel/templates/web/apache_phpcgi.stpl
+++ b/install/0.9.7/rhel/templates/web/apache_phpcgi.stpl
@@ -12,12 +12,13 @@
     CustomLog /var/log/httpd/domains/%domain%.log combined
     %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %sdocroot%>
-        AllowOverride AuthConfig FileInfo Indexes Limit
         SSLRequireSSL
-        Options +Includes -Indexes %cgi_option%
-        php_admin_flag engine off
+        AllowOverride All
+        Options +Includes -Indexes +ExecCGI
         Action phpcgi-script /cgi-bin/php
-        AddHandler phpcgi-script .php
+        <Files *.php>
+            SetHandler phpcgi-script
+        </Files>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/0.9.7/rhel/templates/web/apache_phpcgi.tpl b/install/0.9.7/rhel/templates/web/apache_phpcgi.tpl
index ce58bf2b8..4fd56c33a 100755
--- a/install/0.9.7/rhel/templates/web/apache_phpcgi.tpl
+++ b/install/0.9.7/rhel/templates/web/apache_phpcgi.tpl
@@ -12,11 +12,12 @@
     CustomLog /var/log/httpd/domains/%domain%.log combined
     %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
-        AllowOverride AuthConfig FileInfo Indexes Limit
-        Options +Includes -Indexes %cgi_option%
-        php_admin_flag engine off
+        AllowOverride All
+        Options +Includes -Indexes +ExecCGI
         Action phpcgi-script /cgi-bin/php
-        AddHandler phpcgi-script .php
+        <Files *.php>
+            SetHandler phpcgi-script
+        </Files>
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl b/install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl
index 1fd9c8cdd..76548ddd9 100755
--- a/install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl
+++ b/install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl
@@ -12,11 +12,12 @@
     CustomLog /var/log/httpd/domains/%domain%.log combined
     %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %sdocroot%>
-        AllowOverride AuthConfig FileInfo Indexes Limit
         SSLRequireSSL
-        Options +Includes -Indexes %cgi_option%
-        php_admin_flag engine off
-        AddHandler fcgid-script .php
+        AllowOverride All
+        Options +Includes -Indexes +ExecCGI
+        <Files *.php>
+          SetHandler fcgid-script
+        </Files>
         FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
diff --git a/install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl b/install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl
index 2bca8ac76..2ae2a212f 100755
--- a/install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl
+++ b/install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl
@@ -12,10 +12,11 @@
     CustomLog /var/log/httpd/domains/%domain%.log combined
     %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
-        AllowOverride AuthConfig FileInfo Indexes Limit
-        Options +Includes -Indexes %cgi_option%
-        php_admin_flag engine off
-        AddHandler fcgid-script .php
+        AllowOverride All
+        Options +Includes -Indexes +ExecCGI
+        <Files *.php>
+          SetHandler fcgid-script
+        </Files>
         FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>