INN commit: branches/2.5 (doc/pod/news.pod frontends/cnfsheadconf.in)
INN Commit
rra at isc.org
Sat May 8 10:04:15 UTC 2010
Date: Saturday, May 8, 2010 @ 03:04:15
Author: iulius
Revision: 9052
cnfsheadconf now properly recognizes continuation lines in
cycbuff.conf, that is to say lines ending with a backslash (\).
Thanks to John F. Morse for the bug report.
Modified:
branches/2.5/doc/pod/news.pod
branches/2.5/frontends/cnfsheadconf.in
---------------------------+
doc/pod/news.pod | 12 ++++++++++++
frontends/cnfsheadconf.in | 13 +++++++++++--
2 files changed, 23 insertions(+), 2 deletions(-)
Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod 2010-05-08 10:03:18 UTC (rev 9051)
+++ doc/pod/news.pod 2010-05-08 10:04:15 UTC (rev 9052)
@@ -1,3 +1,15 @@
+=head1 Changes in 2.5.3
+
+=over 2
+
+=item *
+
+B<cnfsheadconf> now properly recognizes continuation lines in
+F<cycbuff.conf>, that is to say lines ending with a backslash (C<\>).
+Thanks to John S<F. Morse> for the bug report.
+
+=back
+
=head1 Changes in 2.5.2
The way checkpoints are handled by B<innreport> for B<innd> and B<innfeed>
Modified: frontends/cnfsheadconf.in
===================================================================
--- frontends/cnfsheadconf.in 2010-05-08 10:03:18 UTC (rev 9051)
+++ frontends/cnfsheadconf.in 2010-05-08 10:04:15 UTC (rev 9052)
@@ -116,8 +116,17 @@
return 0 unless open (CONFFILE, $conffile);
while(<CONFFILE>) {
- $_ =~ s/^\s*(.*?)\s*$/$1/;
- # \x23 below is #. Emacs perl-mode gets confused by the "comment"
+ $_ =~ s/^\s*(.*?)\s*$/$1/;
+
+ # Read continuation lines.
+ while(/\\$/) {
+ chop;
+ chop($next = <CONFFILE>);
+ $next =~ s/^\s*(.*?)\s*$/$1/;
+ $_ .= $next;
+ }
+
+ # \x23 below is #. Emacs perl-mode gets confused by the "comment".
next if($_ =~ /^\s*$/ || $_ =~ /^\x23/);
next if($_ =~ /^cycbuffupdate:/ || $_ =~ /^refreshinterval:/);
More information about the inn-committers
mailing list