[6.1] 13dacb710 restore vsl binary compatibility

hermunn hermunn at varnish-software.com
Wed Oct 24 09:29:19 UTC 2018


commit 13dacb7101714b2f6de0146e49b0a82dd302cf15
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Oct 4 16:45:27 2018 +0200

    restore vsl binary compatibility
    
    be69499219db0704a136046369884531ee20bc01 unnecessarily changed the
    values of most vsl tag enums and thus introduced an incompatibility
    with logs written with previous code.
    
    Fixes #2790

diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
index 294da9431..49b27cf9b 100644
--- a/include/tbl/vsl_tags.h
+++ b/include/tbl/vsl_tags.h
@@ -65,20 +65,6 @@ SLTM(CLI, 0, "CLI communication",
 
 /*---------------------------------------------------------------------*/
 
-SLTM(SessError, 0, "Client connection accept failed",
-	"Accepting a client connection has failed.\n\n"
-	"The format is::\n\n"
-	"\t%s %s %s %d %d %s\n"
-	"\t|  |  |  |  |  |\n"
-	"\t|  |  |  |  |  +- Detailed error message\n"
-	"\t|  |  |  |  +---- Error Number (errno) from accept(2)\n"
-	"\t|  |  |  +------- File descriptor number\n"
-	"\t|  |  +---------- Local TCP port / 0 for UDS\n"
-	"\t|  +------------- Local IPv4/6 address / 0.0.0.0 for UDS\n"
-	"\t+---------------- Socket name (from -a argument)\n"
-	"\n"
-)
-
 SLTM(SessOpen, 0, "Client connection opened",
 	"The first record for a client connection, with the socket-endpoints"
 	" of the connection.\n\n"
@@ -642,6 +628,20 @@ SLTM(Filters, 0, "Body filters",
 	"List of filters applied to the body"
 )
 
+SLTM(SessError, 0, "Client connection accept failed",
+	"Accepting a client connection has failed.\n\n"
+	"The format is::\n\n"
+	"\t%s %s %s %d %d %s\n"
+	"\t|  |  |  |  |  |\n"
+	"\t|  |  |  |  |  +- Detailed error message\n"
+	"\t|  |  |  |  +---- Error Number (errno) from accept(2)\n"
+	"\t|  |  |  +------- File descriptor number\n"
+	"\t|  |  +---------- Local TCP port / 0 for UDS\n"
+	"\t|  +------------- Local IPv4/6 address / 0.0.0.0 for UDS\n"
+	"\t+---------------- Socket name (from -a argument)\n"
+	"\n"
+)
+
 #undef NODEF_NOTICE
 #undef SLTM
 


More information about the varnish-commit mailing list