Commit d270870d authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent bb630d1a

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -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:

modules/ssl/ssl_engine_kernel.c

+3 −3
Original line number Diff line number Diff line
@@ -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",