]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Use 'ap_log_rerror()' instead of 'ap_log_error()' consistently
authorChristophe Jaillet <jailletc36@apache.org>
Tue, 27 Mar 2018 20:17:24 +0000 (20:17 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Tue, 27 Mar 2018 20:17:24 +0000 (20:17 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827865 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/ssl_engine_kernel.c

index 345b525955ed70cf34a7bb5bce8c90529717212e..305901b1323b32fc109e92a6033b08a3bcc96fcd 100644 (file)
@@ -321,7 +321,7 @@ int ssl_hook_ReadReq(request_rec *r)
              * )
              */
             if (!r->hostname) {
-                ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, APLOGNO(02031)
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02031)
                             "Hostname %s provided via SNI, but no hostname"
                             " provided in HTTP request", servername);
                 return HTTP_BAD_REQUEST;
@@ -333,7 +333,7 @@ int ssl_hook_ReadReq(request_rec *r)
                  * selected by the SNI and its SSL parameters are different
                  */
                 
-                ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, APLOGNO(02032)
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02032)
                              "Hostname %s provided via SNI and hostname %s provided"
                              " via HTTP have no compatible SSL setup",
                              servername, r->hostname);
@@ -350,7 +350,7 @@ int ssl_hook_ReadReq(request_rec *r)
              * server config we used for handshaking or in our current server.
              * This should avoid insecure configuration by accident.
              */
-            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, APLOGNO(02033)
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02033)
                          "No hostname was provided via SNI for a name based"
                          " virtual host");
             apr_table_setn(r->notes, "error-notes",