OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Nov-2005 14:42:25
Branch: OPENPKG_2_5_SOLID Handle: 2005112013422400
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/apache apache.base apache.spec
Log:
MFC:
Fix mod_fastcgi run-time by providing an IPC directory and a basic
global configuration for allowing mod_fastcgi to be used more
out-of-the-box.
Sponsored by: Fraunhofer Gesellschaft (FhG)
Institut Information- und Datenverarbeitung (IITB)
http://www.iitb.fraunhofer.de/
Summary:
Revision Changes Path
1.15.2.1 +9 -0 openpkg-src/apache/apache.base
1.308.2.4 +10 -1 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.base
============================================================================
$ cvs diff -u -r1.15 -r1.15.2.1 apache.base
--- openpkg-src/apache/apache.base 7 Sep 2005 11:42:53 -0000 1.15
+++ openpkg-src/apache/apache.base 20 Nov 2005 13:42:24 -0000 1.15.2.1
@@ -215,6 +215,15 @@
</Directory>
</IfModule>
+# mod_fastcgi support
+<IfModule mod_fastcgi.c>
+ FastCgiIpcDir "@l_prefix@/var/apache/fastcgi"
+ <Files ~ "\.fcgi$">
+ SetHandler fastcgi-script
+ Options +ExecCGI
+ </Files>
+</IfModule>
+
# mod_perl support
<IfModule mod_perl.c>
# default initializations
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.308.2.3 -r1.308.2.4 apache.spec
--- openpkg-src/apache/apache.spec 3 Nov 2005 07:31:25 -0000
1.308.2.3
+++ openpkg-src/apache/apache.spec 20 Nov 2005 13:42:24 -0000
1.308.2.4
@@ -65,7 +65,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 2.5.2
+Release: 2.5.3
# package options (suexec related)
%option with_suexec yes
@@ -1217,6 +1217,12 @@
%{SOURCE apache.sh} \
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/
+%if "%{with_mod_fastcgi}" == "yes"
+ # provide mod_fastcgi IPC directory
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/apache/fastcgi
+%endif
+
%if "%{with_mod_perl}" == "yes"
# cleanup for mod_perl
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/perl
@@ -1291,6 +1297,9 @@
'%config %{l_prefix}/etc/apache/ssl.key/*.key' \
'%config %{l_prefix}/etc/apache/ssl.prm/*.prm' \
%endif
+%if "%{with_mod_fastcgi}" == "yes"
+ '%attr(750,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/apache/fastcgi' \
+%endif
'%config %attr(444,%{l_musr},%{l_mgrp})
%{l_prefix}/etc/apache/apache.base'
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
