svn commit: r609277 - /tomcat/current/tc5.5.x/STATUS.txt

[pero]

Author: pero
Date: Sun Jan  6 01:01:11 2008
New Revision: 609277

URL: http://svn.apache.org/viewvc?rev=609277&view=rev
Log:
Cast my vote

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609277&r1=609276&r2=609277&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 01:01:11 2008
@@ -33,7 +33,7 @@
 
 * Fix bug in CGI servlet that causes it to fail when included
   http://svn.apache.org/viewvc?view=rev&revision=595802
-  +1: markt, fhanik, funkman
+  +1: markt, fhanik, funkman, pero
   -1:
 
 * JDT location return 404
@@ -178,11 +178,11 @@
   present. Based on a patch by Yuan Qingyun.
   http://svn.apache.org/viewvc?rev=606944&view=rev
   http://svn.apache.org/viewvc?rev=609003&view=rev
-  +1: markt,funkman, fhanik
+  +1: markt,funkman, fhanik, pero
   -1: 
 
 * Remove unused dependency on HttpClient
   http://people.apache.org/~funkman/tc5.5-build.properties.patch
-  +1: funkman
+  +1: funkman, pero
   -1: 
  



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

svn commit: r609294 - in /tomcat/tc6.0.x/trunk: STATUS.txt conf/catalina.policy webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sun Jan  6 03:43:46 2008
New Revision: 609294

URL: http://svn.apache.org/viewvc?rev=609294&view=rev
Log:
Fix CVE-2007-5342. Restrict JULI permissions.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/conf/catalina.policy
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=609294&r1=609293&r2=609294&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan  6 03:43:46 2008
@@ -31,12 +31,6 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match 
the dir structure
 
-* Fix CVE-2007-5342
-  JULI permissions need to be restricted
-  http://svn.apache.org/viewvc?rev=606594&view=rev
-  +1: markt,funkman, pero, yoavs
-  -1:
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43868
   MBean methods getInvoke() and getSetter() were broken
   http://svn.apache.org/viewvc?rev=607483&view=rev

Modified: tomcat/tc6.0.x/trunk/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/catalina.policy?rev=609294&r1=609293&r2=609294&view=diff
==
--- tomcat/tc6.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc6.0.x/trunk/conf/catalina.policy Sun Jan  6 03:43:46 2008
@@ -62,7 +62,19 @@
 
 // These permissions apply to the logging API
 grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
-permission java.security.AllPermission;
+permission java.util.PropertyPermission 
"java.util.logging.config.class", "read";
+permission java.util.PropertyPermission 
"java.util.logging.config.file", "read";
+permission java.lang.RuntimePermission "shutdownHooks";
+permission java.io.FilePermission 
"${catalina.base}${file.separator}conf${file.separator}logging.properties", 
"read";
+permission java.util.PropertyPermission "catalina.base", "read";
+permission java.util.logging.LoggingPermission "control";
+permission java.io.FilePermission 
"${catalina.base}${file.separator}logs", "read, write";
+permission java.io.FilePermission 
"${catalina.base}${file.separator}logs${file.separator}*", "read, write";
+permission java.lang.RuntimePermission "getClassLoader";
+// To enable per context logging configuration, permit read access to 
the appropriate file.
+// Be sure that the logging configuration is secure before enabling 
such access
+// eg for the examples web application:
+// permission java.io.FilePermission 
"${catalina.base}${file.separator}webapps${file.separator}examples${file.separator}WEB-INF${file.separator}classes${file.separator}logging.properties",
 "read";
 };
 
 // These permissions apply to the server startup code

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=609294&r1=609293&r2=609294&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Jan  6 03:43:46 2008
@@ -35,6 +35,9 @@
 
   
 
+  
+Fix CVE-2007-5342 by limiting permissions granted to JULI. (markt)
+  
   
 Fix handling of CometEvent.close when called during BEGIN event 
(fhanik)
   



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

svn commit: r609297 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/WebdavServ

[markt]

Author: markt
Date: Sun Jan  6 04:00:31 2008
New Revision: 609297

URL: http://svn.apache.org/viewvc?rev=609297&view=rev
Log:
Improve fix for CVE-2007-5461.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties?rev=609297&r1=609296&r2=609297&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties
 Sun Jan  6 04:00:31 2008
@@ -25,6 +25,7 @@
 invokerServlet.notNamed=Cannot call invoker servlet with a named dispatcher
 invokerServlet.noWrapper=Container has not called setWrapper() for this servlet
 webdavservlet.jaxpfailed=JAXP initialization failed
+webdavservlet.externalEntityIgnored=The request included a reference to an 
external entity with PublicID {0} and SystemID {1} which was ignored
 directory.filename=Filename
 directory.lastModified=Last Modified
 directory.parent=Up To {0}

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java?rev=609297&r1=609296&r2=609297&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
 Sun Jan  6 04:00:31 2008
@@ -20,6 +20,7 @@
 
 
 import java.io.IOException;
+import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.security.MessageDigest;
@@ -40,6 +41,7 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.UnavailableException;
 import javax.servlet.http.HttpServletRequest;
@@ -61,6 +63,7 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
@@ -254,6 +257,8 @@
 documentBuilderFactory.setNamespaceAware(true);
 documentBuilderFactory.setExpandEntityReferences(false);
 documentBuilder = documentBuilderFactory.newDocumentBuilder();
+documentBuilder.setEntityResolver(
+new WebdavResolver(this.getServletContext()));
 } catch(ParserConfigurationException e) {
 throw new ServletException
 (sm.getString("webdavservlet.jaxpfailed"));
@@ -2769,7 +2774,26 @@
 
 }
 
-
+// - WebdavResolver Inner Class
+/**
+ * Work around for XML parsers that don't fully respect
+ * [EMAIL PROTECTED] 
DocumentBuilderFactory#setExpandEntityReferences(false)}. External
+ * references are filtered out for security reasons. See CVE-2007-5461.
+ */
+private class WebdavResolver implements EntityResolver {
+private ServletContext context;
+
+public WebdavResolver(ServletContext theContext) {
+context = theContext;
+}
+
+public InputSource resolveEntity (String publicId, String systemId) {
+context.log(sm.getString("webdavservlet.externalEntityIgnored",
+publicId, systemId));
+return new InputSource(
+new StringReader("Ignored external entity"));
+}
+}
 };
 
 

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609297&r1=609296&r2=609297&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 04:00:31 2008
@@ -25,12 +25,6 @@
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Improve fix for webdav vulnerability to workaround what looks like a parser
-  bug
-  http://people.apache.org/~markt/patches/2007-10-20-webdav.patch
-  +1: markt, pero, fhanik
-  -1:
-
 * Fix bug in CGI servlet that causes it to fail when included
   http://svn.apache.org/viewvc?view=rev&revision=595802
   +1: markt, fhanik, funkman, pero

svn commit: r609298 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 04:27:05 2008
New Revision: 609298

URL: http://svn.apache.org/viewvc?rev=609298&view=rev
Log:
Fix bug in CGI servlet that causes it to fail when included

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java?rev=609298&r1=609297&r2=609298&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
 Sun Jan  6 04:27:05 2008
@@ -797,10 +797,26 @@
  */
 protected void setupFromRequest(HttpServletRequest req)
 throws UnsupportedEncodingException {
-
-this.contextPath = req.getContextPath();
-this.servletPath = req.getServletPath();
-this.pathInfo = req.getPathInfo();
+
+boolean isIncluded = false;
+
+// Look to see if this request is an include
+if (req.getAttribute(Globals.INCLUDE_REQUEST_URI_ATTR) != null) {
+isIncluded = true;
+}
+if (isIncluded) {
+this.contextPath = (String) req.getAttribute(
+Globals.INCLUDE_CONTEXT_PATH_ATTR);
+this.servletPath = (String) req.getAttribute(
+Globals.INCLUDE_SERVLET_PATH_ATTR);
+this.pathInfo = (String) req.getAttribute(
+Globals.INCLUDE_PATH_INFO_ATTR);
+} else {
+this.contextPath = req.getContextPath();
+this.servletPath = req.getServletPath();
+this.pathInfo = req.getPathInfo();
+}
+
 // If getPathInfo() returns null, must be using extension mapping
 // In this case, pathInfo should be same as servletPath
 if (this.pathInfo == null) {
@@ -814,7 +830,13 @@
 if (req.getMethod().equals("GET")
 || req.getMethod().equals("POST")
 || req.getMethod().equals("HEAD")) {
-String qs = req.getQueryString();
+String qs;
+if (isIncluded) {
+qs = (String) req.getAttribute(
+Globals.INCLUDE_QUERY_STRING_ATTR);
+} else {
+qs = req.getQueryString();
+}
 if (qs != null && qs.indexOf("=") == -1) {
 StringTokenizer qsTokens = new StringTokenizer(qs, "+");
 while ( qsTokens.hasMoreTokens() ) {

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609298&r1=609297&r2=609298&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 04:27:05 2008
@@ -66,6 +66,10 @@
   
 43687 Remove conditional headers on Form Auth replay, since 
the UA (esp. FireFox) isn't expecting it. (billbarker)
   
+  
+Fix bug in CGI Servlet that caused it to fail when a CGI resource was
+included in another resource. (markt)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609298&r1=609297&r2=609298&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 04:27:05 2008
@@ -25,11 +25,6 @@
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Fix bug in CGI servlet that causes it to fail when included
-  http://svn.apache.org/viewvc?view=rev&revision=595802
-  +1: markt, fhanik, funkman, pero
-  -1:
-
 * JDT location return 404
   http://people.apache.org/~fhanik/patches/jdt-loc.patch
   Backport from Tomcat 6



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

svn commit: r609310 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c native/iis/jk_isapi_plugin.c native/netscape/jk_nsapi_plugin.c xdocs/miscellaneous/changelog

[rjung]

Author: rjung
Date: Sun Jan  6 06:00:03 2008
New Revision: 609310

URL: http://svn.apache.org/viewvc?rev=609310&view=rev
Log:
Make open/attach logging for shm consistent for all web servers.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=609310&r1=609309&r2=609310&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Jan  6 06:00:03 
2008
@@ -2655,12 +2655,7 @@
 }
 #endif
 
-if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) == 0) {
-if (JK_IS_DEBUG_LEVEL(conf->log))
-jk_log(conf->log, JK_LOG_DEBUG, "Initialized shm:%s (%d bytes)",
-   jk_shm_name(), (int) jk_shm_size, rc);
-}
-else
+if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) != 0)
 jk_log(conf->log, JK_LOG_ERROR,
"Initializing shm:%s errno=%d. Load balancing workers will not 
function properly.",
jk_shm_name(), rc);
@@ -2959,12 +2954,7 @@
 
 JK_TRACE_ENTER(conf->log);
 
-if ((rc = jk_shm_attach(jk_shm_file, jk_shm_size, conf->log)) == 0) {
-if (JK_IS_DEBUG_LEVEL(conf->log))
-jk_log(conf->log, JK_LOG_DEBUG, "Attached shm:%s (%d bytes)",
-   jk_shm_name(), (int) jk_shm_size);
-}
-else
+if ((rc = jk_shm_attach(jk_shm_file, jk_shm_size, conf->log)) != 0)
 jk_log(conf->log, JK_LOG_ERROR, "Attaching shm:%s errno=%d",
jk_shm_name(), rc);
 

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=609310&r1=609309&r2=609310&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Jan  6 06:00:03 
2008
@@ -2715,11 +2715,8 @@
 JK_TRACE_ENTER(conf->log);
 
 if ((rc = jk_shm_attach(jk_shm_file, jk_shm_size, conf->log)) == 0) {
-if (JK_IS_DEBUG_LEVEL(conf->log))
-jk_log(conf->log, JK_LOG_DEBUG, "Attached shm:%s (%d bytes)",
-   jk_shm_name(), (int) jk_shm_size);
-apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
- jk_cleanup_shmem);
+apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
+  jk_cleanup_shmem);
 }
 else
 jk_log(conf->log, JK_LOG_ERROR, "Attaching shm:%s errno=%d",
@@ -2760,11 +2757,8 @@
 }
 #endif
 if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) == 0) {
-if (JK_IS_DEBUG_LEVEL(conf->log))
-jk_log(conf->log, JK_LOG_DEBUG, "Initialized shm:%s (%d bytes)",
-   jk_shm_name(), (int) jk_shm_size, rc);
-apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
-  jk_cleanup_shmem);
+apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
+  jk_cleanup_shmem);
 }
 else
 jk_log(conf->log, JK_LOG_ERROR,

Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=609310&r1=609309&r2=609310&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Sun Jan  6 06:00:03 
2008
@@ -1656,6 +1656,7 @@
 {
 char shm_name[MAX_PATH];
 int rc = JK_FALSE;
+int rv;
 
 if (!jk_open_file_logger(&logger, log_file, log_level)) {
 logger = NULL;
@@ -1674,7 +1675,11 @@
 /*
  * Create named shared memory for each server
  */
-jk_shm_open(shm_name, shm_config_size, logger);
+if ((rv = jk_shm_open(shm_name, shm_config_size, logger)) != 0) {
+jk_log(logger, JK_LOG_ERROR,
+   "Initializing shm:%s errno=%d. Load balancing workers will not 
function properly.",
+   jk_shm_name(), rv);
+}
 
 jk_set_worker_def_cache_size(DEFAULT_WORKER_THREADS);
 

Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?rev=609310&r1=609309&r2=609310&view=diff

svn commit: r609311 - /tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c

[rjung]

Author: rjung
Date: Sun Jan  6 06:05:03 2008
New Revision: 609311

URL: http://svn.apache.org/viewvc?rev=609311&view=rev
Log:
Fix compiler warning (unused var).

Modified:
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c

Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?rev=609311&r1=609310&r2=609311&view=diff
==
--- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Sun Jan  6 
06:05:03 2008
@@ -159,7 +159,6 @@
 
 *a = 0;
 if (l) {
-char *buf = b;
 unsigned i;
 netbuf *inbuf = p->sn->inbuf;
 
@@ -172,6 +171,7 @@
 }
 
 #else
+char *buf = b;
 int ch;
 for (i = 0; i < l; i++) {
 ch = netbuf_getc(inbuf);



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

svn commit: r609313 - /tomcat/connectors/trunk/jk/native/common/jk_shm.c

[rjung]

Author: rjung
Date: Sun Jan  6 06:11:29 2008
New Revision: 609313

URL: http://svn.apache.org/viewvc?rev=609313&view=rev
Log:
Part 2 of r609310: Make open/attach logging for shm
consistent for all web servers.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.c?rev=609313&r1=609312&r2=609313&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Sun Jan  6 06:11:29 2008
@@ -92,7 +92,7 @@
 return 0;
 }
 
-jk_shmem.size =  JK_SHM_ALIGN(sizeof(jk_shm_header_t) + sz);
+jk_shmem.size = JK_SHM_ALIGN(sizeof(jk_shm_header_t) + sz);
 
 #if defined (WIN32)
 if (fname) {
@@ -167,9 +167,11 @@
 JK_INIT_CS(&(jk_shmem.cs), rc);
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "%s shared memory size=%u free=%u addr=%#lx",
+   "%s shared memory %s size=%u free=%u addr=%#lx",
attached ? "Attached" : "Initialized",
-   jk_shmem.size, jk_shmem.hdr->h.data.size, jk_shmem.hdr);
+   jk_shm_name(), jk_shmem.size,
+   jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos,
+   jk_shmem.hdr);
 JK_TRACE_EXIT(l);
 return 0;
 }
@@ -182,8 +184,8 @@
 jk_shmem.attached = 1;
 if (JK_IS_DEBUG_LEVEL(l)) {
 jk_log(l, JK_LOG_DEBUG,
-   "Attached shared memory [%d] size=%u free=%u addr=%#lx",
-   jk_shmem.hdr->h.data.childs, jk_shmem.hdr->h.data.size,
+   "Attached shared memory %s [%d] size=%u free=%u addr=%#lx",
+   jk_shm_name(), jk_shmem.hdr->h.data.childs, jk_shmem.size,
jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos,
jk_shmem.hdr);
 }
@@ -445,8 +447,10 @@
 jk_shmem.hdr->h.data.childs = 1;
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "Initialized shared memory size=%u free=%u addr=%#lx",
-   jk_shmem.size, jk_shmem.hdr->h.data.size, jk_shmem.hdr);
+   "Initialized shared memory %s size=%u free=%u addr=%#lx",
+   jk_shm_name(), jk_shmem.size,
+   jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos,
+   jk_shmem.hdr);
 }
 else {
 unsigned int nchild;
@@ -455,8 +459,8 @@
 nchild = jk_shmem.hdr->h.data.childs;
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "Attached shared memory [%d] size=%u free=%u addr=%#lx",
-   nchild, jk_shmem.hdr->h.data.size,
+   "Attached shared memory %s [%d] size=%u free=%u addr=%#lx",
+   jk_shm_name(), nchild, jk_shmem.size,
jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos,
jk_shmem.hdr);
 /*



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

svn commit: r609314 - in /tomcat/connectors/trunk/jk/native/common: jk_shm.c jk_shm.h

[rjung]

Author: rjung
Date: Sun Jan  6 06:12:42 2008
New Revision: 609314

URL: http://svn.apache.org/viewvc?rev=609314&view=rev
Log:
Add function to calculate needed shm size.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.c
tomcat/connectors/trunk/jk/native/common/jk_shm.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.c?rev=609314&r1=609313&r2=609314&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Sun Jan  6 06:12:42 2008
@@ -26,6 +26,7 @@
 #include "jk_pool.h"
 #include "jk_util.h"
 #include "jk_mt.h"
+#include "jk_lb_worker.h"
 #include "jk_shm.h"
 
 /** jk shm header core data structure */
@@ -58,6 +59,7 @@
 struct jk_shm
 {
 size_t size;
+unsigned   workers;
 char   *filename;
 char   *lockname;
 intfd;
@@ -70,12 +72,57 @@
 typedef struct jk_shm jk_shm_t;
 
 static const char shm_signature[] = { JK_SHM_MAGIC };
-static jk_shm_t jk_shmem = { 0, NULL, NULL, -1, -1, 0, NULL};
+static jk_shm_t jk_shmem = { 0, 0, NULL, NULL, -1, -1, 0, NULL};
 static time_t jk_workers_modified_time = 0;
 static time_t jk_workers_access_time = 0;
 #if defined (WIN32)
 static HANDLE jk_shm_map = NULL;
 #endif
+
+/* Calculate needed shm size */
+size_t jk_shm_calculate_size(jk_map_t *init_data, jk_logger_t *l)
+{
+char **worker_list;
+unsigned i;
+unsigned num_of_workers;
+int num_of_shm_workers = 0;
+
+JK_TRACE_ENTER(l);
+
+if (jk_get_worker_list(init_data, &worker_list,
+   &num_of_workers) == JK_FALSE) {
+jk_log(l, JK_LOG_ERROR,
+   "Could not get worker list from map");
+JK_TRACE_EXIT(l);
+return 0;
+}
+
+for (i = 0; i < num_of_workers; i++) {
+const char *type = jk_get_worker_type(init_data, worker_list[i]);
+
+if (!strcmp(type, JK_LB_WORKER_NAME)) {
+char **member_list;
+unsigned num_of_members;
+if (jk_get_lb_worker_list(init_data, worker_list[i],
+  &member_list, &num_of_members) == 
JK_FALSE) {
+jk_log(l, JK_LOG_ERROR,
+   "Could not get member list for lb worker from map");
+JK_TRACE_EXIT(l);
+return 0;
+}
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG, "worker %s of type %s has %u members",
+   worker_list[i], JK_LB_WORKER_NAME, num_of_members);
+num_of_shm_workers += num_of_members + 1;
+}
+}
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG, "shared memory will contain %u items", 
num_of_shm_workers);
+jk_shmem.workers = num_of_shm_workers;
+JK_TRACE_EXIT(l);
+return JK_SHM_SIZE(jk_shmem.workers);
+}
+
 
 #if defined (WIN32) || defined(NETWARE)
 

Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.h?rev=609314&r1=609313&r2=609314&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_shm.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.h Sun Jan  6 06:12:42 2008
@@ -51,9 +51,10 @@
 /* Really huge numbers, but 64 workers should be enough */
 #define JK_SHM_MAX_WORKERS  64
 #define JK_SHM_WORKER_SIZE  JK_SHM_ALIGN(sizeof(jk_shm_worker_t))
-#define JK_SHM_DEF_SIZE (JK_SHM_MAX_WORKERS * JK_SHM_WORKER_SIZE)
+#define JK_SHM_SIZE(x)  ((x) * JK_SHM_WORKER_SIZE)
+#define JK_SHM_DEF_SIZE JK_SHM_SIZE(JK_SHM_MAX_WORKERS)
 #define JK_SHM_ALIGNMENT64
-#define JK_SHM_ALIGN(x) JK_ALIGN(x, JK_SHM_ALIGNMENT)
+#define JK_SHM_ALIGN(x) JK_ALIGN((x), JK_SHM_ALIGNMENT)
 
 /** jk shm worker record structure */
 struct jk_shm_worker
@@ -123,6 +124,9 @@
 typedef struct jk_shm_worker jk_shm_worker_t;
 
 const char *jk_shm_name(void);
+
+/* Calculate needed shm size */
+size_t jk_shm_calculate_size(jk_map_t *init_data, jk_logger_t *l);
 
 /* Open the shared memory creating file if needed
  */



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

svn commit: r609319 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c iis/jk_isapi_plugin.c netscape/jk_nsapi_plugin.c

[rjung]

Author: rjung
Date: Sun Jan  6 06:38:54 2008
New Revision: 609319

URL: http://svn.apache.org/viewvc?rev=609319&view=rev
Log:
Move shm open to prepare automatic size
detection (wee need to read the worker
map before opening shm).
wc_open() needs to stay behind shm, because
it already uses the shm.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=609319&r1=609318&r2=609319&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Jan  6 06:38:54 
2008
@@ -2640,6 +2640,20 @@
 }
 }
 
+if ((jk_worker_file != NULL) &&
+!jk_map_read_properties(jk_worker_properties, jk_worker_file, NULL,
+JK_MAP_HANDLE_DUPLICATES, conf->log)) {
+jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p,
+  "Error in reading worker properties from '%s'",
+  jk_worker_file);
+}
+
+if (jk_map_resolve_references(jk_worker_properties, "worker.",
+  1, 1, conf->log) == JK_FALSE) {
+jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p,
+  "Error in resolving configuration references");
+}
+
 #if !defined(WIN32) && !defined(NETWARE)
 if (!jk_shm_file) {
 jk_shm_file = ap_server_root_relative(p, JK_SHM_DEF_FILE);
@@ -2663,20 +2677,6 @@
 /* SREVILAK -- register cleanup handler to clear resources on restart,
  * to make sure log file gets closed in the parent process  */
 ap_register_cleanup(p, s, jk_server_cleanup, ap_null_cleanup);
-
-if ((jk_worker_file != NULL) &&
-!jk_map_read_properties(jk_worker_properties, jk_worker_file, NULL,
-JK_MAP_HANDLE_DUPLICATES, conf->log)) {
-jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p,
-  "Error in reading worker properties from '%s'",
-  jk_worker_file);
-}
-
-if (jk_map_resolve_references(jk_worker_properties, "worker.",
-  1, 1, conf->log) == JK_FALSE) {
-jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p,
-  "Error in resolving configuration references");
-}
 
 /* we add the URI->WORKER MAP since workers using AJP14 will feed it */
 worker_env.uri_to_worker = conf->uw_map;

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=609319&r1=609318&r2=609319&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Jan  6 06:38:54 
2008
@@ -2747,24 +2747,6 @@
 jk_map_alloc(&jk_worker_properties);
 jk_map_put(jk_worker_properties, "ServerRoot", ap_server_root, NULL);
 
-#if !defined(WIN32) && !defined(NETWARE)
-if (!jk_shm_file) {
-jk_shm_file = ap_server_root_relative(pconf, JK_SHM_DEF_FILE);
-if (jk_shm_file)
-ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
- "No JkShmFile defined in httpd.conf. "
- "Using default %s", jk_shm_file);
-}
-#endif
-if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) == 0) {
-apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
-  jk_cleanup_shmem);
-}
-else
-jk_log(conf->log, JK_LOG_ERROR,
-   "Initializing shm:%s errno=%d. Load balancing workers will not 
function properly.",
-   jk_shm_name(), rc);
-
 /* Set default connection cache size for multi-threaded MPMs */
 if (ap_mpm_query(AP_MPMQ_IS_THREADED, &is_threaded) == APR_SUCCESS &&
 is_threaded != AP_MPMQ_NOT_SUPPORTED) {
@@ -2792,6 +2774,24 @@
  "Error in resolving configuration references");
 return JK_FALSE;
 }
+
+#if !defined(WIN32) && !defined(NETWARE)
+if (!jk_shm_file) {
+jk_shm_file = ap_server_root_relative(pconf, JK_SHM_DEF_FILE);
+if (jk_shm_file)
+ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
+ "No JkShmFile defined in httpd.conf. "
+ "Using default %s", jk_shm_file);
+}
+#endif
+if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) == 0) {
+apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem

svn commit: r609322 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c native/iis/jk_isapi_plugin.c native/netscape/jk_nsapi_plugin.c xdocs/miscellaneous/changelog

[rjung]

Author: rjung
Date: Sun Jan  6 06:50:20 2008
New Revision: 609322

URL: http://svn.apache.org/viewvc?rev=609322&view=rev
Log:
Automatically determine shm size for all web servers.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
tomcat/connectors/trunk/jk/xdocs/reference/iis.xml

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=609322&r1=609321&r2=609322&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Jan  6 06:50:20 
2008
@@ -220,7 +220,7 @@
 static table *jk_log_fds = NULL;
 static jk_worker_env_t worker_env;
 static char *jk_shm_file = NULL;
-static size_t jk_shm_size = JK_SHM_DEF_SIZE;
+static size_t jk_shm_size = 0;
 /*
  * Worker stuff
 */
@@ -2669,6 +2669,14 @@
 }
 #endif
 
+if (jk_shm_size == 0)
+jk_shm_size = jk_shm_calculate_size(jk_worker_properties, conf->log);
+else {
+jk_log(conf->log, JK_LOG_INFO,
+   "The optimal shared memory size can now be determined 
automatically.");
+jk_log(conf->log, JK_LOG_INFO,
+   "You can remove the JkShmSize directive if you want to use the 
optimal size.");
+}
 if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) != 0)
 jk_log(conf->log, JK_LOG_ERROR,
"Initializing shm:%s errno=%d. Load balancing workers will not 
function properly.",

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=609322&r1=609321&r2=609322&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Jan  6 06:50:20 
2008
@@ -231,7 +231,7 @@
 static jk_worker_env_t worker_env;
 static apr_global_mutex_t *jk_log_lock = NULL;
 static char *jk_shm_file = NULL;
-static size_t jk_shm_size = JK_SHM_DEF_SIZE;
+static size_t jk_shm_size = 0;
 /*
  * Worker stuff
 */
@@ -2784,6 +2784,14 @@
  "Using default %s", jk_shm_file);
 }
 #endif
+if (jk_shm_size == 0)
+jk_shm_size = jk_shm_calculate_size(jk_worker_properties, conf->log);
+else {
+jk_log(conf->log, JK_LOG_INFO,
+   "The optimal shared memory size can now be determined 
automatically.");
+jk_log(conf->log, JK_LOG_INFO,
+   "You can remove the JkShmSize directive if you want to use the 
optimal size.");
+}
 if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) == 0) {
 apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
   jk_cleanup_shmem);

Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=609322&r1=609321&r2=609322&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Sun Jan  6 06:50:20 
2008
@@ -193,7 +193,7 @@
 static char worker_mount_file[MAX_PATH * 2] = {0};
 static int  worker_mount_reload = JK_URIMAP_DEF_RELOAD;
 static char rewrite_rule_file[MAX_PATH * 2] = {0};
-static int shm_config_size = JK_SHM_DEF_SIZE;
+static size_t shm_config_size = 0;
 static int strip_session = 0;
 static DWORD auth_notification_flags = 0;
 static int   use_auth_notification_flags = 1;
@@ -1762,6 +1762,14 @@
 /*
  * Create named shared memory for each server
  */
+if (shm_config_size == 0)
+shm_config_size = jk_shm_calculate_size(workers_map, 
logger);
+else {
+jk_log(logger, JK_LOG_INFO,
+   "The optimal shared memory size can now be 
determined automatically.");
+jk_log(logger, JK_LOG_INFO,
+   "You can remove the JkShmSize directive if you want 
to use the optimal size.");
+}
 if ((rv = jk_shm_open(shm_name, shm_config_size, logger)) != 0)
 jk_log(logger, JK_LOG_ERROR,
"Initializing shm:%s errno=%d. Load balancing 
workers will not function properly.",
@@ -1867,7 +1875,7 @@
 ok = JK_FALSE;
 }
 }

DO NOT REPLY [Bug 43462] - mod_jk JkShmSize directive automatic configuration

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43462


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|LATER   |




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 06:52 ---
Added a counting pass through the worker map to calculate the needed shm size.
Hard configuration is still allowed.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43462] - mod_jk JkShmSize directive automatic configuration

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43462


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r609323 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c iis/jk_isapi_plugin.c

[rjung]

Author: rjung
Date: Sun Jan  6 06:55:01 2008
New Revision: 609323

URL: http://svn.apache.org/viewvc?rev=609323&view=rev
Log:
Increase log level of new warning about hard
configured shm size in order to make people
use automatic configuration.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=609323&r1=609322&r2=609323&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Jan  6 06:55:01 
2008
@@ -2672,9 +2672,9 @@
 if (jk_shm_size == 0)
 jk_shm_size = jk_shm_calculate_size(jk_worker_properties, conf->log);
 else {
-jk_log(conf->log, JK_LOG_INFO,
+jk_log(conf->log, JK_LOG_WARNING,
"The optimal shared memory size can now be determined 
automatically.");
-jk_log(conf->log, JK_LOG_INFO,
+jk_log(conf->log, JK_LOG_WARNING,
"You can remove the JkShmSize directive if you want to use the 
optimal size.");
 }
 if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) != 0)

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=609323&r1=609322&r2=609323&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Jan  6 06:55:01 
2008
@@ -2787,9 +2787,9 @@
 if (jk_shm_size == 0)
 jk_shm_size = jk_shm_calculate_size(jk_worker_properties, conf->log);
 else {
-jk_log(conf->log, JK_LOG_INFO,
+jk_log(conf->log, JK_LOG_WARNING,
"The optimal shared memory size can now be determined 
automatically.");
-jk_log(conf->log, JK_LOG_INFO,
+jk_log(conf->log, JK_LOG_WARNING,
"You can remove the JkShmSize directive if you want to use the 
optimal size.");
 }
 if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) == 0) {

Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=609323&r1=609322&r2=609323&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Sun Jan  6 06:55:01 
2008
@@ -1765,9 +1765,9 @@
 if (shm_config_size == 0)
 shm_config_size = jk_shm_calculate_size(workers_map, 
logger);
 else {
-jk_log(logger, JK_LOG_INFO,
+jk_log(logger, JK_LOG_WARNING,
"The optimal shared memory size can now be 
determined automatically.");
-jk_log(logger, JK_LOG_INFO,
+jk_log(logger, JK_LOG_WARNING,
"You can remove the JkShmSize directive if you want 
to use the optimal size.");
 }
 if ((rv = jk_shm_open(shm_name, shm_config_size, logger)) != 0)



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

DO NOT REPLY [Bug 43462] - mod_jk JkShmSize directive automatic configuration

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43462





--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 06:56 ---
Will be part of version 1.2.27.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r609400 - /tomcat/connectors/trunk/jk/native/common/jk_shm.c

[rjung]

Author: rjung
Date: Sun Jan  6 13:01:19 2008
New Revision: 609400

URL: http://svn.apache.org/viewvc?rev=609400&view=rev
Log:
Minor shm cleanup.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.c?rev=609400&r1=609399&r2=609400&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Sun Jan  6 13:01:19 2008
@@ -103,21 +103,22 @@
 if (!strcmp(type, JK_LB_WORKER_NAME)) {
 char **member_list;
 unsigned num_of_members;
+num_of_shm_workers++;
 if (jk_get_lb_worker_list(init_data, worker_list[i],
   &member_list, &num_of_members) == 
JK_FALSE) {
 jk_log(l, JK_LOG_ERROR,
"Could not get member list for lb worker from map");
-JK_TRACE_EXIT(l);
-return 0;
 }
-if (JK_IS_DEBUG_LEVEL(l))
-jk_log(l, JK_LOG_DEBUG, "worker %s of type %s has %u members",
-   worker_list[i], JK_LB_WORKER_NAME, num_of_members);
-num_of_shm_workers += num_of_members + 1;
+else {
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG, "worker %s of type %s has %u 
members",
+   worker_list[i], JK_LB_WORKER_NAME, num_of_members);
+num_of_shm_workers += num_of_members;
+}
 }
 }
 if (JK_IS_DEBUG_LEVEL(l))
-jk_log(l, JK_LOG_DEBUG, "shared memory will contain %u items", 
num_of_shm_workers);
+jk_log(l, JK_LOG_DEBUG, "shared memory will contain %d items", 
num_of_shm_workers);
 jk_shmem.workers = num_of_shm_workers;
 JK_TRACE_EXIT(l);
 return JK_SHM_SIZE(jk_shmem.workers);
@@ -635,7 +636,7 @@
 void *rc = NULL;
 
 if (jk_shmem.hdr) {
-size = JK_ALIGN_DEFAULT(size);
+size = JK_SHM_ALIGN(size);
 if ((jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos) >= size) {
 rc = &(jk_shmem.hdr->buf[jk_shmem.hdr->h.data.pos]);
 jk_shmem.hdr->h.data.pos += size;
@@ -706,9 +707,9 @@
 
 jk_shm_worker_t *jk_shm_alloc_worker(jk_pool_t *p)
 {
-jk_shm_worker_t *w = (jk_shm_worker_t *)jk_shm_alloc(p, 
sizeof(jk_shm_worker_t));
+jk_shm_worker_t *w = (jk_shm_worker_t *)jk_shm_alloc(p, 
JK_SHM_WORKER_SIZE);
 if (w) {
-memset(w, 0, sizeof(jk_shm_worker_t));
+memset(w, 0, JK_SHM_WORKER_SIZE);
 if (jk_shmem.hdr) {
 jk_shmem.hdr->h.data.workers++;
 w->id = jk_shmem.hdr->h.data.workers;



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

svn commit: r609401 - in /tomcat/connectors/trunk/jk: native/common/jk_shm.h native/common/jk_status.c xdocs/miscellaneous/changelog.xml

[rjung]

Author: rjung
Date: Sun Jan  6 13:03:37 2008
New Revision: 609401

URL: http://svn.apache.org/viewvc?rev=609401&view=rev
Log:
Remove unused attributes from shm worker struct.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.h
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.h?rev=609401&r1=609400&r2=609401&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_shm.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.h Sun Jan  6 13:03:37 2008
@@ -41,7 +41,7 @@
  */
 
 #define JK_SHM_MAJOR'1'
-#define JK_SHM_MINOR'2'
+#define JK_SHM_MINOR'3'
 #define JK_SHM_STR_SIZ  63
 #define JK_SHM_URI_SIZ  127
 #define JK_SHM_DYNAMIC  16
@@ -50,11 +50,11 @@
 
 /* Really huge numbers, but 64 workers should be enough */
 #define JK_SHM_MAX_WORKERS  64
+#define JK_SHM_ALIGNMENT64
+#define JK_SHM_ALIGN(x) JK_ALIGN((x), JK_SHM_ALIGNMENT)
 #define JK_SHM_WORKER_SIZE  JK_SHM_ALIGN(sizeof(jk_shm_worker_t))
 #define JK_SHM_SIZE(x)  ((x) * JK_SHM_WORKER_SIZE)
 #define JK_SHM_DEF_SIZE JK_SHM_SIZE(JK_SHM_MAX_WORKERS)
-#define JK_SHM_ALIGNMENT64
-#define JK_SHM_ALIGN(x) JK_ALIGN((x), JK_SHM_ALIGNMENT)
 
 /** jk shm worker record structure */
 struct jk_shm_worker
@@ -68,8 +68,6 @@
 volatile int busy;
 /* Maximum number of busy channels */
 volatile int max_busy;
-/* Number of currently connected channels */
-volatile int connected;
 /* worker name */
 charname[JK_SHM_STR_SIZ+1];
 /* route */
@@ -97,7 +95,6 @@
 int retries;
 int lbmethod;
 int lblock;
-unsigned int max_packet_size;
 /* Statistical data */
 volatile time_t  error_time;
 /* Service transfer rate time */
@@ -112,10 +109,6 @@
 volatile jk_uint64_t  elected_snapshot;
 /* Number of non 200 responses */
 volatile jk_uint32_t  errors;
-/* Number of recovery attempts */
-volatile jk_uint32_t  recoveries;
-/* Number of recovery failures */
-volatile jk_uint32_t  recovery_errors;
 /* Decayed number of reply_timeout errors */
 volatile jk_uint32_t  reply_timeouts;
 /* Number of client errors */

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=609401&r1=609400&r2=609401&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Jan  6 13:03:37 
2008
@@ -2977,8 +2977,6 @@
 wr->s->errors   = 0;
 wr->s->lb_value = 0;
 wr->s->max_busy = 0;
-wr->s->recoveries   = 0;
-wr->s->recovery_errors  = 0;
 wr->s->readed   = 0;
 wr->s->transferred  = 0;
 wr->s->state= JK_LB_STATE_IDLE;
@@ -2999,8 +2997,6 @@
 wr->s->errors   = 0;
 wr->s->lb_value = 0;
 wr->s->max_busy = 0;
-wr->s->recoveries   = 0;
-wr->s->recovery_errors  = 0;
 wr->s->readed   = 0;
 wr->s->transferred  = 0;
 wr->s->state= JK_LB_STATE_IDLE;

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=609401&r1=609400&r2=609401&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sun Jan  6 
13:03:37 2008
@@ -44,6 +44,9 @@
   
 
   
+SHM: Remove unused attributes. (rjung)
+  
+  
 SHM: Automatically determine shm size for all web servers. (rjung)
   
   



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

svn commit: r609404 - in /tomcat/connectors/trunk/jk: native/common/jk_lb_worker.c native/common/jk_lb_worker.h native/common/jk_shm.c native/common/jk_shm.h xdocs/miscellaneous/changelog.xml

[rjung]

Author: rjung
Date: Sun Jan  6 13:14:08 2008
New Revision: 609404

URL: http://svn.apache.org/viewvc?rev=609404&view=rev
Log:
Use distinct structs for lb and ajp13 in shm.
Improves type safety and saves a few bytes.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
tomcat/connectors/trunk/jk/native/common/jk_shm.c
tomcat/connectors/trunk/jk/native/common/jk_shm.h
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?rev=609404&r1=609403&r2=609404&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sun Jan  6 13:14:08 
2008
@@ -1305,10 +1305,10 @@
 }
 
 for (i = 0; i < num_of_workers; i++) {
-p->lb_workers[i].s = jk_shm_alloc_worker(&p->p);
+p->lb_workers[i].s = jk_shm_alloc_ajp13_worker(&p->p);
 if (p->lb_workers[i].s == NULL) {
 jk_log(l, JK_LOG_ERROR,
-   "allocating worker record from shared memory");
+   "allocating ajp13 worker record from shared 
memory");
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
@@ -1518,7 +1518,7 @@
 private_data->buf,
 sizeof(jk_pool_atom_t) * TINY_POOL_SIZE);
 
-private_data->s = jk_shm_alloc_worker(&private_data->p);
+private_data->s = jk_shm_alloc_lb_worker(&private_data->p);
 if (!private_data->s) {
 free(private_data);
 JK_TRACE_EXIT(l);

Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h?rev=609404&r1=609403&r2=609404&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Sun Jan  6 13:14:08 
2008
@@ -120,11 +120,11 @@
 
 struct worker_record
 {
-jk_worker_t  *w;
+jk_worker_t   *w;
 /* Shared memory worker data */
-jk_shm_worker_t  *s;
+jk_shm_ajp13_worker_t *s;
 /* Current route. Can be name or domain */
-const char   *r;
+const char*r;
 };
 typedef struct worker_record worker_record_t;
 
@@ -152,7 +152,7 @@
 JK_CRIT_SEC cs;
 
 /* Shared memory worker data */
-jk_shm_worker_t  *s;
+jk_shm_lb_worker_t *s;
 };
 typedef struct lb_worker lb_worker_t;
 

Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.c?rev=609404&r1=609403&r2=609404&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Sun Jan  6 13:14:08 2008
@@ -27,6 +27,7 @@
 #include "jk_util.h"
 #include "jk_mt.h"
 #include "jk_lb_worker.h"
+#include "jk_ajp13_worker.h"
 #include "jk_shm.h"
 
 /** jk shm header core data structure */
@@ -59,7 +60,8 @@
 struct jk_shm
 {
 size_t size;
-unsigned   workers;
+unsigned   ajp13_workers;
+unsigned   lb_workers;
 char   *filename;
 char   *lockname;
 intfd;
@@ -72,7 +74,7 @@
 typedef struct jk_shm jk_shm_t;
 
 static const char shm_signature[] = { JK_SHM_MAGIC };
-static jk_shm_t jk_shmem = { 0, 0, NULL, NULL, -1, -1, 0, NULL};
+static jk_shm_t jk_shmem = { 0, 0, 0, NULL, NULL, -1, -1, 0, NULL};
 static time_t jk_workers_modified_time = 0;
 static time_t jk_workers_access_time = 0;
 #if defined (WIN32)
@@ -85,7 +87,8 @@
 char **worker_list;
 unsigned i;
 unsigned num_of_workers;
-int num_of_shm_workers = 0;
+int num_of_lb_workers = 0;
+int num_of_ajp13_workers = 0;
 
 JK_TRACE_ENTER(l);
 
@@ -103,7 +106,7 @@
 if (!strcmp(type, JK_LB_WORKER_NAME)) {
 char **member_list;
 unsigned num_of_members;
-num_of_shm_workers++;
+num_of_lb_workers++;
 if (jk_get_lb_worker_list(init_data, worker_list[i],
   &member_list, &num_of_members) == 
JK_FALSE) {
 jk_log(l, JK_LOG_ERROR,
@@ -113,15 +116,17 @@
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG, "worker %s of type %s has %u 
members",
worker_list[i], JK_LB_WORKER_NAME, num_of_members);
-num_of_shm_workers += num_of_members;
+num_of_ajp13_workers += num_of_members;
 

svn commit: r609406 - in /tomcat: connectors/trunk/util/java/org/apache/tomcat/util/http/ container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/ container/tc5.5.x/webapps/docs/ current/tc

[markt]

Author: markt
Date: Sun Jan  6 13:23:24 2008
New Revision: 609406

URL: http://svn.apache.org/viewvc?rev=609406&view=rev
Log:
Port Cookie parsing changes from TC6. I believe this patch is complete but will 
be double checking it after the commit.

Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/Cookies.java

tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/Cookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/Cookies.java?rev=609406&r1=609405&r2=609406&view=diff
==
--- tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/Cookies.java 
(original)
+++ tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/Cookies.java 
Sun Jan  6 13:23:24 2008
@@ -45,6 +45,27 @@
 boolean unprocessed=true;
 
 MimeHeaders headers;
+
+/*
+List of Separator Characters (see isSeparator())
+Excluding the '/' char violates the RFC, but 
+it looks like a lot of people put '/'
+in unquoted values: '/': ; //47 
+'\t':9 ' ':32 '\"':34 '\'':39 '(':40 ')':41 ',':44 ':':58 ';':59 '<':60 
+'=':61 '>':62 '?':63 '@':64 '[':91 '\\':92 ']':93 '{':123 '}':125
+*/
+public static final char SEPARATORS[] = { '\t', ' ', '\"', '\'', '(', ')', 
',', 
+':', ';', '<', '=', '>', '?', '@', '[', '\\', ']', '{', '}' };
+
+protected static final boolean separators[] = new boolean[128];
+static {
+for (int i = 0; i < 128; i++) {
+separators[i] = false;
+}
+for (int i = 0; i < SEPARATORS.length; i++) {
+separators[SEPARATORS[i]] = true;
+}
+}
 
 /**
  *  Construct a new cookie collection, that will extract
@@ -182,182 +203,6 @@
 }
 }
 
-/** Process a byte[] header - allowing fast processing of the
- *  raw data
- */
-void processCookieHeader(  byte bytes[], int off, int len )
-{
-if( len<=0 || bytes==null ) return;
-int end=off+len;
-int pos=off;
-
-int version=0; //sticky
-ServerCookie sc=null;
-
-
-while( pos=end )
-return; // only spaces
-int startName=pos;
-if( dbg>0 ) log( "SN: " + pos );
-
-// Version should be the first token
-boolean isSpecial=false;
-if(bytes[pos]=='$') { pos++; isSpecial=true; }
-
-pos= findDelim1( bytes, startName, end); // " =;,"
-int endName=pos;
-// current = "=" or " " or DELIM
-pos= skipSpaces( bytes, endName, end ); 
-if( dbg>0 ) log( "DELIM: " + endName + " " + (char)bytes[pos]);
-
-if(pos >= end ) {
-// it's a name-only cookie ( valid in RFC2109 )
-if( ! isSpecial ) {
-sc=addCookie();
-sc.getName().setBytes( bytes, startName,
-   endName-startName );
-sc.getValue().setString("");
-sc.setVersion( version );
-if( dbg>0 ) log( "Name only, end: " + startName + " " +
- endName);
-}
-return;
-}
-
-cc=bytes[pos];
-pos++;
-if( cc==';' || cc==',' || pos>=end ) {
-if( ! isSpecial && startName!= endName ) {
-sc=addCookie();
-sc.getName().setBytes( bytes, startName,
-   endName-startName );
-sc.getValue().setString("");
-sc.setVersion( version );
-if( dbg>0 ) log( "Name only: " + startName + " " + 
endName);
-}
-continue;
-}
-
-// we should have "=" ( tested all other alternatives )
-int startValue=skipSpaces( bytes, pos, end);
-int endValue=startValue;
-
-cc=bytes[pos];
-if(  cc=='"' ) {
-endValue=findDelim3( bytes, startValue+1, end, cc );
-if (endValue == -1) {
-endValue = findDelim2(bytes, startValue+1, end);
-} else startValue++;
-pos=endValue+1; // to skip to next cookie
- } else {
-endValue=findDelim2( bytes, startValue, end );
-pos=endValue+1;
-}
-
-// if not $Version, etc

svn commit: r609409 - in /tomcat: connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt jasper/tc5.5.x/src/sh

[markt]

Author: markt
Date: Sun Jan  6 13:31:23 2008
New Revision: 609409

URL: http://svn.apache.org/viewvc?rev=609409&view=rev
Log:
Fix bug 43657. Possible class loader leak.

Modified:

tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/xmlparser/ParserUtils.java

Modified: 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java?rev=609409&r1=609408&r2=609409&view=diff
==
--- 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java 
(original)
+++ 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/ServerCookie.java 
Sun Jan  6 13:31:23 2008
@@ -37,10 +37,6 @@
  */
 public class ServerCookie implements Serializable {
 
-
-private static org.apache.commons.logging.Log log =
-org.apache.commons.logging.LogFactory.getLog(ServerCookie.class);
-
 // Version 0 (Netscape) attributes
 private MessageBytes name=MessageBytes.newInstance();
 private MessageBytes value=MessageBytes.newInstance();
@@ -123,11 +119,6 @@
 
 
 //  utils 
-
-public static void log(String s ) {
-if (log.isDebugEnabled())
-log.debug("ServerCookie: " + s);
-}
 
 public String toString() {
 return "Cookie " + getName() + "=" + getValue() + " ; "

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609409&r1=609408&r2=609409&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 13:31:23 2008
@@ -62,9 +62,13 @@
 
   
 o.a.juli.ClassLoaderLogManager handle more then one system property 
replacement at file logging.properties. (pero)
-   
+  
   
-43687 Remove conditional headers on Form Auth replay, since 
the UA (esp. FireFox) isn't expecting it. (billbarker)
+43675: Fix a possible logging related class loader leak.
+(markt)
+  
+  
+43687: Remove conditional headers on Form Auth replay, 
since the UA (esp. FireFox) isn't expecting it. (billbarker)
   
   
 Fix bug in CGI Servlet that caused it to fail when a CGI resource was

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609409&r1=609408&r2=609409&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 13:31:23 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43675 Possible logging
-  releated class loader leak
-  http://svn.apache.org/viewvc?rev=594700&view=rev
-  +1: markt, pero, fhanik
-  -1:
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43887
   Include exception in log message
   http://svn.apache.org/viewvc?rev=597738&view=rev

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/xmlparser/ParserUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/xmlparser/ParserUtils.java?rev=609409&r1=609408&r2=609409&view=diff
==
--- 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/xmlparser/ParserUtils.java 
(original)
+++ 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/xmlparser/ParserUtils.java 
Sun Jan  6 13:31:23 2008
@@ -191,9 +191,6 @@
 
 class MyEntityResolver implements EntityResolver {
 
-// Logger
-private Log log = LogFactory.getLog(MyEntityResolver.class);
-
 public InputSource resolveEntity(String publicId, String systemId)
 throws SAXException {
 for (int i = 0; i < Constants.CACHED_DTD_PUBLIC_IDS.length; i++) {
@@ -210,6 +207,7 @@
 return isrc;
 }
 }
+Log log = LogFactory.getLog(MyEntityResolver.class);
 if (log.isDebugEnabled())
 log.debug("Resolve entity failed" + publicId + " " + systemId);
 log.error(Localizer.getMessage("jsp.error.parse.xml.invalidPublicId",
@@ -220,10 +218,8 @@
 
 class MyErrorHandler implements ErrorHandler {
 
-// Logger
-private Log log = LogFactory.getLog(MyErrorHandler.class);
-
 public void warning(SAXParseException ex) throws SAXException {
+Log log = LogFactory.getLog(MyErrorHandler.class);
 

svn commit: r609411 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardWrapper.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 13:34:21 2008
New Revision: 609411

URL: http://svn.apache.org/viewvc?rev=609411&view=rev
Log:
Fix 43887. Include exception in the log message.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardWrapper.java?rev=609411&r1=609410&r2=609411&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
 Sun Jan  6 13:34:21 2008
@@ -1748,7 +1748,7 @@
 broadcaster.sendNotification(notification);
 }
 } catch( Exception ex ) {
-log.info("Error registering servlet with jmx " + this);
+log.info("Error registering servlet with jmx " + this, ex);
 }
 
 if (isJspServlet) {
@@ -1763,7 +1763,7 @@
 .registerComponent(instance, jspMonitorON, null);
 } catch( Exception ex ) {
 log.info("Error registering JSP monitoring with jmx " +
- instance);
+ instance, ex);
 }
 }
 }

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609411&r1=609410&r2=609411&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 13:34:21 2008
@@ -86,6 +86,9 @@
 c) Escape character '\\' is allowed and respected as a escape 
character,
 and will be unescaped during parsing.
   
+  
+43887: Include exception in the log message. (markt)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609411&r1=609410&r2=609411&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 13:34:21 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43887
-  Include exception in log message
-  http://svn.apache.org/viewvc?rev=597738&view=rev
-  +1: markt, pero, fhanik
-  -1:
-
 * Fix license issues
   Replace:
   
http://svn.apache.org/repos/asf/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd



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

svn commit: r609412 - in /tomcat/servletapi/servlet2.4-jsp2.0-tc5.x: jsr152/src/share/dtd/jsp_2_0.xsd jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd jsr154/src/share/dtd/j2ee_web_services_1_1.xsd jsr1

[markt]

Author: markt
Date: Sun Jan  6 13:38:17 2008
New Revision: 609412

URL: http://svn.apache.org/viewvc?rev=609412&view=rev
Log:
Port license fixes from TC6. See the change log for the TC6 files for details 
on provenance.

Modified:
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd

tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd

tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_1_1.xsd

tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/share/dtd/j2ee_web_services_client_1_1.xsd

Modified: 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd
URL: 
http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd?rev=609412&r1=609411&r2=609412&view=diff
==
--- tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd 
(original)
+++ tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd 
Sun Jan  6 13:38:17 2008
@@ -31,41 +31,6 @@
   
 
 
-  Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-  Road, Palo Alto, California 94303, U.S.A. All rights
-  reserved.
-
-  Sun Microsystems, Inc. has intellectual property rights
-  relating to technology described in this document. In
-  particular, and without limitation, these intellectual
-  property rights may include one or more of the U.S. patents
-  listed at http://www.sun.com/patents and one or more
-  additional patents or pending patent applications in the
-  U.S. and other countries.
-
-  This document and the technology which it describes are
-  distributed under licenses restricting their use, copying,
-  distribution, and decompilation. No part of this document
-  may be reproduced in any form by any means without prior
-  written authorization of Sun and its licensors, if any.
-
-  Third-party software, including font technology, is
-  copyrighted and licensed from Sun suppliers.
-
-  Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-  JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-  Cup logo are trademarks or registered trademarks of Sun
-  Microsystems, Inc. in the U.S. and other countries.
-
-  Federal Acquisitions: Commercial Software - Government Users
-  Subject to Standard License Terms and Conditions.
-
-
-  
-
-  
-
-
   This is the XML Schema for the JSP 2.0 deployment descriptor
   types.  The JSP 2.0 schema contains all the special
   structures and datatypes that are necessary to use JSP files

Modified: 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
URL: 
http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd?rev=609412&r1=609411&r2=609412&view=diff
==
--- 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
 (original)
+++ 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
 Sun Jan  6 13:38:17 2008
@@ -19,6 +19,7 @@
  targetNamespace="http://java.sun.com/xml/ns/j2ee";
  xmlns:j2ee="http://java.sun.com/xml/ns/j2ee";
  xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:xml="http://www.w3.org/XML/1998/namespace";
  elementFormDefault="qualified"
  attributeFormDefault="unqualified"
  version="2.0">
@@ -28,42 +29,6 @@
   %W% %G%
 
   
-
-  
-
-
-  Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-  Road, Palo Alto, California 94303, U.S.A. All rights
-  reserved.
-
-  Sun Microsystems, Inc. has intellectual property rights
-  relating to technology described in this document. In
-  particular, and without limitation, these intellectual
-  property rights may include one or more of the U.S. patents
-  listed at http://www.sun.com/patents and one or more
-  additional patents or pending patent applications in the
-  U.S. and other countries.
-
-  This document and the technology which it describes are
-  distributed under licenses restricting their use, copying,
-  distribution, and decompilation. No part of this document
-  may be reproduced in any form by any means without prior
-  written authorization of Sun and its licensors, if any.
-
-  Third-party software, including font technology, is
-  copyrighted and licensed from Sun suppliers.
-
-  Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-  JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-  Cup logo are trademarks or registered trademarks of Sun
-  Microsystems, Inc. in the U.S. and other countries.
-
-  Federal Acquisitions: Commercial Software - Governme

svn commit: r609413 - /tomcat/current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 13:38:43 2008
New Revision: 609413

URL: http://svn.apache.org/viewvc?rev=609413&view=rev
Log:
Update status

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609413&r1=609412&r2=609413&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 13:38:43 2008
@@ -47,18 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix license issues
-  Replace:
-  
http://svn.apache.org/repos/asf/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/jsp_2_0.xsd
-  
http://svn.apache.org/repos/asf/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
-  with:  
-  
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd
-  
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd
-  and port the following:
-  http://svn.apache.org/viewvc?rev=598412&view=rev
-  +1: markt, pero, fhanik
-  -1:
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43957
   Service.bat doesn't configure logging correctly
   http://svn.apache.org/viewvc?rev=598800&view=rev



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

svn commit: r609414 - in /tomcat: container/tc5.5.x/catalina/src/bin/service.bat container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 13:42:23 2008
New Revision: 609414

URL: http://svn.apache.org/viewvc?rev=609414&view=rev
Log:
Fix bug 43957. Service.bat doesn't configure logging correctly. Patch provided 
by  Richard Fearn.

Modified:
tomcat/container/tc5.5.x/catalina/src/bin/service.bat
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/container/tc5.5.x/catalina/src/bin/service.bat
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/service.bat?rev=609414&r1=609413&r2=609414&view=diff
==
--- tomcat/container/tc5.5.x/catalina/src/bin/service.bat (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/service.bat Sun Jan  6 13:42:23 
2008
@@ -110,7 +110,7 @@
 set PR_LOGPATH=%CATALINA_BASE%\logs
 set PR_STDOUTPUT=auto
 set PR_STDERROR=auto
-"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions 
"-Djava.io.tmpdir=%CATALINA_BASE%\temp" --JvmMs 128 --JvmMx 256
+"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions 
"-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
 --JvmMs 128 --JvmMx 256
 echo The service '%SERVICE_NAME%' has been installed.
 
 :end

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609414&r1=609413&r2=609414&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 13:42:23 2008
@@ -89,6 +89,10 @@
   
 43887: Include exception in the log message. (markt)
   
+  
+43957: Service.bat didn't configure logging correctly.
+Patch provided by Richard Fearn. (markt)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609414&r1=609413&r2=609414&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 13:42:23 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43957
-  Service.bat doesn't configure logging correctly
-  http://svn.apache.org/viewvc?rev=598800&view=rev
-  +1: markt, pero, rjung
-  -1: 
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43757
   Use SMAP info rather than string matching to ID line number in JSP
   http://svn.apache.org/viewvc?rev=599605&view=rev



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

svn commit: r609417 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ErrorDispatcher.java

[markt]

Author: markt
Date: Sun Jan  6 13:46:34 2008
New Revision: 609417

URL: http://svn.apache.org/viewvc?rev=609417&view=rev
Log:
Fix bug 43757. More accurate code extracts in jasper error messages.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ErrorDispatcher.java

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609417&r1=609416&r2=609417&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 13:46:34 2008
@@ -101,6 +101,11 @@
 43702: Reduce length of unnecessarily long class names for
 the inner helper class when using simple tags. (markt)
   
+  
+43757: Rather than use string matching to work out the line
+in the JSP with the error, use the SMAP info and the knowledge that for
+a scriptlet there is a one to one line mapping. (markt)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609417&r1=609416&r2=609417&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 13:46:34 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43757
-  Use SMAP info rather than string matching to ID line number in JSP
-  http://svn.apache.org/viewvc?rev=599605&view=rev
-  +1: markt, pero, fhanik
-  -1:
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43995
   Backport fix from TC6. Also fix memory leak
   
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?view=diff&r1=583649&r2=583650&pathrev=583650

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ErrorDispatcher.java?rev=609417&r1=609416&r2=609417&view=diff
==
--- 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ErrorDispatcher.java 
(original)
+++ 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ErrorDispatcher.java 
Sun Jan  6 13:46:34 2008
@@ -526,13 +526,26 @@
 page.visit(errVisitor);
 Node errNode = errVisitor.getJspSourceNode();
 if ((errNode != null) && (errNode.getStart() != null)) {
-javacError = new JavacErrorDetail(
-fname,
-lineNum,
-errNode.getStart().getFile(),
-errNode.getStart().getLineNumber(),
-errMsgBuf,
-ctxt);
+// If this is a scriplet node then there is a one to one mapping
+// between JSP lines and Java lines
+if (errVisitor.getJspSourceNode() instanceof Node.Scriptlet) {
+javacError = new JavacErrorDetail(
+fname,
+lineNum,
+errNode.getStart().getFile(),
+errNode.getStart().getLineNumber() + lineNum -
+errVisitor.getJspSourceNode().getBeginJavaLine(),
+errMsgBuf,
+ctxt);
+} else {
+javacError = new JavacErrorDetail(
+fname,
+lineNum,
+errNode.getStart().getFile(),
+errNode.getStart().getLineNumber(),
+errMsgBuf,
+ctxt);
+}
 } else {
 /*
  * javac error line number cannot be mapped to JSP page



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

svn commit: r609420 - in /tomcat: connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 13:56:24 2008
New Revision: 609420

URL: http://svn.apache.org/viewvc?rev=609420&view=rev
Log:
Fix bug 43995 (no timeout) and port fix for 43479 (mem leak).

Modified:

tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=609420&r1=609419&r2=609420&view=diff
==
--- 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java 
(original)
+++ 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java 
Sun Jan  6 13:56:24 2008
@@ -1460,7 +1460,7 @@
 if (rv == Status.APR_SUCCESS) {
 sendfileCount--;
 }
-sendfileData.remove(data);
+sendfileData.remove(new Long(data.socket));
 }
 
 /**
@@ -1469,6 +1469,7 @@
  */
 public void run() {
 
+long maintainTime = 0;
 // Loop until we receive a shutdown command
 while (running) {
 
@@ -1482,6 +1483,8 @@
 }
 
 while (sendfileCount < 1 && addS.size() < 1) {
+// Reset maintain time.
+maintainTime = 0;
 try {
 synchronized (this) {
 this.wait();
@@ -1510,6 +1513,8 @@
 addS.clear();
 }
 }
+
+maintainTime += pollTime;
 // Pool for the specified interval
 int rv = Poll.poll(sendfilePollset, pollTime, desc, false);
 if (rv > 0) {
@@ -1573,7 +1578,23 @@
 continue;
 }
 }
-/* TODO: See if we need to call the maintain for sendfile 
poller */
+// Call maintain for the sendfile poller
+if (soTimeout > 0 && maintainTime > 100L && running) {
+rv = Poll.maintain(sendfilePollset, desc, true);
+maintainTime = 0;
+if (rv > 0) {
+for (int n = 0; n < rv; n++) {
+// Get the sendfile state
+SendfileData state =
+(SendfileData) sendfileData.get(new 
Long(desc[n]));
+// Close socket and clear pool
+remove(state);
+// Destroy file descriptor pool, which should 
close the file
+// Close the socket, as the response would be 
incomplete
+Socket.destroy(state.socket);
+}
+}
+}
 } catch (Throwable t) {
 log.error(sm.getString("endpoint.poll.error"), t);
 }

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609420&r1=609419&r2=609420&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 13:56:24 2008
@@ -126,6 +126,18 @@
   
 
   
+  
+
+  
+43479: Fix memory leak cleaning up sendfile connections.
+(markt)
+  
+  
+43995: No timeout for sendfile (TODO item had been
+forgotten). (markt)
+  
+
+  
 
  
 

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609420&r1=609419&r2=609420&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 13:56:24 2008
@@ -47,13 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43995
-  Backport fix from TC6. Also fix memory leak
-  
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?view=diff&r1=583649&r2=583650&pathrev=583650
-  +1: markt, pero, fhanik
-  -1:
-
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43622
   Don't always overwrite min compression size with default
   http://svn.apache.org/viewvc?rev=599914&view=rev



-
To unsu

svn commit: r609423 - in /tomcat: connectors/trunk/http11/src/java/org/apache/coyote/http11/ container/tc5.5.x/webapps/docs/ current/tc5.5.x/

[markt]

Author: markt
Date: Sun Jan  6 14:02:55 2008
New Revision: 609423

URL: http://svn.apache.org/viewvc?rev=609423&view=rev
Log:
Fix bug 43622. Don't always overwrite min compression size with default.

Modified:

tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java

tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=609423&r1=609422&r2=609423&view=diff
==
--- 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
 (original)
+++ 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
 Sun Jan  6 14:02:55 2008
@@ -608,8 +608,8 @@
 
processor.setMaxKeepAliveRequests(proto.maxKeepAliveRequests);
 processor.setTimeout(proto.timeout);
 
processor.setDisableUploadTimeout(proto.disableUploadTimeout);
-processor.setCompression(proto.compression);
 processor.setCompressionMinSize(proto.compressionMinSize);
+processor.setCompression(proto.compression);
 
processor.setNoCompressionUserAgents(proto.noCompressionUserAgents);
 
processor.setCompressableMimeTypes(proto.compressableMimeTypes);
 
processor.setRestrictedUserAgents(proto.restrictedUserAgents);

Modified: 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java?rev=609423&r1=609422&r2=609423&view=diff
==
--- 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java
 (original)
+++ 
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java
 Sun Jan  6 14:02:55 2008
@@ -623,8 +623,8 @@
 processor.setMaxKeepAliveRequests( proto.maxKeepAliveRequests );
 processor.setTimeout( proto.timeout );
 processor.setDisableUploadTimeout( proto.disableUploadTimeout );
-processor.setCompression( proto.compression );
 processor.setCompressionMinSize( proto.compressionMinSize);
+processor.setCompression( proto.compression );
 processor.setNoCompressionUserAgents( 
proto.noCompressionUserAgents);
 processor.setCompressableMimeTypes( proto.compressableMimeTypes);
 processor.setRestrictedUserAgents( proto.restrictedUserAgents);

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609423&r1=609422&r2=609423&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 14:02:55 2008
@@ -133,6 +133,10 @@
 (markt)
   
   
+43622: Don't always overwrite min compression size with
+default. (markt)
+  
+  
 43995: No timeout for sendfile (TODO item had been
 forgotten). (markt)
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609423&r1=609422&r2=609423&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 14:02:55 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43622
-  Don't always overwrite min compression size with default
-  http://svn.apache.org/viewvc?rev=599914&view=rev
-  +1: markt, pero, fhanik
-  -1:
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43611
   Provide an error message when trying to upload a war if the context is 
defined
   in server.xml



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

svn commit: r609430 - in /tomcat: container/tc5.5.x/webapps/docs/ container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ current/tc5.5.x/

[markt]

Author: markt
Date: Sun Jan  6 14:08:30 2008
New Revision: 609430

URL: http://svn.apache.org/viewvc?rev=609430&view=rev
Log:
Fix bug 43611. Provide an error message rather than failing silently when 
uploading a WAR for a context already defined in server.xml

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java

tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609430&r1=609429&r2=609430&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 14:08:30 2008
@@ -124,6 +124,10 @@
 Fix CVE-2007-5461, an important information disclosure vulnerability in
 the WebDAV Servlet. (markt)
   
+  
+43611: Provide an error message when trying to upload a WAR
+for a context that has been defined in server.xml. (markt)
+  
 
   
   

Modified: 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java?rev=609430&r1=609429&r2=609430&view=diff
==
--- 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
 (original)
+++ 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
 Sun Jan  6 14:08:30 2008
@@ -204,7 +204,11 @@
 } else {
 path = "/" + basename;
 }
-
+if ((host.findChild(path) != null) && !isDeployed(path)) {
+message = sm.getString
+("htmlManagerServlet.deployUploadInServerXml", war);
+break;
+}
 if (!isServiced(path)) {
 addServiced(path);
 try {

Modified: 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties?rev=609430&r1=609429&r2=609430&view=diff
==
--- 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties
 (original)
+++ 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties
 Sun Jan  6 14:08:30 2008
@@ -36,6 +36,7 @@
 htmlManagerServlet.deployUploadFail=FAIL - Deploy Upload Failed, Exception: {0}
 htmlManagerServlet.deployUploadFile=Select WAR file to upload
 htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded \"{0}\" must be a 
.war
+htmlManagerServlet.deployUploadInServerXml=FAIL - War file \"{0}\" cannot be 
uploaded if context is defined in server.xml 
 htmlManagerServlet.deployUploadNoFile=FAIL - File upload failed, no file
 htmlManagerServlet.deployUploadWarExists=FAIL - War file \"{0}\" already 
exists on server
 htmlManagerServlet.deployWar=WAR or Directory URL:

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609430&r1=609429&r2=609430&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 14:08:30 2008
@@ -47,13 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43611
-  Provide an error message when trying to upload a war if the context is 
defined
-  in server.xml
-  http://svn.apache.org/viewvc?rev=600177&view=rev
-  +1: markt, pero, fhanik
-  -1:
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43594
   Use CATALINA_BASE (if set) for setenv
   http://svn.apache.org/viewvc?rev=600185&view=rev



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

svn commit: r609438 - in /tomcat: build/tc5.5.x/RUNNING.txt container/tc5.5.x/catalina/src/bin/catalina.bat container/tc5.5.x/catalina/src/bin/catalina.sh container/tc5.5.x/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sun Jan  6 14:14:28 2008
New Revision: 609438

URL: http://svn.apache.org/viewvc?rev=609438&view=rev
Log:
Fix bug 43594. Use setenv from CATALINA_BASE (if set) in preference to the one 
in CATALINA_HOME. Patch provided by Shaddy Baddah.

Modified:
tomcat/build/tc5.5.x/RUNNING.txt
tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat
tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/build/tc5.5.x/RUNNING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/RUNNING.txt?rev=609438&r1=609437&r2=609438&view=diff
==
--- tomcat/build/tc5.5.x/RUNNING.txt (original)
+++ tomcat/build/tc5.5.x/RUNNING.txt Sun Jan  6 14:14:28 2008
@@ -128,6 +128,8 @@
 calculate all relative references for files in the following directories based
 on the value of $CATALINA_BASE instead of $CATALINA_HOME:
 
+* bin  - Only setenv.sh (*nix) and setenv.bat (windows)
+
 * conf - Server configuration files (including server.xml)
 
 * logs - Log and output files

Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat?rev=609438&r1=609437&r2=609438&view=diff
==
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat Sun Jan  6 14:14:28 
2008
@@ -68,7 +68,12 @@
 :okHome
 
 rem Get standard environment variables
+if "%CATALINA_BASE%" == "" goto gotSetenvHome
+if exist "%CATALINA_BASE%\bin\setenv.bat" call "%CATALINA_BASE%\bin\setenv.bat"
+goto gotSetenvBase
+:gotSetenvHome
 if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat"
+:gotSetenvBase
 
 rem Get standard Java environment variables
 if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath

Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=609438&r1=609437&r2=609438&view=diff
==
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Sun Jan  6 14:14:28 
2008
@@ -83,7 +83,9 @@
 # Only set CATALINA_HOME if not already set
 [ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
 
-if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
+if [ -r "$CATALINA_BASE"/bin/setenv.sh ]; then
+  . "$CATALINA_BASE"/bin/setenv.sh
+elif [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
   . "$CATALINA_HOME"/bin/setenv.sh
 fi
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609438&r1=609437&r2=609438&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 14:14:28 2008
@@ -37,6 +37,10 @@
   
 Use Eclipse JDT 3.3.1. (pero)
   
+  
+43594: Use setenv from CATALINA_BASE (if set) in preference
+to the one in CATALINA_HOME. Patch provided by Shaddy Baddah. (markt)
+  
 
 
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609438&r1=609437&r2=609438&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 14:14:28 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43594
-  Use CATALINA_BASE (if set) for setenv
-  http://svn.apache.org/viewvc?rev=600185&view=rev
-  +1: markt, pero, rjung
-  -1:
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44041
   http://svn.apache.org/viewvc?rev=603340&view=rev
   +1: markt, pero, rjung



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

svn commit: r609439 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 14:18:38 2008
New Revision: 609439

URL: http://svn.apache.org/viewvc?rev=609439&view=rev
Log:
Fix bug 44041 - duplicate class definition error.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=609439&r1=609438&r2=609439&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
 Sun Jan  6 14:18:38 2008
@@ -108,7 +108,6 @@
 extends URLClassLoader
 implements Reloader, Lifecycle
  {
-
 protected static org.apache.commons.logging.Log log=
 org.apache.commons.logging.LogFactory.getLog( WebappClassLoader.class 
);
 
@@ -887,7 +886,9 @@
 }
 if ((clazz == null) && hasExternalRepositories) {
 try {
-clazz = super.findClass(name);
+synchronized (this) {
+clazz = super.findClass(name);
+}
 } catch(AccessControlException ace) {
 throw new ClassNotFoundException(name, ace);
 } catch (RuntimeException e) {

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609439&r1=609438&r2=609439&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 14:18:38 2008
@@ -97,6 +97,10 @@
 43957: Service.bat didn't configure logging correctly.
 Patch provided by Richard Fearn. (markt)
   
+  
+44041: Fix duplicate class definition error under load.
+(markt)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609439&r1=609438&r2=609439&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 14:18:38 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44041
-  http://svn.apache.org/viewvc?rev=603340&view=rev
-  +1: markt, pero, rjung
-  -1:
-  rjung: 603340 needs 603074 to.
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44094
   Add note about side-effects of setting privileged on a context
   http://svn.apache.org/viewvc?rev=605339&view=rev



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

svn commit: r609440 - /tomcat/connectors/trunk/.classpath

[markt]

Author: markt
Date: Sun Jan  6 14:20:15 2008
New Revision: 609440

URL: http://svn.apache.org/viewvc?rev=609440&view=rev
Log:
Exclude some more Tomcat 3/4 code from the Eclipse class path.

Modified:
tomcat/connectors/trunk/.classpath

Modified: tomcat/connectors/trunk/.classpath
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/.classpath?rev=609440&r1=609439&r2=609440&view=diff
==
--- tomcat/connectors/trunk/.classpath (original)
+++ tomcat/connectors/trunk/.classpath Sun Jan  6 14:20:15 2008
@@ -17,6 +17,7 @@
 -->
 

+   






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

svn commit: r609443 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml container/tc5.5.x/webapps/docs/config/context.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 14:22:35 2008
New Revision: 609443

URL: http://svn.apache.org/viewvc?rev=609443&view=rev
Log:
Fix bug 44094. Add note to docs about use of privileged flag and consequent 
changes in parent class loader.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/docs/config/context.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609443&r1=609442&r2=609443&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 14:22:35 2008
@@ -136,6 +136,10 @@
 43611: Provide an error message when trying to upload a WAR
 for a context that has been defined in server.xml. (markt)
   
+  
+44094: Add note to docs about side-effects of setting
+privileged on a context. (markt)
+  
 
   
   

Modified: tomcat/container/tc5.5.x/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/context.xml?rev=609443&r1=609442&r2=609443&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/config/context.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/context.xml Sun Jan  6 
14:22:35 2008
@@ -186,7 +186,10 @@
 
   
 Set to true to allow this context to use container
-servlets, like the manager servlet.
+servlets, like the manager servlet. Use of the privileged
+attribute will change the context's parent class loader to be the
+Catalina class loader rather than the Shared class
+loader.
   
 
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609443&r1=609442&r2=609443&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 14:22:35 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44094
-  Add note about side-effects of setting privileged on a context
-  http://svn.apache.org/viewvc?rev=605339&view=rev
-  +1: markt, pero, rjung
-  -1: 
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43241
   ServletContext.getResourceAsStream() not spec compliant
   http://svn.apache.org/viewvc?rev=605356&view=rev



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

svn commit: r609447 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 14:28:12 2008
New Revision: 609447

URL: http://svn.apache.org/viewvc?rev=609447&view=rev
Log:
Fix bug 43241. ervletContext.getResourceAsStream() not spec compliant. Patch 
provided by John Kew.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java?rev=609447&r1=609446&r2=609447&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
 Sun Jan  6 14:28:12 2008
@@ -523,7 +523,7 @@
 public InputStream getResourceAsStream(String path) {
 
 path = normalize(path);
-if (path == null)
+if (path == null || !path.startsWith("/"))
 return (null);
 
 DirContext resources = context.getResources();
@@ -884,7 +884,7 @@
 
 String normalized = path;
 
-// Normalize the slashes and add leading slash if necessary
+// Normalize the slashes
 if (normalized.indexOf('\\') >= 0)
 normalized = normalized.replace('\\', '/');
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609447&r1=609446&r2=609447&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 14:28:12 2008
@@ -68,6 +68,10 @@
 o.a.juli.ClassLoaderLogManager handle more then one system property 
replacement at file logging.properties. (pero)
   
   
+43241: ServletContext.getResourceAsStream() not spec
+compliant. Patch provided by John Kew. (markt)
+  
+  
 43675: Fix a possible logging related class loader leak.
 (markt)
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609447&r1=609446&r2=609447&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 14:28:12 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43241
-  ServletContext.getResourceAsStream() not spec compliant
-  http://svn.apache.org/viewvc?rev=605356&view=rev
-  +1: markt, pero, fhanik
-  -1: 
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43236
   Reset usingWriter and associated flags when response is reset
   http://svn.apache.org/viewvc?rev=605364&view=rev



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

svn commit: r609449 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 14:31:10 2008
New Revision: 609449

URL: http://svn.apache.org/viewvc?rev=609449&view=rev
Log:
Fix bug 43236. Reset usingWriter and associated flags when response is reset.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java?rev=609449&r1=609448&r2=609449&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Response.java
 Sun Jan  6 14:31:10 2008
@@ -652,6 +652,9 @@
 
 coyoteResponse.reset();
 outputBuffer.reset();
+usingOutputStream = false;
+usingWriter = false;
+isCharacterEncodingSet = false;
 }
 
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609449&r1=609448&r2=609449&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 14:31:10 2008
@@ -68,6 +68,10 @@
 o.a.juli.ClassLoaderLogManager handle more then one system property 
replacement at file logging.properties. (pero)
   
   
+43236: Reset usingWriter and associated flags when response
+is reset. (markt)
+  
+  
 43241: ServletContext.getResourceAsStream() not spec
 compliant. Patch provided by John Kew. (markt)
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609449&r1=609448&r2=609449&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 14:31:10 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43236
-  Reset usingWriter and associated flags when response is reset
-  http://svn.apache.org/viewvc?rev=605364&view=rev
-  +1: markt, pero, fhanik
-  -1: 
-
 * Fix CVE-2007-5342
   JULI permissions need to be restricted
   http://svn.apache.org/viewvc?rev=606594&view=rev



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

svn commit: r609451 - in /tomcat/container/tc5.5.x: catalina/src/conf/catalina.policy webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sun Jan  6 14:38:14 2008
New Revision: 609451

URL: http://svn.apache.org/viewvc?rev=609451&view=rev
Log:
Fix CVE-2007-5342 by limiting permissions granted to JULI.

Modified:
tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy?rev=609451&r1=609450&r2=609451&view=diff
==
--- tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy (original)
+++ tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy Sun Jan  6 
14:38:14 2008
@@ -82,7 +82,19 @@
 
 // These permissions apply to JULI
 grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
-permission java.security.AllPermission;
+permission java.util.PropertyPermission 
"java.util.logging.config.class", "read";
+permission java.util.PropertyPermission 
"java.util.logging.config.file", "read";
+permission java.lang.RuntimePermission "shutdownHooks";
+permission java.io.FilePermission 
"${catalina.base}${file.separator}conf${file.separator}logging.properties", 
"read";
+permission java.util.PropertyPermission "catalina.base", "read";
+permission java.util.logging.LoggingPermission "control";
+permission java.io.FilePermission 
"${catalina.base}${file.separator}logs", "read, write";
+permission java.io.FilePermission 
"${catalina.base}${file.separator}logs${file.separator}*", "read, write";
+permission java.lang.RuntimePermission "getClassLoader";
+// To enable per context logging configuration, permit read access to 
the appropriate file.
+// Be sure that the logging configuration is secure before enabling 
such access
+// eg for the examples web application:
+// permission java.io.FilePermission 
"${catalina.base}${file.separator}webapps${file.separator}examples${file.separator}WEB-INF${file.separator}classes${file.separator}logging.properties",
 "read";
 };
 
 // These permissions apply to the servlet API classes

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609451&r1=609450&r2=609451&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 14:38:14 2008
@@ -41,6 +41,9 @@
 43594: Use setenv from CATALINA_BASE (if set) in preference
 to the one in CATALINA_HOME. Patch provided by Shaddy Baddah. (markt)
   
+  
+Fix CVE-2007-5342 by limiting permissions granted to JULI. (markt)
+  
 
 
   



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

svn commit: r609452 - /tomcat/current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 14:38:33 2008
New Revision: 609452

URL: http://svn.apache.org/viewvc?rev=609452&view=rev
Log:
Update status

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609452&r1=609451&r2=609452&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 14:38:33 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix CVE-2007-5342
-  JULI permissions need to be restricted
-  http://svn.apache.org/viewvc?rev=606594&view=rev
-  +1: markt, pero, funkman
-  -1:
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44084
   JASSRealm is broken for application provided Principals
   http://svn.apache.org/viewvc?rev=606621&view=rev



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

svn commit: r609456 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 14:53:15 2008
New Revision: 609456

URL: http://svn.apache.org/viewvc?rev=609456&view=rev
Log:
Fix bug 44084. JASSRealm is broken for application provided Principals. Patch 
provided by Noah Levitt.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java?rev=609456&r1=609455&r2=609456&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
 Sun Jan  6 14:53:15 2008
@@ -250,7 +250,6 @@
   */
  public void setRoleClassNames(String roleClassNames) {
  this.roleClassNames = roleClassNames;
- parseClassNames(roleClassNames, roleClasses);
  }
  
  /**
@@ -264,12 +263,17 @@
  protected void parseClassNames(String classNamesString, List 
classNamesList) {
  classNamesList.clear();
  if (classNamesString == null) return;
- 
+
+ ClassLoader loader = this.getClass().getClassLoader();
+ if (isUseContextClassLoader())
+ loader = Thread.currentThread().getContextClassLoader();
+
  String[] classNames = classNamesString.split("[ ]*,[ ]*");
  for (int i=0; ihttp://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609456&r1=609455&r2=609456&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 14:53:15 2008
@@ -112,6 +112,10 @@
 44041: Fix duplicate class definition error under load.
 (markt)
   
+  
+44084: JASSRealm is broken for application provided
+Principals. Patch provided by Noah Levitt. (markt)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609456&r1=609455&r2=609456&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 14:53:15 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44084
-  JASSRealm is broken for application provided Principals
-  http://svn.apache.org/viewvc?rev=606621&view=rev
-  +1: markt, pero,fhanik
-  -1: 
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43914
   Location headers must be encoded. Patch provided by Ivan Todoroski.
   http://svn.apache.org/viewvc?rev=606952&view=rev



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

svn commit: r609460 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 15:01:02 2008
New Revision: 609460

URL: http://svn.apache.org/viewvc?rev=609460&view=rev
Log:
Fix bug 43914. Location headers must be encoded. Patch provided by Ivan 
Todoroski.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java?rev=609460&r1=609459&r2=609460&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
 Sun Jan  6 15:01:02 2008
@@ -24,6 +24,7 @@
 import org.apache.catalina.Globals;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.util.StringManager;
+import org.apache.catalina.util.URLEncoder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.coyote.ActionCode;
@@ -103,6 +104,28 @@
 StringManager.getManager(Constants.Package);
 
 
+/**
+ * Encoder for the Location URL in HTTP redirects.
+ */
+protected static URLEncoder urlEncoder;
+
+
+// - Static Initializer
+
+
+/**
+ * The safe character set.
+ */
+static {
+urlEncoder = new URLEncoder();
+urlEncoder.addSafeCharacter('-');
+urlEncoder.addSafeCharacter('_');
+urlEncoder.addSafeCharacter('.');
+urlEncoder.addSafeCharacter('*');
+urlEncoder.addSafeCharacter('/');
+}
+
+
 //  Adapter Methods
 
 
@@ -311,7 +334,7 @@
 // Possible redirect
 MessageBytes redirectPathMB = request.getMappingData().redirectPath;
 if (!redirectPathMB.isNull()) {
-String redirectPath = redirectPathMB.toString();
+String redirectPath = urlEncoder.encode(redirectPathMB.toString());
 String query = request.getQueryString();
 if (request.isRequestedSessionIdFromURL()) {
 // This is not optimal, but as this is not very common, it

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609460&r1=609459&r2=609460&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 15:01:02 2008
@@ -105,6 +105,10 @@
 43887: Include exception in the log message. (markt)
   
   
+43914: Location headers must be encoded. Patch provided by
+Ivan Todoroski. (markt)
+  
+  
 43957: Service.bat didn't configure logging correctly.
 Patch provided by Richard Fearn. (markt)
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609460&r1=609459&r2=609460&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 15:01:02 2008
@@ -47,12 +47,6 @@
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43914
-  Location headers must be encoded. Patch provided by Ivan Todoroski.
-  http://svn.apache.org/viewvc?rev=606952&view=rev
-  +1: markt, pero, fhanik
-  -1: 
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43839
   URL based session tracking fails when session cookie from parent context is
   present. Based on a patch by Yuan Qingyun.



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

svn commit: r609461 - /tomcat/current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 15:04:56 2008
New Revision: 609461

URL: http://svn.apache.org/viewvc?rev=609461&view=rev
Log:
Votes

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609461&r1=609460&r2=609461&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 15:04:56 2008
@@ -43,9 +43,11 @@
 
 * Fix  FarmWarDeployer can be only config at Host Element (Also needed at 
tomcat 6)
   
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-FarmWarDeployer-tc55.patch
-  +1: pero
+  +1: pero, markt
   -1:
0: fhanik, this needs to be reworked completely, so I'm neutral
+  martk - change "FarmWarDeployer can only work as parent from " to
+ "FarmWarDeployer can only work if parent of "
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43839
   URL based session tracking fails when session cookie from parent context is
@@ -57,6 +59,6 @@
 
 * Remove unused dependency on HttpClient
   http://people.apache.org/~funkman/tc5.5-build.properties.patch
-  +1: funkman, pero
+  +1: funkman, pero, markt
   -1: 
  



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

svn commit: r609463 - in /tomcat: container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 15:10:34 2008
New Revision: 609463

URL: http://svn.apache.org/viewvc?rev=609463&view=rev
Log:
Fix bug 43839. URL based session tracking fails when session cookie from parent 
context is present. Based on a patch by Yuan Qingyun.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java?rev=609463&r1=609462&r2=609463&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
 Sun Jan  6 15:10:34 2008
@@ -406,6 +406,14 @@
  */
 protected void parseSessionCookiesId(org.apache.coyote.Request req, 
Request request) {
 
+// If session tracking via cookies has been disabled for the current
+// context, don't go looking for a session ID in a cookie as a cookie
+// from a parent context with a session ID may be present which would
+// overwrite the valid session ID encoded in the URL
+Context context = (Context) request.getMappingData().context;
+if (context != null && !context.getCookies())
+return;
+
 // Parse session id from cookies
 Cookies serverCookies = req.getCookies();
 int count = serverCookies.getCookieCount();

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609463&r1=609462&r2=609463&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan  6 15:10:34 2008
@@ -102,6 +102,11 @@
 and will be unescaped during parsing.
   
   
+43839: URL based session tracking fails when session cookie
+from parent context is present. Based on a patch by Yuan Qingyun.
+(markt)
+  
+  
 43887: Include exception in the log message. (markt)
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609463&r1=609462&r2=609463&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan  6 15:10:34 2008
@@ -49,14 +49,6 @@
   martk - change "FarmWarDeployer can only work as parent from " to
  "FarmWarDeployer can only work if parent of "
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43839
-  URL based session tracking fails when session cookie from parent context is
-  present. Based on a patch by Yuan Qingyun.
-  http://svn.apache.org/viewvc?rev=606944&view=rev
-  http://svn.apache.org/viewvc?rev=609003&view=rev
-  +1: markt,funkman, fhanik, pero
-  -1: 
-
 * Remove unused dependency on HttpClient
   http://people.apache.org/~funkman/tc5.5-build.properties.patch
   +1: funkman, pero, markt



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

DO NOT REPLY [Bug 44094] - privileged="true" causes ClassNotFound from shared\lib

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=44094


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:13 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43611] - autodeployment with unpackWARs="true" does not work, when a context for that war file exists in server.xml

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43611


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:13 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43594] - setenv.sh/setenv.bat seems a better candidate for CATALINA_BASE

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43594


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:13 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43622] - compression / minCompressionSize attribute not properly implemented

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43622


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:13 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43675] - Classloader leak in org.apache.tomcat.util.http.ServerCookie

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43675


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:14 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43757] - Improper parsing of response.sendRedirect() in JSP source

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43757


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:14 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43839] - I think the implement is difference with the document in function CoyoteAdapter.postParseRequest

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43839





--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:14 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43839] - I think the implement is difference with the document in function CoyoteAdapter.postParseRequest

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43839


[EMAIL PROTECTED] changed:

   What|Removed |Added

  Component|Connector:Coyote|Catalina
Product|Tomcat 5|Tomcat 6
   Target Milestone|--- |default
Version|5.0.25  |6.0.14




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:15 ---
Updating version

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43236] - Response.setCharacterEncoding() fails after Response.getWriter() and Response.reset()

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43236


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:15 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43241] - ServletContext.getResourceAsStream() does not follow API specs for Path

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43241





--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:16 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43241] - ServletContext.getResourceAsStream() does not follow API specs for Path

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43241


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:16 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43887] - StandardWrapper.registerJMX() doesn't log exceptions correctly

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43887


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:16 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43914] - HTTP spec violation when generating HTTP redirects for folders without trailing slash

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43914


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:16 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43957] - service.bat doesn't configure logging like the Windows installer

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43957


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:17 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43995] - Sendfile thread uses 100% cpu for long periods

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43995


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:17 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 44041] - WebappClassLoader duplicate class definition under high Load if hasExternalRepositories is true

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=44041


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:19 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.
Fixed in 6.0.x and will be included in 6.0.16 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 44084] - JAASRealm useContextClassLoader has problems

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=44084


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 15:19 ---
Fixed in 5.5.x and will be included in 5.5.26 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r609467 - /tomcat/current/tc4.1.x/STATUS.txt

[markt]

Author: markt
Date: Sun Jan  6 15:22:21 2008
New Revision: 609467

URL: http://svn.apache.org/viewvc?rev=609467&view=rev
Log:
TC5 port has been committed.

Modified:
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=609467&r1=609466&r2=609467&view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Sun Jan  6 15:22:21 2008
@@ -44,7 +44,7 @@
   -1:
 
 * Update TC4 with the new Cookie handling code from TC6. Request/Response
-  only. Requires TC5 port first.
+  only.
   http://svn.apache.org/viewvc?view=rev&revision=594968
   +1: markt
   -1:



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

svn commit: r609469 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java

[markt]

Author: markt
Date: Sun Jan  6 15:29:15 2008
New Revision: 609469

URL: http://svn.apache.org/viewvc?rev=609469&view=rev
Log:
Include 6.0.x parameter processing fix in trunk.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=609469&r1=609468&r2=609469&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Sun Jan  6 
15:29:15 2008
@@ -2486,6 +2486,7 @@
 context.getLogger().debug(
 sm.getString("coyoteRequest.parseParameters"), e);
 }
+return;
 }
 parameters.processParameters(formData, 0, len);
 }



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

DO NOT REPLY [Bug 43839] - I think the implement is difference with the document in function CoyoteAdapter.postParseRequest

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43839





--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 18:58 ---
There is same problem in function parseSessionId() at line 505. If user declear
use cookie to store the session id, why need parse the session id from encode 
URI?

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43839] - I think the implement is difference with the document in function CoyoteAdapter.postParseRequest

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43839





--- Additional Comments From [EMAIL PROTECTED]  2008-01-06 19:08 ---
Please think about the test case. User declear use cookie to store the session
and user rewrite the URI. For some reason the cookie is lost, in current code,
what will happen. Tomcat will use the URI session, right? So, it the implement
still has problem. So I suggestion add the follow code at the parseSessionId.
Context context = (Context) request.getMappingData().context;
if (context == null || context.getCookies())
return;

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

Minor changes needed to compile trunk and import into Eclipse

[Kirk True]

Hi all,

I downloaded the source for the trunk and tried to compile it, but ran into
some minor issues...

The first problem is that "ant download" couldn't compile some dependencies
because I was using Java 1.6. I assumed this was OK as the verbiage states
something to the effect of Java 5 or greater. I installed the latest Java 5,
updated my JAVA_HOME variable, and "ant download" and "ant" worked fine. Is
1.6 expected to work?

Secondly, (even though I know it's "unsupported") I imported the stock
.project into my Eclipse workspace.
I had three minor issues: 

1. org/apache/naming/factory/webservices isn't excluded in the
.classpath file as it is
in the build.xml
2. The Eclipse plugin has been updated, so the downloaded dependency was
3.3.1 
while the .classpath expected 3.1.2
3. The Ant JAR dependency was not downloaded, so I updated the
.classpath to use
$ANT_HOME/lib/ant.jar 

diff of .classpath:

Index: .classpath
===
--- .classpath  (revision 609508)
+++ .classpath  (working copy)
@@ -16,10 +16,10 @@
   limitations under the License.
 -->
 
-   
+   


-   
-   
+   
+   

 

Thanks,
Kirk
-- 
View this message in context: 
http://www.nabble.com/Minor-changes-needed-to-compile-trunk-and-import-into-Eclipse-tp14658709p14658709.html
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


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

Bug report for Tomcat 3 [2008/01/06]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
| 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt|
| 5331|Ass|Nor|2001-12-09|getPathInfo vs URL normalization  |
| 6027|Inf|Maj|2002-01-25|Tomcat  Automatically shuts down as service   |
| 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c|
| 7785|Inf|Blk|2002-04-06|tomcat bug in context reloading   |
| 7863|Inf|Maj|2002-04-09|I have a problem when running Tomcat with IIS |
| 8187|Inf|Cri|2002-04-17|Errors when Tomcat used with MS Access database   |
| 9737|Ver|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p|
|10047|Ass|Cri|2002-06-20|IllegalStateException |
|10406|Ass|Cri|2002-07-02|IllegalStateException |
|11087|Inf|Blk|2002-07-23|IllegalStateException |
|12156|Inf|Cri|2002-08-29|Apache and Tomcat 3.3.1 Interworking problem  |
|16363|Ass|Cri|2003-01-23|Stack Overflow accessing compiled JSP - Tomcat 3.2|
|39250|Inf|Cri|2006-04-07|Tomcat 3.2.1 + JDK 1.4|
+-+---+---+--+--+
| Total   14 bugs   |
+---+

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

Bug report for Watchdog [2008/01/06]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|  278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug|
|  279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug|
|  469|Unc|Nor|2001-01-17|in example-taglib.tld "urn" should be "uri" BugRat|
|  470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B|
| 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths|
|10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher|
|11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward()|
|11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav|
|11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie|
|11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro|
|11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid.|
|14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec|
|15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv|
|24649|New|Nor|2003-11-12|getRemoteHost fails when agent has uppercase chara|
|29398|New|Nor|2004-06-04|Update site and note current status   |
+-+---+---+--+--+
| Total   15 bugs   |
+---+

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

Bug report for Tomcat 4 [2008/01/06]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
| 3839|Opn|Enh|2001-09-26|Problem bookmarking login page|
| 4227|Opn|Enh|2001-10-17|Invalid CGI path  |
| 5329|New|Enh|2001-12-08|NT Service exits startup before Tomcat is finished|
| 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob|
| 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi|
| 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio|
| 6600|Opn|Enh|2002-02-20|enodeURL adds 'jsession' when 'isRequestedSessionI|
| 6614|New|Enh|2002-02-21|Have Bootstrap and StandardClassLoader use the sam|
| 6671|New|Enh|2002-02-25|Simple custom tag example uses old declaration sty|
| 7043|New|Enh|2002-03-12|database user and password for JDBC Based Store   |
| 7374|New|Enh|2002-03-22|Apache Tomcat/4.0.1 message on standard output|
| 7676|New|Enh|2002-04-02|Allow name property to use match experssions in  without className in server.xml produces N|
|11069|Opn|Enh|2002-07-23|Tomcat not flag error if tld is outside of /WEB-IN|
|11129|New|Enh|2002-07-24|New valve for putting the sessionIDs in the reques|
|11248|New|Enh|2002-07-29|DefaultServlet doesn't send expires header|
|11754|Opn|Enh|2002-08-15|Synchronous shutdown script - shutdown.sh should w|
|12069|New|Enh|2002-08-27|Creation of more HttpSession objects for one previ|
|12428|Opn|Enh|2002-09-09|request.getUserPrincipal(): Misinterpretation of s|
|12658|New|Enh|2002-09-15|a proxy host and port at the  element level |
|12766|New|Enh|2002-09-18|Tomcat should use tld files in /WEB-INF/ over vers|
|13309|Opn|Enh|2002-10-04|Catalina calls System.exit()  |
|13634|New|Enh|2002-10-15|Allowing system properties to be substituted in co|
|13689|Opn|Enh|2002-10-16|Classloader paths for 'Common' classes and librari|
|13731|New|Enh|2002-10-17|Final request, response, session and other variabl|
|13941|New|Enh|2002-10-24|reload is VERY slow   |
|13965|New|Enh|2002-10-25|Catalina.sh correction request for Tru64 Unix |
|14097|New|Enh|2002-10-30|hardcoded registry value for vm lets tomcat servic|
|14416|New|Enh|2002-11-10|blank tag name in TLD cause NullPointerException  |
|14635|New|Enh|2002-11-18|Should be possible not to have -MM-DD in log f|
|14766|New|Enh|2002-11-22|Redirect Vavle|
|14993|New|Enh|2002-12-02|Possible obselete synchronized declaration|
|15115|New|Enh|2002-12-05|correct docs... XML parser *cannot* be overridden |
|15417|Opn|Enh|2002-12-16|Add port for forced compilation of JSP pages  |
|15688|New|Enh|2002-12-27|full-qualified names instead of imports   |
|15941|New|Enh|2003-01-10|Expose rootCause exceptions at deeper levels  |
|16294|New|Enh|2003-01-21|Configurable URL Decoding.|
|16357|New|Enh|2003-01-23|"connection timeout reached"  |
|16531|New|Enh|2003-01-29|Updating already deployed ".war" files in a single|
|16579|New|Enh|2003-01-30|documentation page layout/style breaks wrapping to|
|16596|New|Enh|2003-01-30|option for disabling log rotation |
|17070|New|Enh|2003-02-14|The Catalina Ant tasks do not allow for 'reusable'|
|17146|New|Enh|2003-02-18|Simplify build.xml using 

Bug report for Tomcat 5 [2008/01/06]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat|
|28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn  |
|29160|Ver|Enh|2004-05-23|precompile problem: _jspx_meth_* (javax.servlet.js|
|29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi|
|29936|Opn|Blk|2004-07-06|XML parser loading problems by container  |
|30241|Ver|Enh|2004-07-21|Enhance build script to use branch argument when c|
|31257|Opn|Cri|2004-09-16|java.endorsed.dirs is not used when JSP compilatio|
|33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis|
|33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps|
|33650|Inf|Enh|2005-02-19|Jasper performance for multiple files processing  |
|33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na|
|34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo|
|34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a|
|34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern|
|34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that|
|35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc|
|35869|Inf|Enh|2005-07-26|Can't run as a service on Windows Server 2003 64-B|
|35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName|
|36133|Inf|Enh|2005-08-10|Support JSS SSL implementation|
|36169|New|Enh|2005-08-12|[PATCH] Enable chunked encoding for requests in II|
|36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi|
|36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's   |
|36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re|
|36922|Inf|Enh|2005-10-04|setup.sh file mis-advertised and missing  |
|36923|New|Nor|2005-10-05|Deactivated EL expressions are not parsed for jsp |
|37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token|
|37084|Opn|   |2005-10-14|JspC from ant fails on JSPs that use custom taglib|
|37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis|
|37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user  |
|37485|Inf|Enh|2005-11-14|I'd like to run init SQL after JDBC Connection cre|
|37498|Inf|Nor|2005-11-14|[PATCH] NPE in org.apache.catalina.core.ContainerB|
|37515|Inf|Nor|2005-11-15|smap not generated by JspC when used from Ant for |
|37627|Opn|Nor|2005-11-24|Slow and incomplete dynamic content generation aft|
|37785|Inf|Nor|2005-12-05|Changing startup type via Tomcat Monitor does not |
|37794|Opn|Nor|2005-12-05|getParameter() fails on POST with transfer-encodin|
|37797|Inf|Maj|2005-12-05|Configure Tomcat utility truncates classpath to 96|
|37822|Opn|Nor|2005-12-07|WebappClassLoader interfering with Catalina core c|
|37847|Ass|Enh|2005-12-09|Allow User To Optionally Specify Catalina Output F|
|37869|Opn|Nor|2005-12-12|Cannot obtain client certificate with SSL / client|
|37918|Inf|Nor|2005-12-15|EL cannot find valid getter from object when using|
|37984|New|Nor|2005-12-21|JNDIRealm.java not able to handle MD5 password|
|38001|Inf|Nor|2005-12-22|TruncatedClassFile when loadind applets   |
|38046|Ass|   |2005-12-27|apache-tomcat-5.5.14-deployer doesn't work (Illega|
|38131|New|Enh|2006-01-05|WatchedResource does not work if app is outside "w|
|38197|Opn|Maj|2006-01-09|taglib pool bug when tag is used with jsp:attribut|
|38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations |
|38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti|
|38352|Inf|Nor|2006-01-22|Additional Entries for Default catalina.policy fil|
|38360|Inf|Enh|2006-01-24|Domain for session cookies|
|38367|Inf|Nor|2006-01-24|Executing any Catalina Ant task results in an exce|
|38372|Inf|Cri|2006-01-25|tcnative-1.dll response overflow corruption, parti|
|38427|