Skip to content

Commit a753a43

Browse files
author
redray
committed
- changed "AllowOverride all" for fast-cgi: fixes problems with i.e. serendipity blog
- added fast-cgi part to ssl section
1 parent e02e773 commit a753a43

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

server/conf/vhost.conf.master

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
AddHandler fcgid-script .php .php3 .php4 .php5
7272
FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
7373
Options +ExecCGI
74-
AllowOverride None
74+
AllowOverride all
7575
Order allow,deny
7676
Allow from all
7777
</Directory>
@@ -91,7 +91,8 @@
9191
php_admin_value session.save_path <tmpl_var name='document_root'>/tmp
9292
#php_admin_value open_basedir <tmpl_var name='document_root'>:/usr/share/php5
9393
</tmpl_if>
94-
<tmpl_var name='apache_directives'>
94+
95+
<tmpl_var name='apache_directives'>
9596
</VirtualHost>
9697

9798

@@ -159,7 +160,17 @@
159160
# php as cgi enabled
160161
AddType application/x-httpd-php .php .php3 .php4 .php5
161162
</tmpl_if>
162-
163+
<tmpl_if name='php' op='==' value='fast-cgi'>
164+
# php as fast-cgi enabled
165+
<Directory {tmpl_var name='web_document_root_www'}>
166+
AddHandler fcgid-script .php .php3 .php4 .php5
167+
FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
168+
Options +ExecCGI
169+
AllowOverride all
170+
Order allow,deny
171+
Allow from all
172+
</Directory>
173+
</tmpl_if>
163174
<tmpl_if name="rewrite_enabled">
164175

165176
RewriteEngine on
@@ -177,8 +188,7 @@
177188
#php_admin_value open_basedir <tmpl_var name='document_root'>:/usr/share/php5
178189
</tmpl_if>
179190

180-
<tmpl_var name='apache_directives'>
181-
191+
<tmpl_var name='apache_directives'>
182192
</VirtualHost>
183193
</IfModule>
184194

0 commit comments

Comments
 (0)