httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r159355 - in httpd/httpd/branches/2.0.x: CHANGES STATUS modules/proxy/proxy_util.c modules/ssl/ssl_engine_kernel.c server/config.c server/mpm/winnt/mpm_winnt.c server/mpm_common.c
Date Tue, 29 Mar 2005 08:44:34 GMT
Author: trawick
Date: Tue Mar 29 00:44:31 2005
New Revision: 159355

URL: http://svn.apache.org/viewcvs?view=rev&rev=159355
Log:
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


Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/proxy/proxy_util.c
    httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c
    httpd/httpd/branches/2.0.x/server/config.c
    httpd/httpd/branches/2.0.x/server/mpm/winnt/mpm_winnt.c
    httpd/httpd/branches/2.0.x/server/mpm_common.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?view=diff&r1=159354&r2=159355
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES (original)
+++ httpd/httpd/branches/2.0.x/CHANGES Tue Mar 29 00:44:31 2005
@@ -1,5 +1,9 @@
 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]
 

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?view=diff&r1=159354&r2=159355
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Tue Mar 29 00:44:31 2005
@@ -98,12 +98,6 @@
        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

Modified: httpd/httpd/branches/2.0.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/proxy/proxy_util.c?view=diff&r1=159354&r2=159355
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.0.x/modules/proxy/proxy_util.c Tue Mar 29 00:44:31 2005
@@ -707,7 +707,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);
     }
 
@@ -715,11 +715,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/branches/2.0.x/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c?view=diff&r1=159354&r2=159355
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c Tue Mar 29 00:44:31 2005
@@ -553,7 +553,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;
@@ -1798,7 +1798,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/branches/2.0.x/server/config.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/server/config.c?view=diff&r1=159354&r2=159355
==============================================================================
--- httpd/httpd/branches/2.0.x/server/config.c (original)
+++ httpd/httpd/branches/2.0.x/server/config.c Tue Mar 29 00:44:31 2005
@@ -1404,8 +1404,9 @@
     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);
     }
 

Modified: httpd/httpd/branches/2.0.x/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/server/mpm/winnt/mpm_winnt.c?view=diff&r1=159354&r2=159355
==============================================================================
--- httpd/httpd/branches/2.0.x/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/branches/2.0.x/server/mpm/winnt/mpm_winnt.c Tue Mar 29 00:44:31 2005
@@ -668,7 +668,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;
     }
@@ -679,7 +679,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;
     }
@@ -697,7 +697,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;
         }

Modified: httpd/httpd/branches/2.0.x/server/mpm_common.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/server/mpm_common.c?view=diff&r1=159354&r2=159355
==============================================================================
--- httpd/httpd/branches/2.0.x/server/mpm_common.c (original)
+++ httpd/httpd/branches/2.0.x/server/mpm_common.c Tue Mar 29 00:44:31 2005
@@ -225,8 +225,7 @@
             ap_log_error(APLOG_MARK, APLOG_ALERT,
                          0, ap_server_conf,
                          "Child %" APR_PID_T_FMT
-                         " returned a Fatal error..." APR_EOL_STR
-                         "Apache is exiting!",
+                         " returned a Fatal error... Apache is exiting!",
                          pid->pid);
             return APEXIT_CHILDFATAL;
         }



Mime
View raw message