From: Stefan Eissing <icing@apache.org>
Date: Tue, 3 Apr 2018 09:12:55 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2729
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=815b6a647c3a2787797a0751e977b8710804489b;p=thirdparty%2Fapache%2Fhttpd.git

On the trunk:

mod_http2: on level trace2, log any unsuccessful HTTP/2 direct connection upgrade
     with base64 encoding to unify its appearance in possible bug reports.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828210 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 4d5de415dfa..a8b0ec17f26 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) mod_http2: on level trace2, log any unsuccessful HTTP/2 direct connection upgrade
+     with base64 encoding to unify its appearance in possible bug reports. [Stefan Eissing]
+
   *) mod_cgi: Add CGIScriptTimeout to make mod_cgi's timeout per-directory and
      independent of the core Timeout directive.  PR 62229.  
      [Hank Ibell <hwibell gmail.com>]
diff --git a/modules/http2/h2_h2.c b/modules/http2/h2_h2.c
index 6f9284b1daa..fe5fa5429e3 100644
--- a/modules/http2/h2_h2.c
+++ b/modules/http2/h2_h2.c
@@ -639,8 +639,8 @@ int h2_h2_process_conn(conn_rec* c)
             }
             else {
                 ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c,
-                              "h2_h2, not detected in %d bytes: %s", 
-                              (int)slen, s);
+                              "h2_h2, not detected in %d bytes(base64): %s", 
+                              (int)slen, h2_util_base64url_encode(s, slen, c->pool));
             }
             
             apr_brigade_destroy(temp);