Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 64104 invoked from network); 9 Feb 2005 19:01:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 9 Feb 2005 19:01:48 -0000 Received: (qmail 17082 invoked by uid 500); 9 Feb 2005 19:01:47 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 17047 invoked by uid 500); 9 Feb 2005 19:01:47 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 17034 invoked by uid 99); 9 Feb 2005 19:01:47 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 09 Feb 2005 11:01:47 -0800 Received: (qmail 64078 invoked by uid 65534); 9 Feb 2005 19:01:45 -0000 Message-ID: <20050209190145.64077.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Wed, 09 Feb 2005 19:01:45 -0000 Subject: 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 To: cvs@httpd.apache.org From: trawick@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: trawick Date: Wed Feb 9 11:01:43 2005 New Revision: 153105 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D153105 Log: Remove formatting characters from ap_log_error() calls. These were escaped as fallout from CAN-2003-0020. Submitted by: Eric Covener 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=3Ddiff&r1= =3D153104&r2=3D153105 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- httpd/httpd/trunk/CHANGES (original) +++ httpd/httpd/trunk/CHANGES Wed Feb 9 11:01:43 2005 @@ -2,6 +2,10 @@ =20 [Remove entries to the current 2.0 section below, when backported] =20 + *) Remove formatting characters from ap_log_error() calls. These + were escaped as fallout from CAN-2003-0020. + [Eric Covener ] + *) mod_cache: One more try at proper handling of revalidated responses. [Justin Erenkrantz] =20 Modified: httpd/httpd/trunk/modules/proxy/ajp_link.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/ajp_link= .c?view=3Ddiff&r1=3D153104&r2=3D153105 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- 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 @@ =20 ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, "ajp_ilink_receive() received packet len=3D%" APR_SIZE_T_= FMT - "type=3D%d\n", + "type=3D%d", blen, (int)msg->buf[hlen]); =20 return APR_SUCCESS; Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/proxy_ut= il.c?view=3Ddiff&r1=3D153104&r2=3D153105 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- 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 @@ =20 if (bits !=3D 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); } =20 @@ -627,11 +627,11 @@ =20 if (*addr =3D=3D '\0' && (This->addr.s_addr & ~This->mask.s_addr) !=3D= 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 &=3D 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); } =20 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=3Ddiff&r1=3D153104&r2=3D153105 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- 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 2= 005 @@ -563,7 +563,7 @@ if (renegotiate && !renegotiate_quick && (r->method_number =3D=3D M_PO= ST)) { 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"); =20 return HTTP_METHOD_NOT_ALLOWED; @@ -1818,7 +1818,7 @@ else if (where & SSL_CB_ALERT) { char *str =3D (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_w= innt.c?view=3Ddiff&r1=3D153104&r2=3D153105 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- 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 =3D apr_procattr_io_set(attr, APR_FULL_BLOCK,=20 APR_NO_PIPE, APR_NO_PIPE)) !=3D APR_SUCC= ESS) { 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 =3D apr_procattr_child_out_set(attr, child_out, NULL))=20 !=3D 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 =3D apr_procattr_child_err_set(attr, child_err, NULL)) !=3D 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; }