[master] 08c466957 (SP|TAB) is rightfully called OWS in RFC7230

Poul-Henning Kamp phk at FreeBSD.org
Wed Jun 3 06:24:07 UTC 2020


commit 08c466957b12c566d320302ad2e191db1abc46af
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Jun 3 06:19:25 2020 +0000

    (SP|TAB) is rightfully called OWS in RFC7230
    
    This change is binary compatible.

diff --git a/include/vct.h b/include/vct.h
index 34aca2536..9bd3ce3d8 100644
--- a/include/vct.h
+++ b/include/vct.h
@@ -34,9 +34,9 @@
 
 #include "vas.h"
 
-#define VCT_SP			(1<<0)
+#define VCT_OWS			(1<<0)
 #define VCT_CRLF		(1<<1)
-#define VCT_LWS			(VCT_CRLF | VCT_SP)
+#define VCT_LWS			(VCT_CRLF | VCT_OWS)
 #define VCT_CTL			(1<<2)
 #define VCT_ALPHA		(1<<3)
 #define VCT_SEPARATOR		(1<<4)
@@ -64,7 +64,8 @@ vct_is(int x, uint16_t y)
 	return (vct_typtab[x] & (y));
 }
 
-#define vct_issp(x) vct_is(x, VCT_SP)
+#define vct_isows(x) vct_is(x, VCT_OWS)
+#define vct_issp(x) vct_is(x, VCT_OWS)
 #define vct_ishex(x) vct_is(x, VCT_HEX)
 #define vct_islws(x) vct_is(x, VCT_LWS)
 #define vct_isctl(x) vct_is(x, VCT_CTL)
diff --git a/lib/libvarnish/vct.c b/lib/libvarnish/vct.c
index 1c301d37e..7b0d051ae 100644
--- a/lib/libvarnish/vct.c
+++ b/lib/libvarnish/vct.c
@@ -56,7 +56,7 @@ const uint16_t vct_typtab[256] = {
 	[0x06]	=	VCT_CTL,
 	[0x07]	=	VCT_CTL,
 	[0x08]	=	VCT_CTL,
-	[0x09]	=	VCT_CTL | VCT_SP,
+	[0x09]	=	VCT_CTL | VCT_OWS,
 	[0x0a]	=	VCT_CTL | VCT_CRLF,
 	[0x0b]	=	VCT_CTL | VCT_VT,
 	[0x0c]	=	VCT_CTL,
@@ -79,7 +79,7 @@ const uint16_t vct_typtab[256] = {
 	[0x1d]	=	VCT_CTL,
 	[0x1e]	=	VCT_CTL,
 	[0x1f]	=	VCT_CTL,
-	[0x20]	=	VCT_SP,
+	[0x20]	=	VCT_OWS,
 	[0x21]	=	VCT_TCHAR,
 	[0x22]	=	VCT_SEPARATOR,
 	[0x23]	=	VCT_TCHAR,


More information about the varnish-commit mailing list