r4432 - trunk/varnish-cache/include

phk at projects.linpro.no phk at projects.linpro.no
Thu Jan 7 12:28:24 CET 2010


Author: phk
Date: 2010-01-07 12:28:24 +0100 (Thu, 07 Jan 2010)
New Revision: 4432

Modified:
   trunk/varnish-cache/include/vct.h
Log:
Finish yesterdays work, adding XML charset rules to VCT.



Modified: trunk/varnish-cache/include/vct.h
===================================================================
--- trunk/varnish-cache/include/vct.h	2010-01-06 20:45:12 UTC (rev 4431)
+++ trunk/varnish-cache/include/vct.h	2010-01-07 11:28:24 UTC (rev 4432)
@@ -45,7 +45,7 @@
 extern const uint16_t vct_typtab[256];
 
 static inline int
-vct_is(unsigned char x, unsigned char y)
+vct_is(unsigned char x, uint16_t y)
 {
 
 	return (vct_typtab[x] & (y));
@@ -58,8 +58,8 @@
 #define vct_isalpha(x) vct_is(x, VCT_ALPHA)
 #define vct_issep(x) vct_is(x, VCT_SEPARATOR)
 #define vct_issepctl(x) vct_is(x, VCT_SEPARATOR | VCT_CTL)
-#define vct_isxmlnamestart(x) vct_is(x, VCT_XMLNAMES)
-#define vct_isxmlname(x) vct_is(x, VCT_XMLNAMESTART | VCT_XMLNM)
+#define vct_isxmlnamestart(x) vct_is(x, VCT_XMLNAMESTART)
+#define vct_isxmlname(x) vct_is(x, VCT_XMLNAMESTART | VCT_XMLNAME)
 
 /* NB: VCT always operate in ASCII, don't replace 0x0d with \r etc. */
 #define vct_skipcrlf(p) (p[0] == 0x0d && p[1] == 0x0a ? 2 : 1)



More information about the varnish-commit mailing list