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:
* )
*/
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;
* 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);
* 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",