Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 62984 invoked from network); 21 Dec 2009 10:54:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Dec 2009 10:54:38 -0000 Received: (qmail 54121 invoked by uid 500); 21 Dec 2009 10:54:37 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 54024 invoked by uid 500); 21 Dec 2009 10:54:37 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 54013 invoked by uid 99); 21 Dec 2009 10:54:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Dec 2009 10:54:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Dec 2009 10:54:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C263E23889D7; Mon, 21 Dec 2009 10:54:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r892760 - /tomcat/tc6.0.x/trunk/STATUS.txt Date: Mon, 21 Dec 2009 10:54:14 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091221105414.C263E23889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Mon Dec 21 10:54:14 2009 New Revision: 892760 URL: http://svn.apache.org/viewvc?rev=892760&view=rev Log: Simplify proposal. No actual changes, just putting everything in a single file so leaving Konstantin's vote in place. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=892760&r1=892759&r2=892760&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 10:54:14 2009 @@ -357,31 +357,6 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47963 Prevent use of non-RFC2616 compliant custom status messages - http://svn.apache.org/viewvc?rev=892612&view=rev - http://svn.apache.org/viewvc?rev=892707&view=rev - +1: markt - +1: kkolinko: ( - 1. only together with rev.892707 - 2. this change, provided by rev.892612, - -- if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) { -+ if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER && -+ HttpMessages.isSafeInHttpHeader(response.getMessage())) { - message = response.getMessage(); - } - if (message == null){ - message = HttpMessages.getMessage(response.getStatus()); -- } else { -- message = message.replace('\n', ' ').replace('\r', ' '); - } - - has to be applied to the following 6 classes in TC 6: - in o.a.coyote.ajp: AjpAprProcessor and AjpProcessor, - in o.a.coyote.http11: InternalAprOutputBuffer, InternalNioOutputBuffer, InternalOutputBuffer - in o.a.jk.common: JkInputStream - (3 of them do not exist in TC 7). - - 3. I think that mention of extra overhead in systemprops.xml is not - necessary. - ) + http://people.apache.org/~markt/patches/2009-12-21-bug47963.patch + +1: markt, kkolinko -1: --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org