Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 67273 invoked from network); 4 Nov 2002 21:43:02 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 4 Nov 2002 21:43:02 -0000 Received: (qmail 3385 invoked by uid 97); 4 Nov 2002 21:43:53 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 3323 invoked by uid 97); 4 Nov 2002 21:43:52 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 3310 invoked by uid 98); 4 Nov 2002 21:43:52 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: Mon, 04 Nov 2002 13:42:49 -0800 (PST) From: Kin-Man Chung Subject: costin: fix reverted To: tomcat-dev@jakarta.apache.org Reply-to: Kin-Man Chung Message-id: <0H5200F7QMZDW9@mpkmail.eng.sun.com> MIME-version: 1.0 X-Mailer: dtmail 1.3.0 @(#)CDE Version 1.4.2 SunOS 5.8 sun4u sparc Content-type: TEXT/plain; charset=us-ascii Content-transfer-encoding: 7BIT Content-MD5: 0JjBsAZTWRF5KsOq2i9xPQ== X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N costin, This fix seems to break errorPage handling in JSP, causing the errorPage example to fail, and a couple of JSP watchdog tests too. I have reverted your fix. I have not reverted the tomcat_4_branch. > Date: Thu, 24 Oct 2002 19:18:55 +0000 > From: costin@apache.org > Subject: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime PageContextImpl.java > To: jakarta-tomcat-jasper-cvs@apache.org > > costin 2002/10/24 12:18:55 > > Modified: jasper2/src/share/org/apache/jasper/runtime > PageContextImpl.java > Log: > Change the 'flush' to just a 'flushBuffer'. > > This allows the container to deal with flushing the buffer ( > wich is done automatically if the servlet doesn't explicitely > flush()/close() ). The container can attach the Content-Length > header which is usefull in many cases. > > Revision Changes Path > 1.27 +11 -6 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImp l.java > > Index: PageContextImpl.java > =================================================================== > RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/Page ContextImpl.java,v > retrieving revision 1.26 > retrieving revision 1.27 > diff -u -r1.26 -r1.27 > --- PageContextImpl.java 4 Oct 2002 19:21:44 -0000 1.26 > +++ PageContextImpl.java 24 Oct 2002 19:18:55 -0000 1.27 > @@ -162,7 +162,7 @@ > this.bufferSize = bufferSize; > this.autoFlush = autoFlush; > this.request = request; > - this.response = response; > + this.response = response; > > // setup session (if required) > if (request instanceof HttpServletRequest && needsSession) > @@ -209,7 +209,12 @@ > ((JspWriterImpl)out).flushBuffer(); > // push it into the including jspWriter > } else { > - out.flush(); > + // Old code: > + //out.flush(); > + // Do not flush the buffer even if we're not included (i.e. > + // we are the main page. The servlet will flush it and close > + // the stream. > + ((JspWriterImpl)out).flushBuffer(); > } > } catch (IOException ex) { > loghelper.log("Internal error flushing the buffer in release()"); > @@ -226,7 +231,7 @@ > depth = -1; > baseOut.recycle(); > session = null; > - > + > attributes.clear(); > } > > > > > > -- > To unsubscribe, e-mail: > For additional commands, e-mail: > -- To unsubscribe, e-mail: For additional commands, e-mail: