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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153105 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 1d6b770ef1f41e660d546108a7a1a92ec06648af..cfe2fee7cda00491d491ef736160946db2fb5b20 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.3
 
   [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]
 

diff --git a/modules/proxy/ajp_link.c b/modules/proxy/ajp_link.c
index bbbbec418e176577939d7b35aa5c1c737bb9ce97..b6e98b4ebd3f35d9f648c88ab9b61ecfb7cf3204 100644 (file)
--- a/modules/proxy/ajp_link.c
+++ b/modules/proxy/ajp_link.c
@@ -118,7 +118,7 @@ apr_status_t ajp_ilink_receive(apr_socket_t *sock, ajp_msg_t *msg)
 
     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;

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index ba277073f8c53e58f5120569be625afc9952c2d7..6a9165ce1196d543013a2055ce24cb7a4cf63c5b 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -619,7 +619,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);
     }
 
@@ -627,11 +627,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);
     }
 

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 1fe1b3b0cbb4e63120bc305d3fde77b78281fa50..349d9b1f8b874835b3d8c2eeebf2dc565cf206cd 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -563,7 +563,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;
@@ -1818,7 +1818,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));

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 3afdf8d26f226091977e6659a9efc347d9f43709..2f73edbf7f3a5e419acc4ac7c0a13231de467960 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -669,7 +669,7 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
     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 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
         || ((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 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
         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;
         }