Merge r1827865 from trunk:

Use 'ap_log_rerror()' instead of 'ap_log_error()' consistently
Submitted by: jailletc36
Reviewed by: jailletc36, jorton, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828745 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 5b35e4ec5b675864bb9a00132344cfdbd52be9b3..74854f07e093f8bc4c52ae52329ee292fe9c689c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -122,11 +122,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_ssl: Use 'ap_log_rerror()' instead of 'ap_log_error()' consistently
-     PR 62003
-     trunk patch: http://svn.apache.org/r1827865
-     2.4.x patch: svn merge -c 1827865 ^/httpd/httpd/trunk .
-     +1: jailletc36, jorton, ylavic
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 0da9b45c953fd51306fb180c9e146c0da8edfd2d..bdcad75c838373765fb6c4df5b3955c428f2791a 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -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",