about summary refs log tree commit homepage
path: root/lib/PublicInbox
diff options
context:
space:
mode:
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r--lib/PublicInbox/Config.pm4
-rw-r--r--lib/PublicInbox/WatchMaildir.pm8
-rw-r--r--lib/PublicInbox/WwwText.pm4
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 917939ca..458f29b2 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -367,7 +367,7 @@ sub _fill {
         my $ibx = {};
 
         foreach my $k (qw(inboxdir filter newsgroup
-                        watch watchheader httpbackendmax
+                        watch httpbackendmax
                         replyto feedmax nntpserver indexlevel)) {
                 my $v = $self->{"$pfx.$k"};
                 $ibx->{$k} = $v if defined $v;
@@ -388,7 +388,7 @@ sub _fill {
         # TODO: more arrays, we should support multi-value for
         # more things to encourage decentralization
         foreach my $k (qw(address altid nntpmirror coderepo hide listid url
-                        infourl)) {
+                        infourl watchheader)) {
                 if (defined(my $v = $self->{"$pfx.$k"})) {
                         $ibx->{$k} = _array($v);
                 }
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index bea2ed2a..7b9e8915 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -59,9 +59,11 @@ sub new {
                 my $watch = $ibx->{watch} or return;
                 if (is_maildir($watch)) {
                         my $watch_hdrs = [];
-                        if (my $wh = $ibx->{watchheader}) {
-                                my ($k, $v) = split(/:/, $wh, 2);
-                                push @$watch_hdrs, [ $k, qr/\Q$v\E/ ];
+                        if (my $whs = $ibx->{watchheader}) {
+                                for (@$whs) {
+                                        my ($k, $v) = split(/:/, $_, 2);
+                                        push @$watch_hdrs, [ $k, qr/\Q$v\E/ ];
+                                }
                         }
                         if (my $list_ids = $ibx->{listid}) {
                                 for (@$list_ids) {
diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm
index 2008ba09..b23a415e 100644
--- a/lib/PublicInbox/WwwText.pm
+++ b/lib/PublicInbox/WwwText.pm
@@ -151,7 +151,7 @@ sub inbox_config ($$$) {
         url = https://example.com/$name/
         url = http://example.onion/$name/
 EOS
-        for my $k (qw(address listid infourl)) {
+        for my $k (qw(address listid infourl watchheader)) {
                 defined(my $v = $ibx->{$k}) or next;
                 $$txt .= "\t$k = $_\n" for @$v;
         }
@@ -171,7 +171,7 @@ EOF
                 }
         }
 
-        for my $k (qw(filter newsgroup obfuscate replyto watchheader)) {
+        for my $k (qw(filter newsgroup obfuscate replyto)) {
                 defined(my $v = $ibx->{$k}) or next;
                 $$txt .= "\t$k = $v\n";
         }