From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.5 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NORMAL_HTTP_TO_IP, NUMERIC_HTTP_ADDR shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id F14551F47C for ; Mon, 9 Jan 2023 05:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1673243547; bh=yemeUww5ch8uXfSuVRz+zJjAYxJhBp96tEKVRMJFB+4=; h=From:To:Subject:Date:From; b=jV80+GFY0eKUDq2K7L/MlQQLH6+jHMrauHJYXpCeWoNJsyKmJ14c56N7em/bqOlPo LYbj4C88SUnQElqUsJu4ZToGEsCNrbKjHrdaxUT6b91eGi4AIRHzfYD5r+YD6fQ2z6 +Bh90EqrC17erxmUrsn9xs3sYcLEY3XAPXGPR5tc= From: Eric Wong To: mwrap-public@80x24.org Subject: [PATCH] httpd: s/X-Mwrap-BT-Depth/X-Mwrap-BT/ Date: Mon, 9 Jan 2023 05:52:27 +0000 Message-Id: <20230109055227.2542265-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This is more consistent with the `MWRAP=bt:' use, since adding `-Depth' seems unnecessary and makes curl commands too long. --- ext/mwrap/httpd.h | 2 +- t/httpd.t | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/mwrap/httpd.h b/ext/mwrap/httpd.h index cea79f7..5c3b83f 100644 --- a/ext/mwrap/httpd.h +++ b/ext/mwrap/httpd.h @@ -899,7 +899,7 @@ static enum mw_qev h1_parse_harder(struct mw_h1 *h1, struct mw_h1req *h1r, * request bodies, so let pico handle parameters in * HTTP request headers, instead. */ - if (NAME_EQ(hdr, "X-Mwrap-BT-Depth")) { + if (NAME_EQ(hdr, "X-Mwrap-BT")) { errno = 0; depth = strtol(hdr->value, &end, 10); if (errno || !valid_end(end)) diff --git a/t/httpd.t b/t/httpd.t index 9a0fae6..76fe7d1 100644 --- a/t/httpd.t +++ b/t/httpd.t @@ -174,12 +174,12 @@ SKIP: { $rc = system(@curl, qw(-d x=y), "http://0/$pid/reset"); is($rc, 0, 'curl /reset'); - $rc = system(@curl, qw(-HX-Mwrap-BT-Depth:10 -XPOST), + $rc = system(@curl, qw(-HX-Mwrap-BT:10 -XPOST), "http://0/$pid/ctl"); - is($rc, 0, 'curl /ctl (X-Mwrap-BT-Depth)'); + is($rc, 0, 'curl /ctl (X-Mwrap-BT)'); like(slurp($cout), qr/\bMWRAP=bt:10\b/, 'changed bt depth'); - $rc = system(@curl, qw(-HX-Mwrap-BT-Depth:10 -d blah http://0/ctl)); + $rc = system(@curl, qw(-HX-Mwrap-BT:10 -d blah http://0/ctl)); is($rc >> 8, 22, '404 w/o PID prefix'); };