From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id E32271FF37F for ; Thu, 18 Apr 2024 11:17:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D43DD17D37; Thu, 18 Apr 2024 11:17:08 +0200 (CEST) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Thu, 18 Apr 2024 11:16:35 +0200 Message-Id: <20240418091635.227368-1-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.012 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [anyevent.pm, rfc-editor.org] Subject: [pve-devel] [PATCH http-server v3] http: support Content-Encoding=deflate X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Add support for compressing the body of responses with `Content-Encoding: deflate` following [RFC9110]. Note that in this context `deflate` is actually a "zlib" data format as defined in [RFC1950]. To preserve the current behavior we prefer `Content-Encoding: gzip` whenever `gzip` is listed as one of the encodings in the `Accept-Encoding` header and the data should be compressed. [RFC9110] https://www.rfc-editor.org/rfc/rfc9110#name-deflate-coding [RFC1950] https://www.rfc-editor.org/rfc/rfc1950 Suggested-by: Lukas Wagner Tested-by: Folke Gleumes Signed-off-by: Maximiliano Sandoval --- Differences from v2: - Remove redundant post-ifs - Add Tested-by: Folke Gleumes trailer Differences from v1: - The commit documents the behavior better - Add Suggested-by - We set both gzip and deflate in the Accept-Encoding header if available src/PVE/APIServer/AnyEvent.pm | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm index b60b825..a8d60c1 100644 --- a/src/PVE/APIServer/AnyEvent.pm +++ b/src/PVE/APIServer/AnyEvent.pm @@ -123,6 +123,7 @@ sub cleanup_reqstate { delete $reqstate->{request}; delete $reqstate->{proto}; delete $reqstate->{accept_gzip}; + delete $reqstate->{accept_deflate}; delete $reqstate->{starttime}; if ($reqstate->{tmpfilename}) { @@ -288,7 +289,7 @@ sub response { $reqstate->{hdl}->timeout($self->{timeout}); $nocomp = 1 if !$self->{compression}; - $nocomp = 1 if !$reqstate->{accept_gzip}; + $nocomp = 1 if !$reqstate->{accept_gzip} && !$reqstate->{accept_deflate}; my $code = $resp->code; my $msg = $resp->message || HTTP::Status::status_message($code); @@ -333,11 +334,17 @@ sub response { $content_length = length($content); if (!$nocomp && ($content_length > 1024)) { - my $comp = Compress::Zlib::memGzip($content); - $resp->header('Content-Encoding', 'gzip'); - $content = $comp; - $content_length = length($content); + if ($reqstate->{accept_gzip}) { + my $comp = Compress::Zlib::memGzip($content); + $resp->header('Content-Encoding', 'gzip'); + $content = $comp; + } elsif ($reqstate->{accept_deflate}) { + my $comp = Compress::Zlib::compress($content); + $resp->header('Content-Encoding', 'deflate'); + $content = $comp; + } } + $content_length = length($content); $resp->header("Content-Length" => $content_length); $reqstate->{log}->{content_length} = $content_length; @@ -735,7 +742,15 @@ sub proxy_request { if $auth->{api_token}; $headers->{'CSRFPreventionToken'} = $auth->{token} if $auth->{token}; - $headers->{'Accept-Encoding'} = 'gzip' if ($reqstate->{accept_gzip} && $self->{compression}); + if ($self->{compression}) { + if ($reqstate->{accept_deflate} && $reqstate->{accept_gzip}) { + $headers->{'Accept-Encoding'} = 'gzip, deflate'; + } elsif ($reqstate->{accept_gzip}) { + $headers->{'Accept-Encoding'} = 'gzip'; + } elsif ($reqstate->{accept_deflate}) { + $headers->{'Accept-Encoding'} = 'deflate'; + } + } if (defined(my $host = $reqstate->{request}->header('Host'))) { $headers->{Host} = $host; @@ -1361,6 +1376,7 @@ sub process_header { my $conn = $request->header('Connection'); my $accept_enc = $request->header('Accept-Encoding'); $reqstate->{accept_gzip} = ($accept_enc && $accept_enc =~ m/gzip/) ? 1 : 0; + $reqstate->{accept_deflate} = ($accept_enc && $accept_enc =~ m/deflate/) ? 1 : 0; if ($conn) { $reqstate->{keep_alive} = 0 if $conn =~ m/close/oi; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel