DMC-1361: Modify the "ne_davix_logger" function to recognize header messages and propagate them with a higher log verbosity

Author: mpatrascoiu

deps/libneon/src/ne_request.c

@@ -880,16 +880,16 @@ static void dump_request(const char *request)
 
     if (davix_get_log_scope() & NE_DBG_HTTPPLAIN) {
 	/* Display everything mode */
-        NE_DEBUG(NE_DBG_HTTP, "%s", hdr_debug);
-    } else if (davix_get_log_scope() & NE_DBG_HTTP) {
+        NE_DEBUG(NE_DBG_HDR, "%s", hdr_debug);
+    } else if (davix_get_log_scope() & NE_DBG_HDR) {
 	/* Blank out the Authorization parameters */
 	char *reqdebug = ne_strdup(hdr_debug), *pnt = reqdebug;
 	while ((pnt = strstr(pnt, "Authorization: ")) != NULL) {
 	    for (pnt += 15; *pnt != '\r' && *pnt != '\0'; pnt++) {
 		*pnt = 'x';
 	    }
 	}
-    NE_DEBUG(NE_DBG_HTTP, "%s",reqdebug);
+    NE_DEBUG(NE_DBG_HDR, "%s",reqdebug);
 
 	ne_free(reqdebug);
     }
@@ -925,7 +925,7 @@ static int read_status_line(ne_request *req, ne_status *status, int retry)
     }
 
     strip_eol(buffer, &ret);
-    NE_DEBUG(NE_DBG_HTTP, "< %s", buffer);
+    NE_DEBUG(NE_DBG_HDR, "< %s", buffer);
 
     if (status->reason_phrase) ne_free(status->reason_phrase);
     memset(status, 0, sizeof *status);
@@ -1039,7 +1039,7 @@ static int read_message_header(ne_request *req, char *buf, size_t buflen)
 	return aborted(req, _("Error reading response headers"), n);
 
     strip_eol(buf, &n);
-    NE_DEBUG(NE_DBG_HTTP, "< %s", buf);
+    NE_DEBUG(NE_DBG_HDR, "< %s", buf);
 
     if (n == 0) {
     NE_DEBUG(NE_DBG_CORE, "End of headers.");
@@ -1215,7 +1215,7 @@ int ne_begin_request(ne_request *req)
 
     /* Build the request string, and send it */
     data = build_request(req);
-    if(davix_get_log_scope() & NE_DBG_HTTP){
+    if(davix_get_log_scope() & NE_DBG_HDR){
         dump_request(data->data);
     }
     ret = send_request(req, data);

deps/libneon/src/ne_utils.c

@@ -132,12 +132,18 @@ int ne_version_match(int major, int minor)
         || (NE_VERSION_MAJOR == 0 && NE_VERSION_MINOR != minor);
 }
 
+/// Davix logging function for libneon messages
+/// The Header messages are propagated with "VERBOSE" level
+/// The rest of the messages are propagated with "TRACE" level
 void ne_davix_logger(int scope, const char *msg, ...)
 {
-    if( (davix_get_log_level() >= DAVIX_LOG_DEBUG) && (davix_get_log_scope() & scope) ) {
+    int filter_level = (scope == DAVIX_LOG_HEADER) ? DAVIX_LOG_VERBOSE : DAVIX_LOG_DEBUG;
+    int propagate_level = (scope == DAVIX_LOG_HEADER) ? DAVIX_LOG_VERBOSE : DAVIX_LOG_TRACE;
+
+    if ((davix_get_log_level() >= filter_level) && (davix_get_log_scope() & scope)) {
         va_list va;
         va_start(va, msg);
-        davix_vlogger2(scope, DAVIX_LOG_TRACE, msg, va);
+        davix_vlogger2(scope, propagate_level, msg, va);
         va_end(va);
     }
 }

deps/libneon/src/ne_utils.h

@@ -83,7 +83,8 @@ int ne_has_support(int feature);
 /* Debugging masks. */
 /* Map to DAVIX logging masks. */
 #define NE_DBG_SOCKET (DAVIX_LOG_SOCKET ) /* raw socket */
-#define NE_DBG_HTTP (DAVIX_LOG_HEADER ) /* HTTP request/response handling */
+#define NE_DBG_HDR (DAVIX_LOG_HEADER ) /* HTTP headers */
+#define NE_DBG_HTTP (DAVIX_LOG_HTTP ) /* HTTP request/response handling */
 #define NE_DBG_XML (DAVIX_LOG_XML ) /* XML parser */
 #define NE_DBG_HTTPAUTH (DAVIX_LOG_SSL ) /* HTTP authentication (hiding credentials) */
 #define NE_DBG_HTTPPLAIN (DAVIX_LOG_SENSITIVE ) /* plaintext HTTP authentication */