cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector OutputBuffer.java

2005-06-22 Thread jfarcand 
jfarcand2005/06/22 09:24:39

  Modified:catalina/src/share/org/apache/catalina/connector
OutputBuffer.java
  Log:
  Fix typo. When the security manager is used, we always needs to execute under 
a doPrivileged block.
  
  Revision  ChangesPath
  1.7   +1 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java
  
  Index: OutputBuffer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- OutputBuffer.java 19 May 2005 14:14:41 -  1.6
  +++ OutputBuffer.java 22 Jun 2005 16:24:39 -  1.7
  @@ -559,7 +559,7 @@
   conv = (C2BConverter) encoders.get(enc);
   if (conv == null) {
   
  -if (SecurityUtil.isPackageProtectionEnabled()){
  +if (System.getSecurityManager() != null){
   try{
   conv = (C2BConverter)AccessController.doPrivileged(
   new PrivilegedExceptionAction(){
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector OutputBuffer.java

2005-05-19 Thread jfarcand 
jfarcand2005/05/19 07:14:41

  Modified:catalina/src/share/org/apache/catalina/connector
OutputBuffer.java
  Log:
  Invoking APIs such as response.sendError or response.resetBuffer, results in 
a call to OutputBuffer.reset in the corresponding method in 
org.apache.coyote.tomcat5.CoyoteResponse.java.
  
  org.apache.coyote.tomcat5.OutputBuffer.reset clears all the data in the 
buffer but does not reset its 'state' member variable to INITIAL_STATE.
  
  This leads to an inconsistency in the value of the state variable when 
response.finishResponse() is invoked.
  
  Revision  ChangesPath
  1.6   +1 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java
  
  Index: OutputBuffer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- OutputBuffer.java 27 Feb 2005 18:18:35 -  1.5
  +++ OutputBuffer.java 19 May 2005 14:14:41 -  1.6
  @@ -639,7 +639,7 @@
   charsWritten = 0;
   gotEnc = false;
   enc = null;
  -
  +state = INITIAL_STATE;
   }
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector OutputBuffer.java

2005-02-27 Thread keith 
keith   2005/02/27 10:18:35

  Modified:catalina/src/share/org/apache/catalina/connector
OutputBuffer.java
  Log:
  Allow servlets to return multi-gb content-length headers
  
  - allow servlets to set content-length  Integer.MAX_VALUE via setHeader()
  - if servlet sets a content length in this manner, getContentLength will
return -1 if cl  Integer.MAX_VALUE, so test getContentLengthLong to see
if the cl was set.
  
  Revision  ChangesPath
  1.5   +1 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java
  
  Index: OutputBuffer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OutputBuffer.java 22 Nov 2004 16:35:18 -  1.4
  +++ OutputBuffer.java 27 Feb 2005 18:18:35 -  1.5
  @@ -262,7 +262,7 @@
   return;
   
   if ((!coyoteResponse.isCommitted()) 
  - (coyoteResponse.getContentLength() == -1)) {
  + (coyoteResponse.getContentLengthLong() == -1)) {
   // Flushing the char buffer
   if (state == CHAR_STATE) {
   cb.flushBuffer();
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]