From nobody Fri Jul 07 01:08:11 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QxwHv5lgXz4lB15; Fri, 7 Jul 2023 01:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxwHv5Jb3z3NrH; Fri, 7 Jul 2023 01:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688692091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xifGL74Aq1twknuVOWibHs6NGpFhIFyNL4T7HY1eNJc=; b=nUZuamoAKpCBWcnqXHya3odRvKNsemSGBG5n6QZBRP2PLqxjrKugy6yO7SRxRtfTdi9iMA jm9l02Xj05zG1GZWYy3E4m4RcEJnKi3SIw6MICgLDOdZD9KPZ+cbA7x0CNNjp84LBe75dw dmWrSoFXL65hY/1Enh0b5mA6ka4pOLrEDpPQ0J5aQ5Hj5O6xrdxhDu+R8fbXmyizoy2NXB 4wbMp09ZuSctfRbI3DhZdG4viLaaMQ5XMuq/KGWVSoPV8yjA50pfDGpi93s8RR4rIyP/ca ksEjH2HmXWdYcuQcZWbugowG3nsqlZDvNJuDXmb9uufbDVdo8YHarNBok36vJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688692091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xifGL74Aq1twknuVOWibHs6NGpFhIFyNL4T7HY1eNJc=; b=eC3Yd/CwPQ+TTgQxloNnAe0zYuJoHvNYSlLSOFDT8YwPEPgcXo3y1ynu5mwqMHbbnue6ZF V9pZ0uEWjihG/DOlkfPCb20hF9ZOMUh+ox7M6KS/Uj+I0P0MQ7MvKtxIEISbCQhqgRCpS+ f4Eh2ryLhSbE+a9wIiRISVy91RUqFX708U+zGpBiZYE288kZ0+eF/sE9/kxeudRGiBaoY8 zCUj3xqQL1bs9cocvOqcb4TmBdDAQ99PLbPzssMPiMcaGc0B62WRL8TCLlIDutFFwKhQxe CYIUwI7+Dngv5sRnK0RZxMQ9b9WTkzRF1FW6WaPreYkriHYQsMUz9+JKsrlcuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688692091; a=rsa-sha256; cv=none; b=I+9kN7IHONgvvjaqTbcw///mIU0eWuo3jEX2MxbBh9rOJ6WisgBx1qfRFXrbAxe57tIHRY J9y1P2vIbBqI4c1T0DOtD4J4u1t1+jMU5TthhPctBzGVCZhWubkZ86H+r6oLObmqGTfduE onHQLa4gDNOiLg63tYjjNkBNnaSkj9tRGrzwKmtzIZpbCxA7dx/b7szPrbXfXr6R1ko4w0 6XR8yV6oLPZ1fRlNOnAG75LJDTghrwrnwYVIl4KtLc0hFdpHxj8RxjgYo6C8TytkgUogf+ WW/ykdUdLu7n5wEeMTR1lE/pz0/q9P9NKmio69OX9/o4AB+lGo7A5qyypDzmrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QxwHv4MbyzKJc; Fri, 7 Jul 2023 01:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36718Bmb043962; Fri, 7 Jul 2023 01:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36718BJL043961; Fri, 7 Jul 2023 01:08:11 GMT (envelope-from git) Date: Fri, 7 Jul 2023 01:08:11 GMT Message-Id: <202307070108.36718BJL043961@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: e60ac1d2d4d6 - main - www/varnish7: Merge in fix for github issue #3911 to fix double slash issue List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e60ac1d2d4d65e57f863f5154aec593e03931718 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=e60ac1d2d4d65e57f863f5154aec593e03931718 commit e60ac1d2d4d65e57f863f5154aec593e03931718 Author: Ryan Steinmetz AuthorDate: 2023-07-07 01:06:16 +0000 Commit: Ryan Steinmetz CommitDate: 2023-07-07 01:06:16 +0000 www/varnish7: Merge in fix for github issue #3911 to fix double slash issue - Bump PORTREVISION Approved by: maintainer (dbaio) Obtained from: Upstream commit de11d7d9e898a5668d3d5dc9e7eb55fc826b40da --- www/varnish7/Makefile | 1 + .../files/patch-bin_varnishd_http2_cache__http2__hpack.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/www/varnish7/Makefile b/www/varnish7/Makefile index 6368d46af374..14e9dc42e141 100644 --- a/www/varnish7/Makefile +++ b/www/varnish7/Makefile @@ -1,5 +1,6 @@ PORTNAME= varnish DISTVERSION= 7.3.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://varnish-cache.org/downloads/ PKGNAMESUFFIX= 7 diff --git a/www/varnish7/files/patch-bin_varnishd_http2_cache__http2__hpack.c b/www/varnish7/files/patch-bin_varnishd_http2_cache__http2__hpack.c new file mode 100644 index 000000000000..5c3310815192 --- /dev/null +++ b/www/varnish7/files/patch-bin_varnishd_http2_cache__http2__hpack.c @@ -0,0 +1,16 @@ +--- bin/varnishd/http2/cache_http2_hpack.c.orig 2023-03-15 08:52:02 UTC ++++ bin/varnishd/http2/cache_http2_hpack.c +@@ -135,10 +135,9 @@ h2h_addhdr(struct http *hp, char *b, size_t namelen, s + n = HTTP_HDR_URL; + disallow_empty = 1; + +- // rfc7540,l,3060,3071 +- if (((len > 0 && *b != '/') || +- (len > 1 && *(b+1) == '/')) && +- (strncmp(b, "*", len) != 0)) { ++ // rfc9113,l,2693,2705 ++ if (len > 0 && *b != '/' && ++ strncmp(b, "*", len) != 0) { + VSLb(hp->vsl, SLT_BogoHeader, + "Illegal :path pseudo-header %.*s", + (int)len, b);