Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 25888 invoked from network); 9 May 2008 03:53:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 May 2008 03:53:28 -0000 Received: (qmail 99271 invoked by uid 500); 9 May 2008 03:53:30 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 99153 invoked by uid 500); 9 May 2008 03:53:30 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 99142 invoked by uid 99); 9 May 2008 03:53:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 May 2008 20:53:30 -0700 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; Fri, 09 May 2008 03:52:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5B65A2388A39; Thu, 8 May 2008 20:52:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r654677 - /cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java Date: Fri, 09 May 2008 03:52:57 -0000 To: cvs@cocoon.apache.org From: joerg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080509035257.5B65A2388A39@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: joerg Date: Thu May 8 20:52:57 2008 New Revision: 654677 URL: http://svn.apache.org/viewvc?rev=654677&view=rev Log: Restore changes of revision 155099: Remove Last-Modified header initialization: this is done in the environment by request from AbstractProcessingPipeline. (http://marc.info/?l=xml-cocoon-dev&m=120477652124530&w=4) Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java?rev=654677&r1=654676&r2=654677&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java (original) +++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java Thu May 8 20:52:57 2008 @@ -202,12 +202,11 @@ } catch (SourceException e) { throw SourceUtil.handle("Error during resolving of '" + src + "'.", e); } - setupHeaders(); } /** - * Setup the response headers: Accept-Ranges, Expires, Last-Modified + * Setup the response headers: Accept-Ranges, Expires */ protected void setupHeaders() { // Tell the client whether we support byte range requests or not @@ -222,11 +221,6 @@ } else if (expires == 0) { response.setDateHeader("Expires", 0); } - - long lastModified = getLastModified(); - if (lastModified > 0) { - response.setDateHeader("Last-Modified", lastModified); - } } /** @@ -410,7 +404,6 @@ return mimeType; } } - return inputSource.getMimeType(); } }