git: e60ac1d2d4d6 - main - www/varnish7: Merge in fix for github issue #3911 to fix double slash issue
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 07 Jul 2023 01:08:11 UTC
The branch main has been updated by zi:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e60ac1d2d4d65e57f863f5154aec593e03931718
commit e60ac1d2d4d65e57f863f5154aec593e03931718
Author: Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2023-07-07 01:06:16 +0000
Commit: Ryan Steinmetz <zi@FreeBSD.org>
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);