From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 395D4969A1 for ; Tue, 16 Apr 2024 13:44:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 132E618AD0 for ; Tue, 16 Apr 2024 13:44:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 16 Apr 2024 13:44:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 343E8456BB for ; Tue, 16 Apr 2024 13:44:06 +0200 (CEST) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 13:44:04 +0200 Message-Id: <20240416114404.76400-1-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.013 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 Subject: [pve-devel] [PATCH http-server] 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: , X-List-Received-Date: Tue, 16 Apr 2024 11:44:37 -0000 Add support for compressing the body of responses with `Content-Encoding=deflate` as per [RFC9110]. Note that in this context `deflate` is actually a "zlib" data format as defined in [RFC1950]. [RFC9110] https://www.rfc-editor.org/rfc/rfc9110#name-deflate-coding [RFC1950] https://www.rfc-editor.org/rfc/rfc1950 Signed-off-by: Maximiliano Sandoval --- src/PVE/APIServer/AnyEvent.pm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm index b60b825..a43d6bb 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,10 @@ 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}) { + $headers->{'Accept-Encoding'} = 'deflate' if $reqstate->{accept_deflate}; + $headers->{'Accept-Encoding'} = 'gzip' if $reqstate->{accept_gzip}; + } if (defined(my $host = $reqstate->{request}->header('Host'))) { $headers->{Host} = $host; @@ -1361,6 +1371,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