Commit 5db66b32 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

backport this from 2.1-dev: 

  Remove formatting characters from ap_log_error() calls.  These
  were escaped as fallout from CAN-2003-0020.

Submitted by: Eric Covener <ecovener gmail.com>
Reviewed by:  trawick, jorton, pquerna



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@159355 13f79535-47bb-0310-9956-ffa450edef68
parent 34024e16

CHANGES

+4 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.54













  *) Remove formatting characters from ap_log_error() calls.  These













     were escaped as fallout from CAN-2003-0020.













     [Eric Covener <ecovener gmail.com>]



























  *) mod_ssl: If SSLUsername is used, set r->user earlier.  PR 31418.















     [David Reid]















































STATUS



+0
−6






























Original line number
Diff line number
Diff line








@@ -98,12 +98,6 @@ PATCHES TO BACKPORT FROM TRUNK:













       svn rev 124104















       +1: minfrin, trawick





























    *) Get some control chars out of ap_log_error() invocations.













       Patch from Eric Covener with tweak by trawick:













       http://httpd.apache.org/~trawick/covener-removecontrolchars-2.0.patch













       (2.1-dev already has these fixes)













       +1: trawick, jorton, pquerna





























    *) util_ldap: Add the directive LDAPConnectionTimeout to control















       the socket timeout value when binding to an LDAP server















       svn rev 126565

































modules/proxy/proxy_util.c



+3
−3






























Original line number
Diff line number
Diff line








@@ -707,7 +707,7 @@ PROXY_DECLARE(int) ap_proxy_is_ipaddr(struct dirconn_entry *This, apr_pool_t *p)





























	if (bits != 32)		/* no warning for fully qualified IP address */















            ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,













	      "Warning: NetMask not supplied with IP-Addr; guessing: %s/%ld\n",













	      "Warning: NetMask not supplied with IP-Addr; guessing: %s/%ld",















		 inet_ntoa(This->addr), bits);















    }

























@@ -715,11 +715,11 @@ PROXY_DECLARE(int) ap_proxy_is_ipaddr(struct dirconn_entry *This, apr_pool_t *p)





























    if (*addr == '\0' && (This->addr.s_addr & ~This->mask.s_addr) != 0) {















        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,













	    "Warning: NetMask and IP-Addr disagree in %s/%ld\n",













	    "Warning: NetMask and IP-Addr disagree in %s/%ld",















		inet_ntoa(This->addr), bits);















	This->addr.s_addr &= This->mask.s_addr;















        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,













	    "         Set to %s/%ld\n",













	    "         Set to %s/%ld",















		inet_ntoa(This->addr), bits);















    }

















































modules/ssl/ssl_engine_kernel.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -553,7 +553,7 @@ int ssl_hook_Access(request_rec *r)













    if (renegotiate && !renegotiate_quick && (r->method_number == M_POST)) {















        ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,















                     "SSL Re-negotiation in conjunction "













                     "with POST method not supported!\n"













                     "with POST method not supported! "















                     "hint: try SSLOptions +OptRenegotiate");































        return HTTP_METHOD_NOT_ALLOWED;










@@ -1798,7 +1798,7 @@ void ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE ssl, int where, int rc













        else if (where & SSL_CB_ALERT) {















            char *str = (where & SSL_CB_READ) ? "read" : "write";















            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,













                         "%s: Alert: %s:%s:%s\n",













                         "%s: Alert: %s:%s:%s",















                         SSL_LIBRARY_NAME, str,















                         SSL_alert_type_string_long(rc),















                         SSL_alert_desc_string_long(rc));

































server/config.c



+3
−2






























Original line number
Diff line number
Diff line








@@ -1404,8 +1404,9 @@ static void process_command_config(server_rec *s, apr_array_header_t *arr,













    errmsg = ap_build_config(&parms, p, ptemp, conftree);















    if (errmsg) {















        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,













                     "Syntax error in -C/-c directive:" APR_EOL_STR "%s",













                     errmsg);













                     "Syntax error in -C/-c directive:");













        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,













                     "%s", errmsg);















        exit(1);















    }