From patchwork Tue Jan 12 22:20:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Ponomarev X-Patchwork-Id: 1425491 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=ahOJjuy0; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=SjRFbdTP; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DFmLF1hqlz9sWg for ; Wed, 13 Jan 2021 10:02:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mpIOMoEO8wBDVQAeESMYVmtUOhAed6G4395SnF5xCgg=; b=ahOJjuy0j+dgvP6YIUzxNdu7Q 6aFhHyOOcfogSeFXXH53WNmOW8pQxHhganjMRQ9oXCRaw0kXNqhv0bmd5IZ6hdIRXgIAJ0UpY5kIN TVQL+vrVpYqVDlIelsPUcl7gfDY4BOlVCttbRrno+CgGRarKnVHbnBi2BRBdY+AikeK0DSnpb7K9T 22rB3eYAaLn1a4aS4ShL3ENzpR/BxCP2IJ8tpKyhgIFFjdHDAtnSihfyb6uC9BlOO2j5EFyu/13EV FwSbCPRD4quZ32hDT69krVO4unBCBioTI74kf33A2L6DW1z13lWUFyXrV33ORV9iLiHvNJ3Yyc+Iy yTZXEgkrQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzS2X-0003xk-IF; Tue, 12 Jan 2021 22:21:25 +0000 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzS2N-0003rw-5T for openwrt-devel@lists.openwrt.org; Tue, 12 Jan 2021 22:21:16 +0000 Received: by mail-ed1-x52a.google.com with SMTP id i24so4120611edj.8 for ; Tue, 12 Jan 2021 14:21:13 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=KPX/GMA3fL58udoEM/k9ctPbbS60yWcieA081OuYCYs=; b=SjRFbdTPXlfUFsARDSox9DM0jHjcJAbJjbLQS2JZmRuDzoumnENGH40CsED58EYSIF IqqIXsy26QBH6Wd4KessiuwXkdwYjFPN5qMGXNs0SgQhnrMXUjzZBYwxLCQbmw2eHyWC hi6S34dqKqjaXM4ZvIeTQY6YwgjwY+wRfwbvIQJBS3MqyHTcSIkkKoIG/6gJFZMyk8NI /PL9wiqDooDUvegf40OvZ8Sx5XSkgPLRB2Vr0HCkC5S5zGpTLOzyOrHw9J5OEUwbrH7Z D60P6p1TUPyNiMKQnMXOkmykYluFoz0J+TrCYP3SQWXIxXS9xElUkgKY3AIVA6d8M1Fv zR8A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=KPX/GMA3fL58udoEM/k9ctPbbS60yWcieA081OuYCYs=; b=po307QJhw6iyppprrrMBb2P6Lqg+7IL8vjoV3Por2v1c3YpOpD+R3xGD4Z6UcAAASG Fd0yq/33FPvu5Lpxjrt1FXl4KJJBhnVrM/Se56fhiZwURDVsIiX8t0N1WRdyDT31qI3u ubL08rtG1B1Rd+Ex5fTVyJ7/knNlH/ZB7KoC+dVucwDDtkv7L3H8vtXXBDQyRtdidmc+ /GDGoXijohcCwICs13jG7+3tMsAsqYk/zhsLW9MqaxmVtkLWspAaIVZ3CzVb9DNcmsgv 6eVDqA6KFOmR77d9UNtMDwRSPOrf8czbHtIrmk2Rts1r6EjcrQWxexi1mBOPz0tGDMQ3 qBJg== X-Gm-Message-State: AOAM532DiGcoZnB5a50HD1hWCcTIrE/0lInq2HGw/U7BRFHHEtTDTT3L uY9+/BsEDXM/riGTGptRgp15JPrdFrtAfQ== X-Google-Smtp-Source: ABdhPJwyDwx9hjAgPY/AmYV3NZyTdWtDHl3b78F1tnkXe82ZQAkedCDaRUIt8eHalxBwkaneFCl7zw== X-Received: by 2002:aa7:cd63:: with SMTP id ca3mr1059719edb.164.1610490072487; Tue, 12 Jan 2021 14:21:12 -0800 (PST) Received: from localhost.localdomain ([46.98.213.161]) by smtp.gmail.com with ESMTPSA id t15sm6727eds.38.2021.01.12.14.21.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 14:21:12 -0800 (PST) From: Sergey Ponomarev To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/2] Generate ETag similar to Nginx and BusyBox HTTPD Date: Wed, 13 Jan 2021 00:20:57 +0200 Message-Id: <20210112222057.26876-3-stokito@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210112222057.26876-1-stokito@gmail.com> References: <20210112222057.26876-1-stokito@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210112_172115_301973_A49288F7 X-CRM114-Status: GOOD ( 13.05 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:52a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [stokito[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sergey Ponomarev Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Thus user run Luci on them and all cached files will work as previous because ETag is the same. --- file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/file.c b/file.c index 759ffd6..e0a4fb3 100644 --- a/file.c +++ b/file.c @@ -300,8 +300,9 @@ static const char * uh_file_mime_lookup(const char *path) static const char * uh_file_mktag(struct stat *s, char *buf, int len) { + /* ETag is "hex(last_mod)-hex(file_size)" e.g. "5e132e20-417" */ snprintf(buf, len, "\"%" PRIx64 "-%" PRIx64 "\"", - s->st_size, (uint64_t)s->st_mtime); + (uint64_t)s->st_mtime, s->st_size); return buf; }