Merge branch '4.5.2'

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-04-11 07:13:40 -07:00
commit e791a63671

View File

@ -1694,7 +1694,6 @@ sub copy1( $ ) {
if ( $script || $debug ) {
my ( $do_indent, $here_documents ) = ( 1, '');
my $save_ifstack = $ifstack;
open_file( $_[0] );
@ -1791,13 +1790,6 @@ sub copy1( $ ) {
}
}
if ( $ifstack < @ifstack ) {
$currentlinenumber = 'EOF';
fatal_error "Missing ?ENDIF to match the ?IF at line $ifstack[-1]->[3]";
} else {
$ifstack = $save_ifstack;
}
close_file;
}
}
@ -2290,11 +2282,6 @@ sub read_a_line(;$) {
}
}
if ( @ifstack > $ifstack ) {
$currentlinenumber = 'EOF';
fatal_error "Missing ?ENDIF to match the ?IF at line $ifstack[-1]->[3]";
}
close_file;
}
}