* [PATCH] www: avoid warnings on YYYYMMDD-only t= query parameter
@ 2020-08-07 10:42 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2020-08-07 10:42 UTC (permalink / raw)
To: meta
While we always generate YYYYMMDDhhmmss query parameters
ourselves, the regexps in paginate_recent allow YYYYMMDD-only
(no hhmmss) timestamps, so don't trigger Time::Local::timegm
warnings about empty numeric comparisons on empty strings when a
client starts making up their own URLs.
---
lib/PublicInbox/View.pm | 2 +-
t/psgi_v2.t | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 4cb72bea..f23bfcc9 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -1147,7 +1147,7 @@ sub ts2str ($) { strftime('%Y%m%d%H%M%S', gmtime($_[0])) };
sub str2ts ($) {
my ($yyyy, $mon, $dd, $hh, $mm, $ss) = unpack('A4A2A2A2A2A2', $_[0]);
- timegm($ss, $mm, $hh, $dd, $mon - 1, $yyyy);
+ timegm($ss || 0, $mm || 0, $hh || 0, $dd, $mon - 1, $yyyy);
}
sub pagination_footer ($$) {
diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index 4ab9601c..11aef5b3 100644
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -296,6 +296,9 @@ my $client3 = sub {
}
$res = $cb->(GET('/v2test/?t=1970'.'01'.'01'.'000000'));
is($res->code, 404, '404 for out-of-range t= param');
+ @warn = ();
+ $res = $cb->(GET('/v2test/?t=1970'.'01'.'01'));
+ is_deeply(\@warn, [], 'no warnings on YYYYMMDD only');
};
test_psgi(sub { $www->call(@_) }, $client3);
$run_httpd->($client3, 4);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-08-07 10:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-07 10:42 [PATCH] www: avoid warnings on YYYYMMDD-only t= query parameter Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).