Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DA24210CDB for ; Sun, 5 May 2013 07:45:57 +0000 (UTC) Received: (qmail 11089 invoked by uid 500); 5 May 2013 07:45:55 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 10677 invoked by uid 500); 5 May 2013 07:45:54 -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 10628 invoked by uid 99); 5 May 2013 07:45:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 May 2013 07:45:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sun, 05 May 2013 07:45:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5A97E238897D for ; Sun, 5 May 2013 07:45:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1479248 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Date: Sun, 05 May 2013 07:45:30 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130505074530.5A97E238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sun May 5 07:45:29 2013 New Revision: 1479248 URL: http://svn.apache.org/r1479248 Log: Deal properly with 204 responses Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1479248&r1=1479247&r2=1479248&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Sun May 5 07:45:29 2013 @@ -1363,10 +1363,11 @@ public abstract class AbstractHttp11Proc } MimeHeaders headers = response.getMimeHeaders(); - // A SC_NO_CONTENT response may include entity headers - if (!entityBody && statusCode != HttpServletResponse.SC_NO_CONTENT) { + if (!entityBody) { response.setContentLength(-1); - } else { + } + // A SC_NO_CONTENT response may include entity headers + if (entityBody || statusCode == HttpServletResponse.SC_NO_CONTENT) { String contentType = response.getContentType(); if (contentType != null) { headers.setValue("Content-Type").setString(contentType); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org