roughconsensusandrunningcode/pgpcontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a bug in the recognition of wire-format articles, reported by Jack

Browse source 
Bates.
This commit is contained in:
Russ Allbery 2003-10-05 22:45:13 +00:00
parent 7dd93a98b4
commit a02a578880
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pgpverify
View file

@ -4,7 +4,7 @@
# #
# written April 1996, tale@isc.org (David C Lawrence) # written April 1996, tale@isc.org (David C Lawrence)
# Currently maintained by Russ Allbery <rra@stanford.edu> # Currently maintained by Russ Allbery <rra@stanford.edu>
# Version 1.23, 2003-07-06 # Version 1.24, 2003-10-05
# #
# NOTICE TO INN MAINTAINERS: The version that is shipped with INN is the # NOTICE TO INN MAINTAINERS: The version that is shipped with INN is the
# same as the version that I make available to the rest of the world # same as the version that I make available to the rest of the world
@ -16,6 +16,9 @@
# me about it; I want to know what old versions of Perl are still used in # me about it; I want to know what old versions of Perl are still used in
# practice. # practice.
# #
# Changes from 1.23 -> 1.24
# -- Fix bug in the recognition of wire-format articles.
#
# Changes from 1.15 -> 1.23 # Changes from 1.15 -> 1.23
# -- Bump version number to match CVS revision number. # -- Bump version number to match CVS revision number.
# -- Replaced all signature verification code with code that uses detached # -- Replaced all signature verification code with code that uses detached
@ -253,12 +256,12 @@ exit $ok;
# regards to the headers it checks. It's also insistent about the # regards to the headers it checks. It's also insistent about the
# colon-space rule. # colon-space rule.
sub parse_header { sub parse_header {
my (%header, %dup, $label, $value); my (%header, %dup, $label, $value, $nntp_format);
while (<>) { while (<>) {
# If the first header line ends with \r\n, this article is in the # If the first header line ends with \r\n, this article is in the
# encoding it would be in during an NNTP session. Some article # encoding it would be in during an NNTP session. Some article
# storage managers keep them this way for efficiency. # storage managers keep them this way for efficiency.
my $nntp_format = /\r\n$/ if $. == 1; $nntp_format = /\r\n$/ if $. == 1;
s/\r?\n$//; s/\r?\n$//;
last if /^$/; last if /^$/;