From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 741701F61D for ; Sat, 10 Sep 2022 08:18:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1662797932; bh=H8QgZoPvgkFfyxtnELoP91jLgCJuaKsMS3Tg0irjSBw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=syBnBhpRgR3NK9q2WK19+tuIYGbuZm5/lon1Fa5lYLOXKikIGpBfQrPmjvILVXD0k t4tDY+VfQ1iPMWXcGiTMvP+2eRZ4/mAflViRszDq4Cl3RQ0s220wx1S3TjujqAiL9S Zc5IPdpIcW71GIac9hS5+3INGWuGkhBDj+8sHJEQ= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 05/38] www_stream: aresponse assumes 200, too Date: Sat, 10 Sep 2022 08:16:56 +0000 Message-Id: <20220910081729.2011934-6-e@80x24.org> In-Reply-To: <20220910081729.2011934-1-e@80x24.org> References: <20220910081729.2011934-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: There's no reason to be streaming large amounts of HTML for anything other than a 200 response. --- lib/PublicInbox/Feed.pm | 2 +- lib/PublicInbox/SearchView.pm | 2 +- lib/PublicInbox/View.pm | 6 +++--- lib/PublicInbox/WwwStream.pm | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index bdfa0d9d..56ca9886 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -71,7 +71,7 @@ sub new_html { $ctx->{-html_tip} = '
';
 	$ctx->{-upfx} = '';
 	$ctx->{-hr} = 1;
-	PublicInbox::WwwStream::aresponse($ctx, 200, \&new_html_i);
+	PublicInbox::WwwStream::aresponse($ctx, \&new_html_i);
 }
 
 # private subs
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 3dce768f..e0404e5f 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -325,7 +325,7 @@ sub mset_thread {
 
 	@$msgs = reverse @$msgs if $r;
 	$ctx->{msgs} = $msgs;
-	PublicInbox::WwwStream::aresponse($ctx, 200, \&mset_thread_i);
+	PublicInbox::WwwStream::aresponse($ctx, \&mset_thread_i);
 }
 
 # callback for PublicInbox::WwwStream::getline
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 033af283..1cbc62be 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -80,7 +80,7 @@ sub msg_page {
 	# allow user to easily browse the range around this message if
 	# they have ->over
 	$ctx->{-t_max} = $smsg->{ts};
-	PublicInbox::WwwStream::aresponse($ctx, 200, \&msg_page_i);
+	PublicInbox::WwwStream::aresponse($ctx, \&msg_page_i);
 }
 
 # /$INBOX/$MESSAGE_ID/#R
@@ -432,7 +432,7 @@ sub stream_thread_i { # PublicInbox::WwwStream::getline callback
 sub stream_thread ($$) {
 	my ($rootset, $ctx) = @_;
 	@{$ctx->{-queue}} = map { (0, $_) } @$rootset;
-	PublicInbox::WwwStream::aresponse($ctx, 200, \&stream_thread_i);
+	PublicInbox::WwwStream::aresponse($ctx, \&stream_thread_i);
 }
 
 # /$INBOX/$MSGID/t/ and /$INBOX/$MSGID/T/
@@ -483,7 +483,7 @@ EOF
 	# flat display: lazy load the full message from smsg
 	$ctx->{msgs} = $msgs;
 	$ctx->{-html_tip} = '
';
-	PublicInbox::WwwStream::aresponse($ctx, 200, \&thread_html_i);
+	PublicInbox::WwwStream::aresponse($ctx, \&thread_html_i);
 }
 
 sub thread_html_i { # PublicInbox::WwwStream::getline callback
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 115e0440..1fc213d4 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -205,9 +205,9 @@ sub async_next ($) {
 }
 
 sub aresponse {
-	my ($ctx, $code, $cb) = @_;
+	my ($ctx, $cb) = @_;
 	init($ctx, $cb);
-	$ctx->psgi_response($code, delete $ctx->{-res_hdr});
+	$ctx->psgi_response(200, delete $ctx->{-res_hdr});
 }
 
 sub html_init {