Commit 2d0843ea authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Rename SLT_F_BINARY to the more precise SLT_F_UNSAFE

parent 0f7baca4
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#define NODEF_NOTICE \ #define NODEF_NOTICE \
"NB: This log record is masked by default.\n\n" "NB: This log record is masked by default.\n\n"
SLTM(Debug, SLT_F_BINARY, "Debug messages", SLTM(Debug, SLT_F_UNSAFE, "Debug messages",
"Debug messages can normally be ignored, but are sometimes" "Debug messages can normally be ignored, but are sometimes"
" helpful during trouble-shooting. Most debug messages must" " helpful during trouble-shooting. Most debug messages must"
" be explicitly enabled with parameters.\n\n" " be explicitly enabled with parameters.\n\n"
...@@ -126,7 +126,7 @@ SLTM(BackendClose, 0, "Backend connection closed", ...@@ -126,7 +126,7 @@ SLTM(BackendClose, 0, "Backend connection closed",
"\n" "\n"
) )
SLTM(HttpGarbage, SLT_F_BINARY, "Unparseable HTTP request", SLTM(HttpGarbage, SLT_F_UNSAFE, "Unparseable HTTP request",
"Logs the content of unparseable HTTP requests.\n\n" "Logs the content of unparseable HTTP requests.\n\n"
) )
...@@ -363,7 +363,7 @@ SLTM(ESI_xmlerror, 0, "ESI parser error or warning message", ...@@ -363,7 +363,7 @@ SLTM(ESI_xmlerror, 0, "ESI parser error or warning message",
" The log record describes the problem encountered." " The log record describes the problem encountered."
) )
SLTM(Hash, SLT_F_BINARY, "Value added to hash", SLTM(Hash, SLT_F_UNSAFE, "Value added to hash",
"This value was added to the object lookup hash.\n\n" "This value was added to the object lookup hash.\n\n"
NODEF_NOTICE NODEF_NOTICE
) )
......
...@@ -163,7 +163,7 @@ extern const unsigned VSL_tagflags[SLT__MAX]; ...@@ -163,7 +163,7 @@ extern const unsigned VSL_tagflags[SLT__MAX];
* Tag flags array. * Tag flags array.
* Use these macros with VSL_tagflags (included from vsl_int.h): * Use these macros with VSL_tagflags (included from vsl_int.h):
* *
* VSL_tagflags[tag] & SLT_F_BINARY * VSL_tagflags[tag] & SLT_F_UNSAFE
* Non-zero if the payload with this tag may include * Non-zero if the payload with this tag may include
* non-printable characters * non-printable characters
* *
......
...@@ -97,6 +97,6 @@ enum VSL_tag_e { ...@@ -97,6 +97,6 @@ enum VSL_tag_e {
/* VSL tag flags */ /* VSL tag flags */
#define SLT_F_UNUSED (1 << 0) #define SLT_F_UNUSED (1 << 0)
#define SLT_F_BINARY (1 << 1) #define SLT_F_UNSAFE (1 << 1)
#endif /* VAPI_VSL_INT_H_INCLUDED */ #endif /* VAPI_VSL_INT_H_INCLUDED */
...@@ -244,7 +244,7 @@ VSL_Print(const struct VSL_data *vsl, const struct VSL_cursor *c, void *fo) ...@@ -244,7 +244,7 @@ VSL_Print(const struct VSL_data *vsl, const struct VSL_cursor *c, void *fo)
'b' : '-'; 'b' : '-';
data = VSL_CDATA(c->rec.ptr); data = VSL_CDATA(c->rec.ptr);
if (VSL_tagflags[tag] & SLT_F_BINARY) { if (VSL_tagflags[tag] & SLT_F_UNSAFE) {
VSL_PRINT(fo, "%10u %-14s %c \"", vxid, VSL_tags[tag], type); VSL_PRINT(fo, "%10u %-14s %c \"", vxid, VSL_tags[tag], type);
while (len-- > 0) { while (len-- > 0) {
if (len == 0 && tag == SLT_Debug && *data == '\0') if (len == 0 && tag == SLT_Debug && *data == '\0')
...@@ -279,7 +279,7 @@ VSL_PrintTerse(const struct VSL_data *vsl, const struct VSL_cursor *c, void *fo) ...@@ -279,7 +279,7 @@ VSL_PrintTerse(const struct VSL_data *vsl, const struct VSL_cursor *c, void *fo)
len = VSL_LEN(c->rec.ptr); len = VSL_LEN(c->rec.ptr);
data = VSL_CDATA(c->rec.ptr); data = VSL_CDATA(c->rec.ptr);
if (VSL_tagflags[tag] & SLT_F_BINARY) { if (VSL_tagflags[tag] & SLT_F_UNSAFE) {
VSL_PRINT(fo, "%-14s \"", VSL_tags[tag]); VSL_PRINT(fo, "%-14s \"", VSL_tags[tag]);
while (len-- > 0) { while (len-- > 0) {
if (len == 0 && tag == SLT_Debug && *data == '\0') if (len == 0 && tag == SLT_Debug && *data == '\0')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment