- Commit patches which have been in the status for some time:

* Fix explicit flush before response commit in the org.apache.jk AJP connector.
  http://svn.apache.org/viewvc?view=rev&revision=580815

* Use newer eclipse jdt - old location is gone (reported by Jason Britian via email)
  update to jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip

* Call StopAwait at StandardServer.stop as port==-1

* Arrange doc of connectors.
  http://people.apache.org/~jfclere/patches/tc.docs.patch

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@585118 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index c3d0c9a..d298cb8 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -25,50 +25,6 @@ $Revision$ $Date$
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Fix explicit flush before response commit in the org.apache.jk AJP connector.
-  http://svn.apache.org/viewvc?view=rev&revision=580815
-  +1: remm, pero, funkman
-  -1: 
-
-* Use newer eclipse jdt - old location is gone (reported by Jason Britian via email)
-  update to jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
-  +1: pero, funkman, remm
-  -1: 
-
-* Call StopAwait at StandardServer.stop as port==-1
-
-Index: java/org/apache/catalina/core/StandardServer.java
-===================================================================
---- java/org/apache/catalina/core/StandardServer.java  (revision 583866)
-+++ java/org/apache/catalina/core/StandardServer.java  (working copy)
-@@ -360,7 +360,7 @@
-         if( port==-1 ) {
-             while( true ) {
-                 try {
--                    Thread.sleep( 100000 );
-+                    Thread.sleep( 10000 );
-                 } catch( InterruptedException ex ) {
-                 }
-                 if( stopAwait ) return;
-@@ -747,6 +747,9 @@
-         // Notify our interested LifecycleListeners
-         lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
- 
-+        if (port == -1)
-+            stopAwait();
-+
-     }
- 
-     public void init() throws Exception {
-
-  +1: pero, remm, fhanik
-  -1: 
-  
-* Arrange doc of connectors.
-  http://people.apache.org/~jfclere/patches/tc.docs.patch
-  +1: jfclere, remm, markt
-  -1:
-
 * Make server.xml parsing warnings more generic, add support for the NIO connector
 * Connector is no longer an exception case. Any new component can still use setProperty and return a boolean 
 * to accept or reject the property
@@ -88,5 +44,5 @@ Index: java/org/apache/catalina/core/StandardServer.java
   
 * Fix important vulnerability when webdav is enabled for write
   Patch: http://marc.info/?l=tomcat-dev&m=119245116910632&w=2
-  +1: markt,funkman
-  -1:
+  +1: markt, funkman, remm
+  -1: 

diff --git a/build.properties.default b/build.properties.default
index 23610c5..e3aeacd 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -57,7 +57,7 @@ wsdl4j-src.loc=http://repo1.maven.org/maven2/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.ja
 jdt.home=${base.path}/eclipse/plugins
 jdt.lib=${jdt.home}
 jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.2.3.v_686_R32x.jar
-jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip
+jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
 
 # ----- Tomcat native library -----
 tomcat-native.home=${base.path}/tomcat-native-1.1.10

diff --git a/java/org/apache/catalina/core/StandardServer.java b/java/org/apache/catalina/core/StandardServer.java
index 4d00476..155f7cf 100644 (file)
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -360,7 +360,7 @@ public final class StandardServer
         if( port==-1 ) {
             while( true ) {
                 try {
-                    Thread.sleep( 100000 );
+                    Thread.sleep( 10000 );
                 } catch( InterruptedException ex ) {
                 }
                 if( stopAwait ) return;
@@ -747,6 +747,9 @@ public final class StandardServer
         // Notify our interested LifecycleListeners
         lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
 
+        if (port == -1)
+            stopAwait();
+
     }
 
     public void init() throws Exception {

diff --git a/java/org/apache/jk/core/MsgContext.java b/java/org/apache/jk/core/MsgContext.java
index aa6d935..00c08aa 100644 (file)
--- a/java/org/apache/jk/core/MsgContext.java
+++ b/java/org/apache/jk/core/MsgContext.java
@@ -275,12 +275,15 @@ public class MsgContext implements ActionHook {
             
         } else if( actionCode==ActionCode.ACTION_CLIENT_FLUSH ) {
             if( log.isDebugEnabled() ) log.debug("CLIENT_FLUSH " );
+            Response res = (Response)param;
+            if(!res.isCommitted()) {
+                action(ActionCode.ACTION_COMMIT, res);
+            }
             try {
                 source.flush( null, this );
             } catch(IOException iex) {
                 // This is logged elsewhere, so debug only here
                 log.debug("Error during flush",iex);
-                Response res = (Response)param;
                 res.setErrorException(iex);
                 setStatus(JK_STATUS_ERROR);
             }

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cc35143..fc39388 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -33,6 +33,13 @@
 
 <body>
 <section name="Tomcat 6.0.15 (remm)">
+  <subsection name="General">
+    <changelog>
+      <fix>
+        Use Eclipse JDT 3.3.1. (pero)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Catalina">
     <changelog>
       <fix><bug>43487</bug>
@@ -110,6 +117,12 @@
         org.apache.catalina.core.StandardContext.findStatusPage(int)
          (funkman)
       </fix>
+      <fix>
+        Fix important vulnerability when webdav is enabled for write. (markt)
+      </fix>
+      <fix>
+        Call stopAwait in StandardServer.stop if port == -1. (pero)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
@@ -127,6 +140,9 @@
       <fix>
         <bug>42925</bug>: Add maintain for sendfile. (remm)
       </fix>
+      <fix>
+        Fix explicit flush before response commit in the org.apache.jk AJP connector. (pero)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">
@@ -146,6 +162,9 @@
         <bug>42979</bug>: Update sample.war to include recent security fixes
         in the source code. (markt)
       </fix>
+      <fix>
+        Minor connector doc fix. (jfclere)
+      </fix>
     </changelog>
   </subsection>
    <subsection name="Cluster">

diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 9655246..a61f8ae 100644 (file)
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -77,9 +77,7 @@
 
     <attribute name="emptySessionPath" required="false">
       <p>If set to <code>true</code>, all paths for session cookies will be set
-      to <code>/</code>. This can be useful for portlet specification implementations,
-      but will greatly affect performance if many applications are accessed on a given
-      server by the client.
+      to <code>/</code>. This can be useful for portlet specification implementations.
       If not specified, this attribute is set to <code>false</code>.</p>
     </attribute>
 

diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 86d9dfb..1dba1fd 100644 (file)
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -78,9 +78,7 @@
 
     <attribute name="emptySessionPath" required="false">
       <p>If set to <code>true</code>, all paths for session cookies will be set
-      to <code>/</code>. This can be useful for portlet specification implementations,
-      but will greatly affect performance if many applications are accessed on a given
-      server by the client.
+      to <code>/</code>. This can be useful for portlet specification implementations.
       If not specified, this attribute is set to <code>false</code>.</p>
     </attribute>