From 625dc56af9328ca77f2e7d49367e45c5f3b3a89c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Mon, 12 Jan 2004 22:48:08 +0000 Subject: [PATCH] use the UNSAFE designation for unescaped errorlogs Submitted by: Geoffrey Young, Joe Orton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102306 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 +- server/log.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 421b500021..3c404c3ce2 100644 --- a/CHANGES +++ b/CHANGES @@ -6,7 +6,7 @@ Changes with Apache 2.1.0-dev PR 25772. [André Malo] *) Allow unescaped error logs via compile time switch - "-DAP_ERROR_LOG_UNESCAPED". + "-DAP_UNSAFE_ERROR_LOG_UNESCAPED". [Geoffrey Young , André Malo] *) proxy_http fix: mod_proxy hangs when both KeepAlive and diff --git a/server/log.c b/server/log.c index 9164db7ec4..df54cc1579 100644 --- a/server/log.c +++ b/server/log.c @@ -403,7 +403,7 @@ static void log_error_core(const char *file, int line, int level, const char *fmt, va_list args) { char errstr[MAX_STRING_LEN]; -#ifndef AP_ERROR_LOG_UNESCAPED +#ifndef AP_UNSAFE_ERROR_LOG_UNESCAPED char scratch[MAX_STRING_LEN]; #endif apr_size_t len, errstrlen; @@ -542,7 +542,7 @@ static void log_error_core(const char *file, int line, int level, } errstrlen = len; -#ifndef AP_ERROR_LOG_UNESCAPED +#ifndef AP_UNSAFE_ERROR_LOG_UNESCAPED if (apr_vsnprintf(scratch, MAX_STRING_LEN - len, fmt, args)) { len += ap_escape_errorlog_item(errstr + len, scratch, MAX_STRING_LEN - len); @@ -552,13 +552,13 @@ static void log_error_core(const char *file, int line, int level, #endif if ( r && (referer = apr_table_get(r->headers_in, "Referer")) -#ifndef AP_ERROR_LOG_UNESCAPED +#ifndef AP_UNSAFE_ERROR_LOG_UNESCAPED && ap_escape_errorlog_item(scratch, referer, MAX_STRING_LEN - len) #endif ) { len += apr_snprintf(errstr + len, MAX_STRING_LEN - len, ", referer: %s", -#ifndef AP_ERROR_LOG_UNESCAPED +#ifndef AP_UNSAFE_ERROR_LOG_UNESCAPED scratch #else referer -- 2.50.1