You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2005/02/09 20:01:45 UTC
svn commit: r153105 - in httpd/httpd/trunk: CHANGES modules/proxy/ajp_link.c
modules/proxy/proxy_util.c modules/ssl/ssl_engine_kernel.c
server/mpm/winnt/mpm_winnt.c
Author: trawick
Date: Wed Feb 9 11:01:43 2005
New Revision: 153105
URL: http://svn.apache.org/viewcvs?view=rev&rev=153105
Log:
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: Jeff Trawick
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/proxy/ajp_link.c
httpd/httpd/trunk/modules/proxy/proxy_util.c
httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&r1=153104&r2=153105
==============================================================================
--- httpd/httpd/trunk/CHANGES (original)
+++ httpd/httpd/trunk/CHANGES Wed Feb 9 11:01:43 2005
@@ -2,6 +2,10 @@
[Remove entries to the current 2.0 section below, when backported]
+ *) Remove formatting characters from ap_log_error() calls. These
+ were escaped as fallout from CAN-2003-0020.
+ [Eric Covener <ecovener gmail.com>]
+
*) mod_cache: One more try at proper handling of revalidated responses.
[Justin Erenkrantz]
Modified: httpd/httpd/trunk/modules/proxy/ajp_link.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/ajp_link.c?view=diff&r1=153104&r2=153105
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_link.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_link.c Wed Feb 9 11:01:43 2005
@@ -118,7 +118,7 @@
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
"ajp_ilink_receive() received packet len=%" APR_SIZE_T_FMT
- "type=%d\n",
+ "type=%d",
blen, (int)msg->buf[hlen]);
return APR_SUCCESS;
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/proxy_util.c?view=diff&r1=153104&r2=153105
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Wed Feb 9 11:01:43 2005
@@ -619,7 +619,7 @@
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);
}
@@ -627,11 +627,11 @@
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);
}
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?view=diff&r1=153104&r2=153105
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c Wed Feb 9 11:01:43 2005
@@ -563,7 +563,7 @@
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;
@@ -1818,7 +1818,7 @@
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));
Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?view=diff&r1=153104&r2=153105
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Wed Feb 9 11:01:43 2005
@@ -669,7 +669,7 @@
if ((rv = apr_procattr_io_set(attr, APR_FULL_BLOCK,
APR_NO_PIPE, APR_NO_PIPE)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,
- "Parent: Unable to create child stdin pipe.\n");
+ "Parent: Unable to create child stdin pipe.");
apr_pool_destroy(ptemp);
return -1;
}
@@ -680,7 +680,7 @@
|| ((rv = apr_procattr_child_out_set(attr, child_out, NULL))
!= APR_SUCCESS)) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,
- "Parent: Unable to connect child stdout to NUL.\n");
+ "Parent: Unable to connect child stdout to NUL.");
apr_pool_destroy(ptemp);
return -1;
}
@@ -698,7 +698,7 @@
if ((rv = apr_procattr_child_err_set(attr, child_err, NULL))
!= APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,
- "Parent: Unable to connect child stderr.\n");
+ "Parent: Unable to connect child stderr.");
apr_pool_destroy(ptemp);
return -1;
}