Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by mail-b.sr.ht (Postfix) with ESMTPS id 386F2FF1A7 for <~int80h/public-inbox@lists.sr.ht>; Wed, 11 Nov 2020 23:06:49 +0000 (UTC) Authentication-Results: mail-b.sr.ht; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Jg1SSAKE Received: by mail-il1-f181.google.com with SMTP id z2so3510673ilh.11 for <~int80h/public-inbox@lists.sr.ht>; Wed, 11 Nov 2020 15:06:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q09z2k4V54NxtdTTl+OdZfcYR5wjMRLm5bRdYolPGBA=; b=Jg1SSAKEVm36gw6kWY9ogi3gRi+mfDbxYhnwQJn91Sg826+DL29qKZfr8mAl0tvjvO FiVOy/WvlGIMyVTXpg/5A24INhtCJDIjBt64NoGYfAZhLCbI4cEbh6Q61iIcyOpeYEzy 1PdGMjPcWwCy9Fyr3EZgJojTGeyi7p5WNDvmIZ836GsUsCLxhF9GSMiyQOXgZatrewQW 1orAbjY1yul0hN2XyBXOYdT5dx3U68jmRwAeiRrmQgSj45+t9stKUoEyduyIRHr5lDw1 RKVqMRUa86Ufw7h7rtXb+ZOsJKbg4YMAUCXW834y+xhOt0j2mrr3AFAw7BGVsJH39Rzo 7Cqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q09z2k4V54NxtdTTl+OdZfcYR5wjMRLm5bRdYolPGBA=; b=Wk6RyRP5aY/No0i0v+4rqo42qzC2451soNCHAQROXy0KED8UtTrBUgBlovjcBIdj3t c5y0r69JVsbvtHyVG3gGtPuAZA5KTZf7rgo2UCAgEz62MSN3aorzR7VEq8rtf2daEZ3n RrsFD07mH2MIJp/PX/GvsaFG+ETZ3QYPJN1pvoqufUsrhXkFN6pkj9s3n3TDprSPCKbe 3Z/HbPWbjEjCrmzHJaXnAh9yvjbQSpTs6e0EdIaMOVl3whLxYeuh0xCiFCsuLKqFYx+f LDxxAK62A6z6w9Y8cVzRg7hffI3on88zCY87QryMVusQD7StkdCQH5oT9Y1KTuMJ/ivG aWHw== X-Gm-Message-State: AOAM530B9+gHXZlwe+e3jOIFbNRfmEleK1TJxvd179chjTrGGam3aYXv PQlZqlJ1tHv0M1ff4/6rMqDX+LFAj9Ve7w== X-Google-Smtp-Source: ABdhPJzdy7mnqfzCzr9Xs93f+CRmZjSEOzcRC5c2ShhnjZ38U7obluh5mvcxUCfzwGxDPLaM1JR/qw== X-Received: by 2002:a92:d60b:: with SMTP id w11mr20280663ilm.151.1605136008064; Wed, 11 Nov 2020 15:06:48 -0800 (PST) Received: from localhost.localdomain (c-73-26-85-220.hsd1.nm.comcast.net. [73.26.85.220]) by smtp.gmail.com with ESMTPSA id p18sm1854166ile.72.2020.11.11.15.06.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Nov 2020 15:06:47 -0800 (PST) From: boringcactus To: ~int80h/public-inbox@lists.sr.ht Cc: Melody Horn Subject: [PATCH gemserv] don't round-trip CGI response through UTF-8 Date: Wed, 11 Nov 2020 16:06:28 -0700 Message-Id: <20201111230628.7980-1-boringcactus@gmail.com> X-Mailer: git-send-email 2.20.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Melody Horn this fixes sending binary files from a CGI script --- Sent this directly to int80h, but it's probably wise to put it on the mailing list as well, just in case. src/cgi.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cgi.rs b/src/cgi.rs index a5dd900..1605d53 100644 --- a/src/cgi.rs +++ b/src/cgi.rs @@ -137,13 +137,13 @@ pub async fn cgi( con.send_status(Status::CGIError, None).await?; return Ok(()); } - let cmd =3D String::from_utf8(cmd.stdout).unwrap(); - if !check(cmd.as_bytes()[0], con.peer_addr, url) { + let cmd =3D cmd.stdout; + if !check(cmd[0], con.peer_addr, url) { con.send_status(Status::CGIError, None).await?; return Ok(()); } =20 - con.send_raw(cmd.as_bytes()).await?; + con.send_raw(&cmd).await?; return Ok(()); } =20 --=20 2.20.1.windows.1