You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2009/11/11 01:52:04 UTC
svn commit: r834729 - in /httpd/mod_fcgid/trunk: CHANGES-FCGID Makefile.apxs
build/addloadexample.awk
Author: trawick
Date: Wed Nov 11 00:52:04 2009
New Revision: 834729
URL: http://svn.apache.org/viewvc?rev=834729&view=rev
Log:
Fix compatibility of httpd.conf-editing logic with non-GNU awk.
PR: 48067
Submitted by: Hans Werner Strube <strube physik3.gwdg.de>
Reviewed by: trawick
Modified:
httpd/mod_fcgid/trunk/CHANGES-FCGID
httpd/mod_fcgid/trunk/Makefile.apxs
httpd/mod_fcgid/trunk/build/addloadexample.awk
Modified: httpd/mod_fcgid/trunk/CHANGES-FCGID
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/CHANGES-FCGID?rev=834729&r1=834728&r2=834729&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] (original)
+++ httpd/mod_fcgid/trunk/CHANGES-FCGID [utf8] Wed Nov 11 00:52:04 2009
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with mod_fcgid 2.3.5
+ *) Fix compatibility of httpd.conf-editing logic with non-GNU awk. PR 48067.
+ [Hans Werner Strube <strube physik3.gwdg.de>]
+
*) Fix startup errors creating shared memory in constrained systems, such
as OS X in its default configuration. This is a regression since mod_fcgid
2.2. [Jeff Trawick]
Modified: httpd/mod_fcgid/trunk/Makefile.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/Makefile.apxs?rev=834729&r1=834728&r2=834729&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/Makefile.apxs (original)
+++ httpd/mod_fcgid/trunk/Makefile.apxs Wed Nov 11 00:52:04 2009
@@ -45,7 +45,7 @@
if test -f $$i; then \
(awk -f $(fcgid_srcdir)/build/addloadexample.awk \
-v MODULE=fcgid -v DSO=.so -v LIBPATH=$(rel_libexecdir) \
- $$i > $$i.new && \
+ < $$i > $$i.new && \
mv $$i $$i.bak && mv $$i.new $$i \
) || true; \
fi; \
Modified: httpd/mod_fcgid/trunk/build/addloadexample.awk
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/build/addloadexample.awk?rev=834729&r1=834728&r2=834729&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/build/addloadexample.awk (original)
+++ httpd/mod_fcgid/trunk/build/addloadexample.awk Wed Nov 11 00:52:04 2009
@@ -32,7 +32,7 @@
END {
if ( lms < 3 ) {
- if ( ! /^[ \t]*$/ ) print "";
+ if ( $0 !~ /^[ \t]*$/ ) print "";
if ( lms < 2 ) {
print "LoadModule " MODULE "_module " LIBPATH "/mod_" MODULE DSO;
print "";