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:56:51 UTC
svn commit: r834731 - in /httpd/mod_ftp/trunk: CHANGES-FTP Makefile.apxs
build/addloadexample.awk
Author: trawick
Date: Wed Nov 11 00:56:51 2009
New Revision: 834731
URL: http://svn.apache.org/viewvc?rev=834731&view=rev
Log:
merge r834729 from mod_fcgid:
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_ftp/trunk/CHANGES-FTP
httpd/mod_ftp/trunk/Makefile.apxs
httpd/mod_ftp/trunk/build/addloadexample.awk
Modified: httpd/mod_ftp/trunk/CHANGES-FTP
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/CHANGES-FTP?rev=834731&r1=834730&r2=834731&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/CHANGES-FTP (original)
+++ httpd/mod_ftp/trunk/CHANGES-FTP Wed Nov 11 00:56:51 2009
@@ -1,6 +1,7 @@
Changes in 0.9.7:
-
+ *) Fix compatibility of httpd.conf-editing logic with non-GNU awk. PR
+ 48067 (mod_fcgid). [Hans Werner Strube <strube physik3.gwdg.de>]
Changes in 0.9.6:
Modified: httpd/mod_ftp/trunk/Makefile.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/Makefile.apxs?rev=834731&r1=834730&r2=834731&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile.apxs (original)
+++ httpd/mod_ftp/trunk/Makefile.apxs Wed Nov 11 00:56:51 2009
@@ -48,7 +48,7 @@
(awk -f $(ftp_srcdir)/build/addloadexample.awk \
-v MODULE=ftp -v DSO=.so -v LIBPATH=$(rel_libexecdir) \
-v EXAMPLECONF=$(rel_sysconfdir)/extra/ftpd.conf \
- $$i > $$i.new && \
+ < $$i > $$i.new && \
mv $$i $$i.bak && mv $$i.new $$i \
) || true; \
fi; \
Modified: httpd/mod_ftp/trunk/build/addloadexample.awk
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/build/addloadexample.awk?rev=834731&r1=834730&r2=834731&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/build/addloadexample.awk (original)
+++ httpd/mod_ftp/trunk/build/addloadexample.awk Wed Nov 11 00:56:51 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 "";