about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong (Contractor, The Linux Foundation) <e@80x24.org>2018-04-18 20:58:35 +0000
committerEric Wong (Contractor, The Linux Foundation) <e@80x24.org>2018-04-18 20:58:35 +0000
commitcfb8d16578e7f2f2e300f9f436205e4a8fc7f322 (patch)
tree2b102728613d0019102dccb6d281ed9aaec03326 /lib
parent1dc0f0c10fd856166a6726034de8aec53392901a (diff)
parent119463b3b8517e5ec149198bb83588999118ee1d (diff)
downloadpublic-inbox-cfb8d16578e7f2f2e300f9f436205e4a8fc7f322.tar.gz
* origin/master:
  nntp: allow and ignore empty commands
  mbox: do not barf on queries which return no results
  nntp: fix NEWNEWS command
  searchview: fix non-numeric comparison
  Allow specification of the number of search results to return
  githttpbackend: avoid infinite loop on generic PSGI servers
  http: fix modification of read-only value
  extmsg: use news.gmane.org for Message-ID lookups
  extmsg: rework partial MID matching to favor current inbox
  Update the installation instructions with Fedora package names
  nntp: do not drain rbuf if there is a command pending
  nntp: improve fairness during XOVER and similar commands
  searchidx: do not modify Xapian DB while iterating
  Don't use LIMIT in UPDATE statements
Diffstat (limited to 'lib')
-rw-r--r--lib/PublicInbox/ExtMsg.pm2
-rw-r--r--lib/PublicInbox/Msgmap.pm2
-rw-r--r--lib/PublicInbox/NNTP.pm13
-rw-r--r--lib/PublicInbox/SearchView.pm16
4 files changed, 22 insertions, 11 deletions
diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index a6f516df..04cb4062 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -17,7 +17,7 @@ our @EXT_URL = (
         # leading "//" denotes protocol-relative (http:// or https://)
         '//marc.info/?i=%s',
         '//www.mail-archive.com/search?l=mid&q=%s',
-        'http://mid.gmane.org/%s',
+        'nntp://news.gmane.org/%s',
         'https://lists.debian.org/msgid-search/%s',
         '//docs.FreeBSD.org/cgi/mid.cgi?db=mid&id=%s',
         'https://www.w3.org/mid/%s',
diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index 3237a5ed..ec3d4f9d 100644
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -78,7 +78,7 @@ sub meta_accessor {
         $prev = $dbh->selectrow_array($sql, undef, $key);
 
         if (defined $prev) {
-                $sql = 'UPDATE meta SET val = ? WHERE key = ? LIMIT 1';
+                $sql = 'UPDATE meta SET val = ? WHERE key = ?';
                 $dbh->do($sql, undef, $value, $key);
         } else {
                 $sql = 'INSERT INTO meta (key,val) VALUES (?,?)';
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index ace56e7a..cdbd8e98 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -115,6 +115,7 @@ sub args_ok ($$) {
 sub process_line ($$) {
         my ($self, $l) = @_;
         my ($req, @args) = split(/\s+/, $l);
+        return unless defined($req);
         $req = lc($req);
         $req = eval {
                 no strict 'refs';
@@ -943,11 +944,13 @@ sub event_write {
 sub event_read {
         my ($self) = @_;
         use constant LINE_MAX => 512; # RFC 977 section 2.3
-        my $r = 1;
 
-        my $buf = $self->read(LINE_MAX) or return $self->close;
-        $self->{rbuf} .= $$buf;
-        while ($r > 0 && $self->{rbuf} =~ s/\A\s*([^\r\n]+)\r?\n//) {
+        if (index($self->{rbuf}, "\n") < 0) {
+                my $buf = $self->read(LINE_MAX) or return $self->close;
+                $self->{rbuf} .= $$buf;
+        }
+        my $r = 1;
+        while ($r > 0 && $self->{rbuf} =~ s/\A\s*([^\r\n]*)\r?\n//) {
                 my $line = $1;
                 return $self->close if $line =~ /[[:cntrl:]]/s;
                 my $t0 = now();
@@ -967,7 +970,7 @@ sub event_read {
 sub watch_read {
         my ($self, $bool) = @_;
         my $rv = $self->SUPER::watch_read($bool);
-        if ($bool && $self->{rbuf} ne '') {
+        if ($bool && index($self->{rbuf}, "\n") >= 0) {
                 # Force another read if there is a pipelined request.
                 # We don't know if the socket has anything for us to read,
                 # and we must double-check again by the time the timer fires
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index d038dfca..5d500c1b 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -22,6 +22,7 @@ sub mbox_results {
         my ($ctx) = @_;
         my $q = PublicInbox::SearchQuery->new($ctx->{qp});
         my $x = $q->{x};
+        require PublicInbox::Mbox;
         return PublicInbox::Mbox::mbox_all($ctx, $q->{'q'}) if $x eq 'm';
         sres_top_html($ctx);
 }
@@ -35,7 +36,7 @@ sub sres_top_html {
         my $code = 200;
         # double the limit for expanded views:
         my $opts = {
-                limit => $LIM,
+                limit => $q->{l},
                 offset => $q->{o},
                 mset => 1,
                 relevance => $q->{r},
@@ -181,6 +182,7 @@ sub search_nav_bot {
         my ($mset, $q) = @_;
         my $total = $mset->get_matches_estimated;
         my $o = $q->{o};
+        my $l = $q->{l};
         my $end = $o + $mset->size;
         my $beg = $o + 1;
         my $rv = '</pre><hr><pre id=t>';
@@ -190,15 +192,15 @@ sub search_nav_bot {
         } else {
                 $rv .= "No more results, only $total";
         }
-        my $n = $o + $LIM;
+        my $n = $o + $l;
 
         if ($n < $total) {
-                my $qs = $q->qs_html(o => $n);
+                my $qs = $q->qs_html(o => $n, l => $l);
                 $rv .= qq{  <a\nhref="?$qs"\nrel=next>next</a>}
         }
         if ($o > 0) {
                 $rv .= $n < $total ? '/' : '       ';
-                my $p = $o - $LIM;
+                my $p = $o - $l;
                 my $qs = $q->qs_html(o => ($p > 0 ? $p : 0));
                 $rv .= qq{<a\nhref="?$qs"\nrel=prev>prev</a>};
         }
@@ -305,10 +307,13 @@ sub new {
         my ($class, $qp) = @_;
 
         my $r = $qp->{r};
+        my ($l) = (($qp->{l} || '') =~ /(\d+)/);
+        $l = $LIM if !$l || $l > $LIM;
         bless {
                 q => $qp->{'q'},
                 x => $qp->{x} || '',
                 o => (($qp->{o} || '0') =~ /(\d+)/),
+                l => $l,
                 r => (defined $r && $r ne '0'),
         }, $class;
 }
@@ -331,6 +336,9 @@ sub qs_html {
         if (my $o = $self->{o}) { # ignore o == 0
                 $qs .= "&amp;o=$o";
         }
+        if (my $l = $self->{l}) {
+                $qs .= "&amp;l=$l";
+        }
         if (my $r = $self->{r}) {
                 $qs .= "&amp;r";
         }