X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTP.pm;h=12f74c3dd3fb24955aeec4bb16f70418615e4ebd;hb=ea45e9f71588572a2f4b9299a86cedc3c8e9c72a;hp=6845e8727d177fd83eef8398952957dbc9fde8c6;hpb=c608ab025c4351c820c97e0ed907647274c662a2;p=public-inbox.git

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 6845e872..12f74c3d 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -220,16 +220,17 @@ sub parse_time ($$;$) {
 		$gmt =~ /\A(?:UTC|GMT)\z/i or die "GM invalid: $gmt";
 		$gmt = 1;
 	}
-	my @now = $gmt ? gmtime : localtime;
 	my ($YYYY, $MM, $DD);
 	if (bytes::length($date) == 8) { # RFC 3977 allows YYYYMMDD
 		($YYYY, $MM, $DD) = unpack('A4A2A2', $date);
 	} else { # legacy clients send YYMMDD
-		($YYYY, $MM, $DD) = unpack('A2A2A2', $date);
+		my $YY;
+		($YY, $MM, $DD) = unpack('A2A2A2', $date);
+		my @now = $gmt ? gmtime : localtime;
 		my $cur_year = $now[5] + 1900;
-		if ($YYYY > $cur_year) {
-			$YYYY += int($cur_year / 1000) * 1000 - 100;
-		}
+		my $cur_cent = int($cur_year / 100) * 100;
+		$YYYY = (($YY + $cur_cent) > $cur_year) ?
+			($YY + 1900) : ($YY + $cur_cent);
 	}
 	if ($gmt) {
 		timegm($ss, $mm, $hh, $DD, $MM - 1, $YYYY);
@@ -422,10 +423,7 @@ sub set_nntp_headers ($$$$$) {
 		$hdr->header_set('Message-ID', $mid0);
 		my @alt = $hdr->header('X-Alt-Message-ID');
 		my %seen = map { $_ => 1 } (@alt, $mid0);
-		foreach my $m (@mids) {
-			next if $seen{$m}++;
-			push @alt, $m;
-		}
+		push(@alt, grep { !$seen{$_}++ } @mids);
 		$hdr->header_set('X-Alt-Message-ID', @alt);
 	}
 
@@ -595,12 +593,11 @@ sub get_range ($$) {
 sub long_step {
 	my ($self) = @_;
 	# wbuf is unset or empty, here; {long} may add to it
-	my ($cb, $t0, @args) = @{$self->{long_cb}};
+	my ($fd, $cb, $t0, @args) = @{$self->{long_cb}};
 	my $more = eval { $cb->($self, @args) };
 	if ($@ || !$self->{sock}) { # something bad happened...
 		delete $self->{long_cb};
 		my $elapsed = now() - $t0;
-		my $fd = fileno($self->{sock});
 		if ($@) {
 			err($self,
 			    "%s during long response[$fd] - %0.6f",
@@ -616,20 +613,19 @@ sub long_step {
 		# each other's data
 		$self->zflush;
 
-		# no recursion, schedule another call ASAP
-		# but only after all pending writes are done
-		my $wbuf = $self->{wbuf} ||= [];
-		push @$wbuf, \&long_step;
+		# no recursion, schedule another call ASAP, but only after
+		# all pending writes are done.  autovivify wbuf:
+		my $new_size = push(@{$self->{wbuf}}, \&long_step);
 
 		# wbuf may be populated by $cb, no need to rearm if so:
-		$self->requeue if scalar(@$wbuf) == 1;
+		$self->requeue if $new_size == 1;
 	} else { # all done!
 		delete $self->{long_cb};
 		res($self, '.');
 		my $elapsed = now() - $t0;
 		my $fd = fileno($self->{sock});
 		out($self, " deferred[$fd] done - %0.6f", $elapsed);
-		my $wbuf = $self->{wbuf};
+		my $wbuf = $self->{wbuf}; # do NOT autovivify
 		$self->requeue unless $wbuf && @$wbuf;
 	}
 }
@@ -637,11 +633,11 @@ sub long_step {
 sub long_response ($$;@) {
 	my ($self, $cb, @args) = @_; # cb returns true if more, false if done
 
-	$self->{sock} or return;
+	my $sock = $self->{sock} or return;
 	# make sure we disable reading during a long response,
 	# clients should not be sending us stuff and making us do more
 	# work while we are stream a response to them
-	$self->{long_cb} = [ $cb, now(), @args ];
+	$self->{long_cb} = [ fileno($sock), $cb, now(), @args ];
 	long_step($self); # kick off!
 	undef;
 }