date:20110307

https://issues.apache.org/bugzilla/show_bug.cgi?id=48501

--- Comment #6 from Mark Thomas ma...@apache.org 2011-03-07 05:06:40 EST ---
This was included in 1.2.31 onwards

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 16579] documentation page layout/style breaks wrapping to fit browser window

https://issues.apache.org/bugzilla/show_bug.cgi?id=16579

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

  Component|Unknown |Documentation
Version|4.0 Final   |trunk
Product|Tomcat 4|Tomcat 7

--- Comment #3 from Mark Thomas ma...@apache.org 2011-03-07 05:18:25 EST ---
Still want to look at this at some point. Moving to Tomcat 7. Some more things
to consider:
- Tomcat 7 docs
- Tomcat website
- the new ASF CMS
- the new Tomcat 7 start page

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50883] New: StackOverflowError

https://issues.apache.org/bugzilla/show_bug.cgi?id=50883

   Summary: StackOverflowError
   Product: Tomcat 6
   Version: 6.0.29
  Platform: HP
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Servlet  JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: dashashishku...@gmail.com


Hi ! 
Eventually I am getting the following StackOverflowError in Tomcat 6.0.29,
and after walking through this StackTrace, and source code of Tomcat 6.0.29, I
found ApplicationHttpRequest.setAttribute(ApplicationHttpRequest.java:278) as a
recursive method call from
javax.servlet.ServletRequestWrapper.setAttribute(ServletRequestWrapper.java:284).

The piece of code from ServletRequestWrapper.java looks like : 

 public void setAttribute(String name, Object o) {
this.request.setAttribute(name, o);
 }

So in this piece of code is it necessary to do a equality check for the request
object just to make sure this will never went into a recursion even though the
user calls a setAttribute(name, o) on a WrappedRequest
object(ServletRequestWrapper). 

Following is the Error Stack Trace : 

java.lang.StackOverflowError
at
org.apache.catalina.core.ApplicationHttpRequest.setAttribute(ApplicationHttpRequest.java:278)
at
org.apache.catalina.core.ApplicationHttpRequest.setAttribute(ApplicationHttpRequest.java:279)
at
org.apache.catalina.core.ApplicationHttpRequest.setAttribute(ApplicationHttpRequest.java:279)
.
...repeated many times..
.
at
org.apache.catalina.core.ApplicationHttpRequest.setAttribute(ApplicationHttpRequest.java:279)
at
org.apache.catalina.core.ApplicationHttpRequest.setAttribute(ApplicationHttpRequest.java:279)
at
javax.servlet.ServletRequestWrapper.setAttribute(ServletRequestWrapper.java:284)
at com.kony.web.controller.KonyBaseServlet.logUserDetails(Unknown Source)
at com.kony.web.controller.KonyBaseServlet.navigateToNextForm(Unknown
Source)
at com.kony.web.controller.KonyWebWAPController.processRequest(Unknown
Source)
at com.kony.web.controller.KonyWebWAPController.doPost(Unknown Source)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:637)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
at
org.apache.catalina.core.ApplicationHttpRequest.setAttribute(ApplicationHttpRequest.java:279)
at
javax.servlet.ServletRequestWrapper.setAttribute(ServletRequestWrapper.java:284)
at com.kony.web.controller.KonyBaseServlet.logUserDetails(Unknown Source)
at com.kony.web.controller.KonyBaseServlet.navigateToNextForm(Unknown
Source)
at com.kony.web.controller.KonyWebWAPController.processRequest(Unknown
Source)
at com.kony.web.controller.KonyWebWAPController.doPost(Unknown Source)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:637)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
.
.Repeated many times
.
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at
org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646)
at
org.apache.catalina.core.ApplicationDispatcher.processRequest(ApplicationDispatcher.java:436)
at
org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDispatcher.java:374)
at
org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispatcher.java:302)
at com.kony.web.controller.KonyBaseServlet.navigateToNextForm(Unknown
Source)
at com.kony.web.controller.KonyWebWAPController.processRequest(Unknown
Source)
at com.kony.web.controller.KonyWebWAPController.doPost(Unknown Source)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:637)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)


So is this a bug , if yes is there any fix release n this and if not am I
misinterpreting anything, please guide me where I am doing so.

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50883] StackOverflowError

https://issues.apache.org/bugzilla/show_bug.cgi?id=50883

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas ma...@apache.org 2011-03-07 06:30:03 EST ---
Looks like something in your app is calling setRequest() on a wrapper and
passing in the wrapper rather than the request to be wrapped. The Servlet
specification does not provide for throwing an exception in this case. I'll add
that to my list of things to raise for the next version of the spec.

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078747 - in /tomcat/jk/trunk/xdocs: miscellaneous/changelog.xml reference/iis.xml

Author: markt
Date: Mon Mar  7 11:37:19 2011
New Revision: 1078747

URL: http://svn.apache.org/viewvc?rev=1078747view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50882
Add additional info for the fix for 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48501

Modified:
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/reference/iis.xml

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1078747r1=1078746r2=1078747view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Mar  7 11:37:19 2011
@@ -89,7 +89,8 @@
 Apache: Added version number resource for mod_jk.so on Windows. (timw)
   /update
   update
-IIS: Added rotatelogs style log rotation to ISAPI Redirector. (timw)
+bug48501/bug: IIS: Added rotatelogs style log rotation to ISAPI
+Redirector. (timw)
   /update
   fix
 bug38895/bug: IIS: Use RAW headers instead of CGI headers by 
default

Modified: tomcat/jk/trunk/xdocs/reference/iis.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/iis.xml?rev=1078747r1=1078746r2=1078747view=diff
==
--- tomcat/jk/trunk/xdocs/reference/iis.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/iis.xml Mon Mar  7 11:37:19 2011
@@ -82,12 +82,14 @@ A full list of format string substitutio
 /p/attribute
 attribute name=log_level required=falsep
 A string value for log level 
-(can be debug, info, warn, error or trace).
-/p/attribute
+(can be debug, info, warn, error or trace)./p
+pThis directive was added in version 1.2.31/p
+/attribute
 attribute name=log_rotationtime required=falsep
 The time between log file rotations in seconds.
-Setting this to 0 (the default) disables log rotation based on time. 
-/p/attribute
+Setting this to 0 (the default) disables log rotation based on time./p
+pThis directive was added in version 1.2.31/p
+/attribute
 attribute name=log_filesize required=falsep
 The maximum log file size in megabytes, after which the log file will be 
rotated. Setting this to 0 (the default) disables log rotation based on file 
size.
 br/The value can have an optional bM/b suffix, i.e. both b5/b and 
b5M/b will rotate the log file when it grows to 5MB.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50882] Fix documentation and tickets for 1.2.31

https://issues.apache.org/bugzilla/show_bug.cgi?id=50882

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas ma...@apache.org 2011-03-07 06:38:10 EST ---
This has been fixed in trunk and will be included in 1.2.32 onwards.

Note that the docs on the Tomcat website always reflect the latest released
version so these changes will not appear until 1.2.32 is released.

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 26494] JDBCRealm and DataSourceRealm with case insensitive user names

https://issues.apache.org/bugzilla/show_bug.cgi?id=26494

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX

--- Comment #2 from Mark Thomas ma...@apache.org 2011-03-07 06:49:46 EST ---
This would require reasonably invasive changes to the JDBCRealm and
DataSourceRealm. Since there is no explanation of why this is required, I am
closing this as WONTFIX. Further, if user names are treated in a case
insensitive manner then it is hard to see why the case of the user name
matters.

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078754 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

Author: markt
Date: Mon Mar  7 11:56:19 2011
New Revision: 1078754

URL: http://svn.apache.org/viewvc?rev=1078754view=rev
Log:
Another FindBugs false positive

Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1078754r1=1078753r2=1078754view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Mon Mar  7 11:56:19 
2011
@@ -68,6 +68,11 @@
 Bug code=MSF /
   /Match
   Match
+Class name=org.apache.catalina.realm.JDBCRealm /
+Field name=containerLog /
+Bug code=IS /
+  /Match
+  Match
 !-- Catalina isn't used when embedding --
 Class name=org.apache.catalina.startup.Catalina /
 Method name=stopServer /
@@ -207,6 +212,7 @@
   Match
 Class name=org.apache.el.parser.ParseException /
   /Match
+
   !-- Test code --
   Match
 Or



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1078601 - in /tomcat/trunk: java/org/apache/catalina/loader/ java/org/apache/naming/resources/ test/org/apache/naming/resources/ webapps/docs/

2011-03-07 Thread sebb

On 6 March 2011 22:12,  ma...@apache.org wrote:
 Author: markt
 Date: Sun Mar  6 22:12:10 2011
 New Revision: 1078601

 URL: http://svn.apache.org/viewvc?rev=1078601view=rev
 Log:
 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=26701
 Provide a mechanism for users to register their own URLStreamHandlerFactory 
 objects.

 Added:
    
 tomcat/trunk/test/org/apache/naming/resources/TestDirContextURLStreamHandlerFactory.java
    (with props)
 Modified:
    tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
    tomcat/trunk/java/org/apache/naming/resources/Constants.java
    
 tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java
    tomcat/trunk/webapps/docs/changelog.xml

 +    // Singleton
 +    private static DirContextURLStreamHandlerFactory instance =
 +        new DirContextURLStreamHandlerFactory();

C|Should be final?

 +    public static DirContextURLStreamHandlerFactory getInstance() {
 +        return instance;
 +    }
 +
 +    public static void addUserFactory(URLStreamHandlerFactory factory) {
 +        instance.userFactories.add(factory);
 +    }
 +
 +
 +    private ListURLStreamHandlerFactory userFactories =
 +        new CopyOnWriteArrayListURLStreamHandlerFactory();

C|Should be final ?

 +    private DirContextURLStreamHandlerFactory() {
 +        // Hide the default constructor

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078762 - in /tomcat/jk/trunk: native/netscape/jk_nsapi_plugin.c xdocs/miscellaneous/changelog.xml

Author: rjung
Date: Mon Mar  7 12:50:31 2011
New Revision: 1078762

URL: http://svn.apache.org/viewvc?rev=1078762view=rev
Log:
NSAPI: Use lower case header names for responses.
Otherwise the web server might add chunked transfer encoding header
in addition to our content length header.

Problem reported on dev list by Jon Forster.

Modified:
tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c?rev=1078762r1=1078761r2=1078762view=diff
==
--- tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c Mon Mar  7 12:50:31 2011
@@ -125,6 +125,28 @@ static void init_workers_on_other_thread
 init_on_other_thread_is_done = JK_TRUE;
 }
 
+/*
+ * Convert string to lower case.
+ * If string is longer than the provided buffer,
+ * just return the original string.
+ */
+static const char *to_lower(const char *str, char *buf, int bufsz)
+{
+const char *from = str;
+char *to = buf;
+char *end = buf + (bufsz - 1);
+while (to != end  *from) {
+*to = (char)tolower(*from);
+to++;
+from++;
+}
+if (to != end) {
+*to = '\0';
+return buf;
+}
+return str;
+}
+
 static int JK_METHOD start_response(jk_ws_service_t *s,
 int status,
 const char *reason,
@@ -143,8 +165,16 @@ static int JK_METHOD start_response(jk_w
 param_free(pblock_remove(content-type, p-rq-srvhdrs));
 
 if (num_of_headers) {
+/*
+ * NSAPI expects http header names to be lower case.
+ * This is only relevant for the server itself or other
+ * plugins searching for headers in the pblock.
+ * We use a buffer of limited length, because conforming
+ * with this rule should only matter for well-known headers.
+ */
+char name_buf[64];
 for (i = 0; i  (int)num_of_headers; i++) {
-pblock_nvinsert(header_names[i],
+pblock_nvinsert(to_lower(header_names[i], name_buf, 64),
 header_values[i], p-rq-srvhdrs);
 }
 }

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1078762r1=1078761r2=1078762view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Mar  7 12:50:31 2011
@@ -54,6 +54,11 @@
 bodies for 204, 205 and 304 responses. (timw)
   /fix
   fix
+NSAPI: Use lower case header names for responses.
+Otherwise the web server might add chunked transfer encoding header
+in addition to our content length header.
+  /fix
+  fix
 bug50339/bug: Fix whitespace trimming when parsing attribute
 lists. (rjung)
   /fix



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078780 - /tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java

Author: markt
Date: Mon Mar  7 14:24:08 2011
New Revision: 1078780

URL: http://svn.apache.org/viewvc?rev=1078780view=rev
Log:
Fix Eclipse warnings

Modified:

tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java

Modified: 
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java?rev=1078780r1=1078779r2=1078780view=diff
==
--- 
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java 
(original)
+++ 
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java 
Mon Mar  7 14:24:08 2011
@@ -80,6 +80,7 @@ public class ServiceRefFactory
  * 
  * @param obj The reference object describing the webservice
  */
+@Override
 public Object getObjectInstance(Object obj, Name name, Context nameCtx,
 Hashtable?,? environment)
 throws Exception {
@@ -193,6 +194,7 @@ public class ServiceRefFactory
 Definition def = reader.readWSDL((new 
URL(wsdlRefAddr)).toExternalForm());
 
 javax.wsdl.Service wsdlservice = 
def.getService(serviceQname);
+@SuppressWarnings(unchecked) // Can't change the API
 MapString,? ports = wsdlservice.getPorts();
 Method m = 
serviceInterfaceClass.getMethod(setEndpointAddress,
 new Class[] { java.lang.String.class,
@@ -335,6 +337,7 @@ public class ServiceRefFactory
  */
 private String getSOAPLocation(Port port) {
 String endpoint = null;
+@SuppressWarnings(unchecked) // Can't change the API
 ListExtensibilityElement extensions = 
port.getExtensibilityElements();
 for (IteratorExtensibilityElement i = extensions.iterator();
 i.hasNext();) {
@@ -351,6 +354,7 @@ public class ServiceRefFactory
 private void initHandlerChain(QName portName, HandlerRegistry 
handlerRegistry,
 HandlerInfo handlerInfo, ArrayListString soaprolesToAdd) {
 HandlerChain handlerChain = (HandlerChain) 
handlerRegistry.getHandlerChain(portName);
+@SuppressWarnings(unchecked) // Can't change the API
 IteratorHandler iter = handlerChain.iterator();
 while (iter.hasNext()) {
 Handler handler = iter.next();



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078798 - in /tomcat/trunk/java/org/apache/naming/resources: FileDirContext.java LocalStrings.properties ProxyDirContext.java ResourceCache.java WARDirContext.java jndi/

Author: markt
Date: Mon Mar  7 14:55:22 2011
New Revision: 1078798

URL: http://svn.apache.org/viewvc?rev=1078798view=rev
Log:
Code cleanup
- remove unused code
- fix FindBugs warnings
- fix Eclipse warnings

Removed:
tomcat/trunk/java/org/apache/naming/resources/jndi/
Modified:
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java
tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java

Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=1078798r1=1078797r2=1078798view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Mon Mar  
7 14:55:22 2011
@@ -270,7 +270,10 @@ public class FileDirContext extends Base
 
 File newFile = new File(base, newName);
 
-file.renameTo(newFile);
+if (!file.renameTo(newFile)) {
+throw new NamingException(sm.getString(resources.renameFail,
+oldName, newName));
+}
 
 }
 

Modified: tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties?rev=1078798r1=1078797r2=1078798view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/LocalStrings.properties Mon 
Mar  7 14:55:22 2011
@@ -22,10 +22,12 @@ resources.addResourcesJarFail=Failed to 
 resources.alreadyStarted=Resources has already been started
 resources.connect=Cannot connect to document base {0}
 resources.input=Cannot create input stream for resource {0}
+resources.invalidCache=Unable to create a resource cache of type [{0}]
 resources.notStarted=Resources has not yet been started
 resources.null=Document base cannot be null
 resources.notFound=Resource {0} not found
 resources.path=Context relative path {0} must start with ''/''
+resources.renameFail=Failed to rename [{0}] to [{1}]
 resources.alreadyBound=Name {0} is already bound in this Context
 resources.bindFailed=Bind failed: {0}
 resources.unbindFailed=Unbind failed: {0}

Modified: tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java?rev=1078798r1=1078797r2=1078798view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java 
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java Mon Mar  
7 14:55:22 2011
@@ -82,8 +82,8 @@ public class ProxyDirContext implements 
 cache = (ResourceCache) 
 Class.forName(cacheClassName).newInstance();
 } catch (Exception e) {
-//FIXME
-e.printStackTrace();
+throw new IllegalArgumentException(sm.getString(
+resources.invalidCache, cacheClassName), e);
 }
 cache.setCacheMaxSize(baseDirContext.getCacheMaxSize());
 cacheTTL = baseDirContext.getCacheTTL();

Modified: tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java?rev=1078798r1=1078797r2=1078798view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java Mon Mar  7 
14:55:22 2011
@@ -362,7 +362,7 @@ public class ResourceCache {
 
 int i = 0;
 while (true) {
-i = (b + a) / 2;
+i = (b + a)  1;
 int result = name.compareTo(map[i].name);
 if (result  0) {
 a = i;

Modified: tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=1078798r1=1078797r2=1078798view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java Mon Mar  7 
14:55:22 2011
@@ -896,7 +896,19 @@ public class WARDirContext extends BaseD
 public int

DO NOT REPLY [Bug 48208] allow to configure a custom client certificate Trust Manager in server.xml per connector attribute trustManagerClassName

https://issues.apache.org/bugzilla/show_bug.cgi?id=48208

--- Comment #11 from Luciana Moreira more...@privasphere.com 2011-03-07 
10:02:21 EST ---
I looked and it seems very good from my perspective.

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078805 - in /tomcat/jk/trunk: native/apache-1.3/ native/apache-2.0/ native/common/ native/iis/ native/netscape/ xdocs/generic_howto/ xdocs/miscellaneous/ xdocs/reference/

Author: rjung
Date: Mon Mar  7 15:17:11 2011
New Revision: 1078805

URL: http://svn.apache.org/viewvc?rev=1078805view=rev
Log:
Support Servlet API getRemotePort().

Works for Tomcat 5.5.28, 6.0.20 and 7.0.0 in
combination with Apache and ISAPI plugins.

BZ 41263

Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_ajp_common.h
tomcat/jk/trunk/native/common/jk_service.h
tomcat/jk/trunk/native/common/jk_util.c
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c
tomcat/jk/trunk/xdocs/generic_howto/proxy.xml
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/reference/apache.xml

Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1078805r1=1078804r2=1078805view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Mon Mar  7 15:17:11 2011
@@ -65,6 +65,7 @@
 #define JK_LOG_DEF_FILE (logs/mod_jk.log)
 #define JK_SHM_DEF_FILE (logs/jk-runtime-status)
 #define JK_ENV_REMOTE_ADDR  (JK_REMOTE_ADDR)
+#define JK_ENV_REMOTE_PORT  (JK_REMOTE_PORT)
 #define JK_ENV_REMOTE_HOST  (JK_REMOTE_HOST)
 #define JK_ENV_REMOTE_USER  (JK_REMOTE_USER)
 #define JK_ENV_AUTH_TYPE(JK_AUTH_TYPE)
@@ -171,6 +172,7 @@ typedef struct
  * proxy in front of us.
  */
 char *remote_addr_indicator;
+char *remote_port_indicator;
 char *remote_host_indicator;
 char *remote_user_indicator;
 char *auth_type_indicator;
@@ -673,12 +675,20 @@ static int init_ws_service(apache_privat
 s-remote_host = get_env_string(r, s-remote_host,
 conf-remote_host_indicator, 1);
 
-if (conf-options  JK_OPT_FWDLOCAL)
+if (conf-options  JK_OPT_FWDLOCAL) {
 s-remote_addr = r-connection-local_ip;
-else
+/* We don't know the client port of the backend connection. */
+s-remote_port = 0;
+}
+else {
 s-remote_addr = r-connection-remote_ip;
+s-remote_port = ap_psprintf(r-pool, %d,
+ 
ntohs(r-connection-remote_addr.sin_port));
+}
 s-remote_addr = get_env_string(r, s-remote_addr,
 conf-remote_addr_indicator, 1);
+s-remote_port = get_env_string(r, s-remote_port,
+conf-remote_port_indicator, 1);
 
 if (conf-options  JK_OPT_FLUSHPACKETS)
 s-flush_packets = 1;
@@ -1701,6 +1711,7 @@ static const char *jk_set_worker_indicat
  * Directives Handling for setting various environment names
  * used to overwrite the following request information:
  * - remote_addr
+ * - remote_port
  * - remote_host
  * - remote_user
  * - auth_type
@@ -1717,6 +1728,16 @@ static const char *jk_set_remote_addr_in
 return NULL;
 }
 
+static const char *jk_set_remote_port_indicator(cmd_parms * cmd,
+void *dummy, char *indicator)
+{
+server_rec *s = cmd-server;
+jk_server_conf_t *conf =
+(jk_server_conf_t *) ap_get_module_config(s-module_config, 
jk_module);
+conf-remote_port_indicator = ap_pstrdup(cmd-pool, indicator);
+return NULL;
+}
+
 static const char *jk_set_remote_host_indicator(cmd_parms * cmd,
 void *dummy, char *indicator)
 {
@@ -2147,6 +2168,7 @@ static const command_rec jk_cmds[] = {
  * Environment variables used to overwrite the following
  * request information which gets forwarded:
  * - remote_addr
+ * - remote_port
  * - remote_host
  * - remote_user
  * - auth_type
@@ -2155,6 +2177,8 @@ static const command_rec jk_cmds[] = {
  */
 {JkRemoteAddrIndicator, jk_set_remote_addr_indicator, NULL, RSRC_CONF, 
TAKE1,
  Name of the Apache environment that contains the remote address},
+{JkRemotePortIndicator, jk_set_remote_port_indicator, NULL, RSRC_CONF, 
TAKE1,
+ Name of the Apache environment that contains the remote port},
 {JkRemoteHostIndicator, jk_set_remote_host_indicator, NULL, RSRC_CONF, 
TAKE1,
  Name of the Apache environment that contains the remote host name},
 {JkRemoteUserIndicator, jk_set_remote_user_indicator, NULL, RSRC_CONF, 
TAKE1,
@@ -2477,6 +2501,7 @@ static void *create_jk_config(ap_pool * 
  * proxy in front of us.
  */
 c-remote_addr_indicator = JK_ENV_REMOTE_ADDR;
+c-remote_port_indicator = JK_ENV_REMOTE_PORT;
 c-remote_host_indicator = JK_ENV_REMOTE_HOST;
 c-remote_user_indicator = JK_ENV_REMOTE_USER;
 c-auth_type_indicator = JK_ENV_AUTH_TYPE;
@@ -2548,6 +2573,8 @@ static

Re: Where do we stand with maven publishing?

2011-03-07 Thread Filip Hanik - Dev Lists

On 3/5/2011 5:10 AM, Mark Thomas wrote:

On 04/03/2011 23:46, Filip Hanik - Dev Lists wrote:

Not in here
http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/tomcat/catalina/
what am I missing?

Couple of things.

The artifact IDs were changed for Tomcat 7 so you need to look here:
http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/tomcat/tomcat-catalina/

I've looked back in svn and I know I changed the artifact ID but I can't
remember exactly why. It may have been related to some reorganisation of
the JARs that meant that they didn't have quite the same contents and
dependencies.

Even if the contents in a jar changes a bit, and dependencies change a bit, that is fine, since the version and dependency management of
maven resolves that.

I would have kept the same names.

Despite the ASF repo being called ibiblio-rsync:
http://people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/tomcat/

I think we replicate directly from the ASF to Maven central:
http://repo2.maven.org/maven2/org/apache/tomcat/

given that Maven central has everything and ibiblio seems to be missing
the more recent releases.

yup, see that now.

Filip

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

-
No virus found in this message.
Checked by AVG - www.avg.com
Version: 10.0.1204 / Virus Database: 1435/3482 - Release Date: 03/04/11

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Enhancement to set security-provider within AjpAprProcessor

2011-03-07 Thread pkn...@mtg.de


Hello,

we need support of X.509 certificates using elliptic curves for client-auth 
within an servlet-application.
The certificates we use are coded using DomainParameters within the PublicKey 
object. When using the sun-jdk this will
lead to an error because the sun-jce implementation only supports elliptic 
curves as NamedCurves.

The best way to fix this is to use another security-provider e.g. bouncycastle.
For that we need a way to configure it within tomcat.

I have attached three patch-files as a proposal for this new configuration 
parameter.

Please let me know if this changes can be added in a future release of tomcat.


Yours sincerely
--
Peter Knopp

media transfer AG
Dolivostrasse 11
D-64293 Darmstadt
Germany

Phone :  +49 6151 8193 23
Fax   :  +49 6151 8193 41
E-Mail:  pkn...@mtg.de
WWW   :  www.mtg.de

media transfer AG
Firmensitz: Dolivostr. 11,  64293 Darmstadt
Registergericht: Amtsgericht Darmstadt, HRB 8901
Vorstand: Jürgen Ruf (CEO), Andrea Klenk, Günter Hirschmann
Aufsichtsratsvorsitzender: Dr. Thomas Milde




AjpAprPatch.tgz
Description: Binary data


smime.p7s
Description: S/MIME Cryptographic Signature

Re: [VOTE] Release Apache Tomcat 7.0.10

2011-03-07 Thread Filip Hanik - Dev Lists


On 3/5/2011 7:32 AM, Mark Thomas wrote:

[X] Stable - go ahead and release as 7.0.10 Stable



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078844 - /tomcat/jk/trunk/xdocs/reference/workers.xml

Author: rjung
Date: Mon Mar  7 16:38:18 2011
New Revision: 1078844

URL: http://svn.apache.org/viewvc?rev=1078844view=rev
Log:
Clarify.

Modified:
tomcat/jk/trunk/xdocs/reference/workers.xml

Modified: tomcat/jk/trunk/xdocs/reference/workers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/workers.xml?rev=1078844r1=1078843r2=1078844view=diff
==
--- tomcat/jk/trunk/xdocs/reference/workers.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/workers.xml Mon Mar  7 16:38:18 2011
@@ -945,8 +945,8 @@ This features has been added in bjk 1.
 Using this directive, a balanced worker of a load balancer
 can be configured as disabled or stopped. A disabled worker only gets
 requests, which belong to sessions for that worker. A stopped
-worker does not get any requests. Users will loose their sessions,
-unless session replication via clustering is used.
+worker does not get any requests. Users of a stopped worker will
+loose their sessions, unless session replication via clustering is used.
 p
 Use bd/b or bD/b to disable and bs/b or bS/b to stop.
 If this directive is not present the deprecated directives



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078846 - in /tomcat/jk/trunk: native/common/jk_ajp_common.c native/common/jk_ajp_common.h native/common/jk_lb_worker.c native/common/jk_service.h native/common/jk_util.c xdocs/miscellane

Author: rjung
Date: Mon Mar  7 16:40:20 2011
New Revision: 1078846

URL: http://svn.apache.org/viewvc?rev=1078846view=rev
Log:
Forward worker activation state in load balancer
as request attribute JK_LB_ACTIVATION.

Possible values are ACT (active),
DIS (disabled) and STP (stopped).

Docs update will follow.
This line, and those below, will be ignored--

Mxdocs/miscellaneous/changelog.xml
Mnative/common/jk_service.h
Mnative/common/jk_util.c
Mnative/common/jk_ajp_common.h
Mnative/common/jk_ajp_common.c
Mnative/common/jk_lb_worker.c

Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_ajp_common.h
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/native/common/jk_service.h
tomcat/jk/trunk/native/common/jk_util.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1078846r1=1078845r2=1078846view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Mon Mar  7 16:40:20 2011
@@ -599,6 +599,29 @@ static int ajp_marshal_into_msgb(jk_msg_
 }
 }
 
+/* Forward activation information from the load balancer.
+ * It can be used by the backend to deny access by requests,
+ * which come with a session id but for an invalid session.
+ * Such requests get forwarded to backends even if they
+ * are disabled in the load balancer, because the balancer
+ * does not know, which sessions are valid.
+ * If the backend can check, that is was disabled it can
+ * delete the session cookie and respond with a self-referential
+ * redirect. The new request will then be balanced to some
+ * other node that is not disabled.
+ */
+{
+if (jk_b_append_byte(msg, SC_A_REQ_ATTRIBUTE) ||
+jk_b_append_string(msg, SC_A_JK_LB_ACTIVATION)   ||
+jk_b_append_string(msg, s-activation)) {
+jk_log(l, JK_LOG_ERROR,
+   failed appending the activation state %s,
+   s-activation);
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+}
+
 if (s-num_attributes  0) {
 for (i = 0; i  s-num_attributes; i++) {
 if (jk_b_append_byte(msg, SC_A_REQ_ATTRIBUTE) ||

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.h?rev=1078846r1=1078845r2=1078846view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.h (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.h Mon Mar  7 16:40:20 2011
@@ -79,6 +79,15 @@ extern C
 #define SC_A_REQ_REMOTE_PORT(AJP_REMOTE_PORT)
 
 /*
+ * JK public request attributes
+ *
+ * Activation state of the worker in the load balancer.
+ * Can be any of the JK_LB_ACTIVATION_TEXT_* strings
+ * from jk_lb_worker.h.
+ */
+#define SC_A_JK_LB_ACTIVATION   (JK_LB_ACTIVATION)
+
+/*
  * Request methods, coded as numbers instead of strings.
  * The list of methods was taken from Section 5.1.1 of RFC 2616,
  * RFC 2518, the ACL IETF draft, and the DeltaV IESG Proposed Standard.

Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1078846r1=1078845r2=1078846view=diff
==
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Mon Mar  7 16:40:20 2011
@@ -895,11 +895,11 @@ static int find_best_worker(jk_ws_servic
 return rc;
 }
 
-static lb_sub_worker_t *get_most_suitable_worker(jk_ws_service_t *s,
- lb_worker_t *p,
- char *sessionid,
- int *states,
- jk_logger_t *l)
+static int get_most_suitable_worker(jk_ws_service_t *s,
+lb_worker_t *p,
+char *sessionid,
+int *states,
+jk_logger_t *l)
 {
 int rc = -1;
 int r;
@@ -917,12 +917,12 @@ static lb_sub_worker_t *get_most_suitabl
 if (JK_WORKER_USABLE_STICKY(states[0], activation)) {
 if (activation != JK_LB_ACTIVATION_DISABLED) {
 JK_TRACE_EXIT(l);
-return p-lb_workers;
+return 0;
 }
 }
 else {
 JK_TRACE_EXIT(l);
-return NULL;
+return -1;
 }
 }
 if (p-lblock == JK_LB_LOCK_PESSIMISTIC)
@@ -969,7

svn propchange: r1078846 - svn:log

Author: rjung
Revision: 1078846
Modified property: svn:log

Modified: svn:log at Mon Mar  7 16:42:19 2011
--
--- svn:log (original)
+++ svn:log Mon Mar  7 16:42:19 2011
@@ -5,11 +5,3 @@ Possible values are ACT (active),
 DIS (disabled) and STP (stopped).
 
 Docs update will follow.
-This line, and those below, will be ignored--
-
-Mxdocs/miscellaneous/changelog.xml
-Mnative/common/jk_service.h
-Mnative/common/jk_util.c
-Mnative/common/jk_ajp_common.h
-Mnative/common/jk_ajp_common.c
-Mnative/common/jk_lb_worker.c


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078850 - in /tomcat/trunk/java/org/apache/naming: ContextAccessController.java NameParserImpl.java NamingContextBindingsEnumeration.java NamingContextEnumeration.java NamingService.java

Author: markt
Date: Mon Mar  7 16:46:45 2011
New Revision: 1078850

URL: http://svn.apache.org/viewvc?rev=1078850view=rev
Log:
Fix Eclipse and FindBugs warnings
Removed unused code

Removed:
tomcat/trunk/java/org/apache/naming/NamingService.java
tomcat/trunk/java/org/apache/naming/NamingServiceMBean.java
Modified:
tomcat/trunk/java/org/apache/naming/ContextAccessController.java
tomcat/trunk/java/org/apache/naming/NameParserImpl.java
tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
tomcat/trunk/java/org/apache/naming/NamingContextEnumeration.java
tomcat/trunk/java/org/apache/naming/ServiceRef.java

Modified: tomcat/trunk/java/org/apache/naming/ContextAccessController.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ContextAccessController.java?rev=1078850r1=1078849r2=1078850view=diff
==
--- tomcat/trunk/java/org/apache/naming/ContextAccessController.java (original)
+++ tomcat/trunk/java/org/apache/naming/ContextAccessController.java Mon Mar  7 
16:46:45 2011
@@ -87,11 +87,7 @@ public class ContextAccessController {
 public static boolean checkSecurityToken
 (Object name, Object token) {
 Object refToken = securityTokens.get(name);
-if (refToken == null)
-return (true);
-if ((refToken != null)  (refToken.equals(token)))
-return (true);
-return (false);
+return (refToken == null || refToken.equals(token));
 }
 
 

Modified: tomcat/trunk/java/org/apache/naming/NameParserImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NameParserImpl.java?rev=1078850r1=1078849r2=1078850view=diff
==
--- tomcat/trunk/java/org/apache/naming/NameParserImpl.java (original)
+++ tomcat/trunk/java/org/apache/naming/NameParserImpl.java Mon Mar  7 16:46:45 
2011
@@ -47,6 +47,7 @@ public class NameParserImpl 
  * @return A non-null parsed form of the name using the naming convention 
  * of this parser.
  */
+@Override
 public Name parse(String name)
 throws NamingException {
 return new CompositeName(name);

Modified: 
tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java?rev=1078850r1=1078849r2=1078850view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java 
(original)
+++ tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java 
Mon Mar  7 16:46:45 2011
@@ -67,6 +67,7 @@ public class NamingContextBindingsEnumer
 /**
  * Retrieves the next element in the enumeration.
  */
+@Override
 public Binding next()
 throws NamingException {
 return nextElementInternal();
@@ -76,6 +77,7 @@ public class NamingContextBindingsEnumer
 /**
  * Determines whether there are any more elements in the enumeration.
  */
+@Override
 public boolean hasMore()
 throws NamingException {
 return iterator.hasNext();
@@ -85,16 +87,19 @@ public class NamingContextBindingsEnumer
 /**
  * Closes this enumeration.
  */
+@Override
 public void close()
 throws NamingException {
 }
 
 
+@Override
 public boolean hasMoreElements() {
 return iterator.hasNext();
 }
 
 
+@Override
 public Binding nextElement() {
 try {
 return nextElementInternal();

Modified: tomcat/trunk/java/org/apache/naming/NamingContextEnumeration.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContextEnumeration.java?rev=1078850r1=1078849r2=1078850view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContextEnumeration.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContextEnumeration.java Mon Mar  
7 16:46:45 2011
@@ -58,6 +58,7 @@ public class NamingContextEnumeration 
 /**
  * Retrieves the next element in the enumeration.
  */
+@Override
 public NameClassPair next()
 throws NamingException {
 return nextElement();
@@ -67,6 +68,7 @@ public class NamingContextEnumeration 
 /**
  * Determines whether there are any more elements in the enumeration.
  */
+@Override
 public boolean hasMore()
 throws NamingException {
 return iterator.hasNext();
@@ -76,16 +78,19 @@ public class NamingContextEnumeration 
 /**
  * Closes this enumeration.
  */
+@Override
 public void close()
 throws NamingException {
 }
 
 
+@Override
 public boolean hasMoreElements() {
 return iterator.hasNext();
 }

svn commit: r1078851 - in /tomcat/jk/trunk: native/common/jk_lb_worker.c xdocs/miscellaneous/changelog.xml

Author: rjung
Date: Mon Mar  7 16:47:25 2011
New Revision: 1078851

URL: http://svn.apache.org/viewvc?rev=1078851view=rev
Log:
Revert r1032065: Add support for versioned webapps in Tomcat.

The implementation of versioned webapps changed.
They do no longer encode the version in the session id.

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

Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1078851r1=1078850r2=1078851view=diff
==
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Mon Mar  7 16:47:25 2011
@@ -947,7 +947,7 @@ static int get_most_suitable_worker(jk_w
searching worker for partial sessionid %s,
sessionid);
 session_route = strchr(sessionid, '.');
-while (session_route) {
+if (session_route) {
 ++session_route;
 
 if (JK_IS_DEBUG_LEVEL(l))
@@ -971,7 +971,6 @@ static int get_most_suitable_worker(jk_w
 JK_TRACE_EXIT(l);
 return rc;
 }
-session_route = strchr(session_route, '.');
 }
 /* Try next partial sessionid if present */
 sessionid = next;

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1078851r1=1078850r2=1078851view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Mar  7 16:47:25 2011
@@ -49,11 +49,6 @@
 JK_LB_ACTIVATION. Possible values are ACT (active),
 DIS (disabled) and STP (stopped). (rjung)
   /add
-  add
-LB: Add support for versioned webapps in Tomcat by accepting
-multiple occurances of the route separator character '.' in
-the session id. (rjung)
-  /add
   fix
 bug41263/bug: Support Servlet API getRemotePort().
 Works for Tomcat 5.5.28, 6.0.20 and 7.0.0 and Apache and ISAPI



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 7.0.10

On 07/03/2011 16:28, Filip Hanik - Dev Lists wrote:
 On 3/5/2011 7:32 AM, Mark Thomas wrote:
 [X] Stable - go ahead and release as 7.0.10 Stable

With Filip's vote that makes 3 for stable. Given the security issue I'd
like to get this release out sooner rather than later. With that in mind
I intend to give this vote another 4 hours and then close it.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 7.0.10

2011-03-07 Thread Yoav Shapira

On Sat, Mar 5, 2011 at 9:32 AM, Mark Thomas ma...@apache.org wrote:
 The proposed Apache Tomcat 7.0.10 release is now available for voting.

 It can be obtained from:
 http://people.apache.org/~markt/dev/tomcat-7/v7.0.10/
 The svn tag is:
 http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_10/

 The proposed 7.0.10 release is:

 [ ] Broken - do not release
 [ ] Alpha  - go ahead and release as 7.0.10 Alpha
 [ ] Beta   - go ahead and release as 7.0.10 Beta
 [ X ] Stable - go ahead and release as 7.0.10 Stable

Only a little bit of testing on my end with a home-brew app.  I didn't
run the TCK.

Yoav



 Cheers,

 Mark

 -
 To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
 For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078863 - in /tomcat/trunk/java/org/apache/catalina/core: StandardWrapper.java StandardWrapperFacade.java

Author: markt
Date: Mon Mar  7 17:42:52 2011
New Revision: 1078863

URL: http://svn.apache.org/viewvc?rev=1078863view=rev
Log:
Fix some warnings

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1078863r1=1078862r2=1078863view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Mon Mar  7 
17:42:52 2011
@@ -78,6 +78,7 @@ import org.apache.tomcat.util.modeler.Re
  * @author Remy Maucherat
  * @version $Id$
  */
+@SuppressWarnings(deprecation) // SingleThreadModel
 public class StandardWrapper extends ContainerBase
 implements ServletConfig, Wrapper, NotificationEmitter {
 
@@ -1602,8 +1603,7 @@ public class StandardWrapper extends Con
  *
  * @param mapperClass Java class name of the default Mapper
  */
-protected void addDefaultMapper(
-@SuppressWarnings(unused) String mapperClass) {
+protected void addDefaultMapper(String mapperClass) {
 
 // No need for a default Mapper on a Wrapper
 

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java?rev=1078863r1=1078862r2=1078863view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java Mon 
Mar  7 17:42:52 2011
@@ -68,11 +68,13 @@ public final class StandardWrapperFacade
 // -- ServletConfig Methods
 
 
+@Override
 public String getServletName() {
 return config.getServletName();
 }
 
 
+@Override
 public ServletContext getServletContext() {
 if (context == null) {
 context = config.getServletContext();
@@ -83,11 +85,13 @@ public final class StandardWrapperFacade
 }
 
 
+@Override
 public String getInitParameter(String name) {
 return config.getInitParameter(name);
 }
 
 
+@Override
 public EnumerationString getInitParameterNames() {
 return config.getInitParameterNames();
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Enhancement to set security-provider within AjpAprProcessor

Your patch looks good. Could you please create an issue in Bugzilla
and attach the patch there?

What Tomcat version are you using? Do you expect it in Tomcat 7 or in
some previous version?

https://issues.apache.org/bugzilla/
http://tomcat.apache.org/bugreport.html#Patches_and_enhancement_requests

Best regards,
Konstantin Kolinko

2011/3/7 pkn...@mtg.de pkn...@mtg.de:
 Hello,

 we need support of X.509 certificates using elliptic curves for client-auth
 within an servlet-application.
 The certificates we use are coded using DomainParameters within the
 PublicKey object. When using the sun-jdk this will
 lead to an error because the sun-jce implementation only supports elliptic
 curves as NamedCurves.

 The best way to fix this is to use another security-provider e.g.
 bouncycastle.
 For that we need a way to configure it within tomcat.

 I have attached three patch-files as a proposal for this new configuration
 parameter.

 Please let me know if this changes can be added in a future release of
 tomcat.


 Yours sincerely
 --
    Peter Knopp
 
 media transfer AG
 Dolivostrasse 11
 D-64293 Darmstadt
 Germany

 Phone :  +49 6151 8193 23
 Fax   :  +49 6151 8193 41
 E-Mail:  pkn...@mtg.de
 WWW   :  www.mtg.de

 media transfer AG
 Firmensitz: Dolivostr. 11,  64293 Darmstadt
 Registergericht: Amtsgericht Darmstadt, HRB 8901
 Vorstand: Jürgen Ruf (CEO), Andrea Klenk, Günter Hirschmann
 Aufsichtsratsvorsitzender: Dr. Thomas Milde




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078872 - in /tomcat/jk/trunk/xdocs: generic_howto/loadbalancers.xml miscellaneous/changelog.xml

Author: rjung
Date: Mon Mar  7 18:04:44 2011
New Revision: 1078872

URL: http://svn.apache.org/viewvc?rev=1078872view=rev
Log:
Improve load balancer documentation.

Modified:
tomcat/jk/trunk/xdocs/generic_howto/loadbalancers.xml
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/xdocs/generic_howto/loadbalancers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/generic_howto/loadbalancers.xml?rev=1078872r1=1078871r2=1078872view=diff
==
--- tomcat/jk/trunk/xdocs/generic_howto/loadbalancers.xml (original)
+++ tomcat/jk/trunk/xdocs/generic_howto/loadbalancers.xml Mon Mar  7 18:04:44 
2011
@@ -29,121 +29,181 @@
 body
 section name=Introduction 
 br/
-pA Load balancer is a virtual worker that does not really communicate with 
Tomcat workers.
-Instead it is responsible for the management of several real workers.
-The worker is supposed to be a load balancer if its worker type is blb/b.
-See workers btype/b directive. For a complete reference of all load 
balancer configuration
-items, please consult the worker a 
href=../reference/workers.htmlreference/a.
-The comprehensive status management features of the load balancer together 
with the status worker,
-makes its use an interesting option, even if only combined with a single 
real worker.
-warnAs long as the real workers should only be used via the load balancer 
worker,
-there is no need to also put them into the bworker.list/b property./warn
-/p
-
-subsection name=lb Worker properties
+pA load balancer is a worker that does not directly communicate with Tomcat.
+Instead it is responsible for the management of several real workers,
+called members or sub workers of the load balancer./p
 p
-The load-balancing worker does not really communicate with Tomcat workers.
-Instead it is responsible for the management of several real workers. 
 This management includes:
 /p
-
 ul
 li
 Instantiating the workers in the web server.
 /li
 li
-Using the worker's load-balancing factor, perform weighed-round-robin load 
balancing where 
-high lbfactor means stronger machine (that is going to handle more requests)
+Using the worker's load-balancing factor, perform weighted load balancing
+(distributing load according to defined strengths of the targets).
+/li
+li
+Keeping requests belonging to the same session executing on the same Tomcat
+(session stickyness).
 /li
 li
-Keeping requests belonging to the same session executing on the same Tomcat 
worker.
+Identifying failed Tomcat workers, suspending requests to them and instead
+falling-back on other workers managed by the load balancer.
 /li
 li
-Identifying failed Tomcat workers, suspending requests to them and instead 
falling-back on 
-other workers managed by the lb worker.
+Providing status and load metrics for the load balancer itself and all
+members via the status worker interface.
+/li
+li
+Allowing to dynamically reconfigure load-balancing via the status worker
+interface.
 /li
 /ul
-
 p
-The overall result is that workers managed by the same lb worker are 
load-balanced (based on their lbfactor and current user session) and also 
fall-backed so a single Tomcat process death will not kill the entire site.
+Workers managed by the same load balancer worker are load-balanced
+(based on their configured balancing factors and current request or session 
load)
+and also secured against failure by providing failover to other members of the 
same
+load balancer. So a single Tomcat process death will not kill the entire 
site.
+/p
+pSome of the features provided by a load balancer are even interesting, when
+only working with a single member worker (where load balancing is not 
possible)./p
+
+subsection name=Basic Load Balancer Properties
+pA worker is configured as a load balancer by setting its worker 
codetype/code
+to blb/b.
 /p
-warn
-If you want to use session stickiness, you must set different jvmRoute 
attributes
-in the Engine element in Tomcat's server.xml. Furthermore the names of the 
workers
-which are managed by the balancer have to be equal to the jvmRoute of the 
Tomcat
-instance they connect with.
-/warn
 p
-The following table specifies some properties that the lb worker can accept:
+The following table specifies some properties used to configure a load 
balancer worker:
+/p
 ul
-libbalance_workers/b is a comma separated list of workers that the load 
balancer need to manage. 
-These workers do not need to appear in the worker.list property. This 
directive can be used multiple times for the same load balancer./li
-libsticky_session/b specifies whether requests with SESSION ID's should 
be routed back to the same
-Tomcat worker. You can set sticky_session to False when Tomcat is using a 
Session Manager which
-can persist session data across multiple instances of Tomcat. By default 
sticky_session is set to True./li
+libbalance_workers/b is a comma separated list of names of the member

DO NOT REPLY [Bug 50883] StackOverflowError

https://issues.apache.org/bugzilla/show_bug.cgi?id=50883

Ashish dashashishku...@gmail.com changed:

   What|Removed |Added

 CC||dashashishku...@gmail.com

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Enhancement to set security-provider within AjpAprProcessor

On 07/03/2011 18:01, Konstantin Kolinko wrote:
 Your patch looks good.

The patch raises a couple of questions for me.
 - Security providers are normally configured at the JVM level.
 - Patches that change one of 5 connectors usually mean the other
connectors need changing too
 - There are other places where CertificateFactory is used that may
conflict with this patch.

  Could you please create an issue in Bugzilla
 and attach the patch there?

+1

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48208] allow to configure a custom client certificate Trust Manager in server.xml per connector attribute trustManagerClassName

https://issues.apache.org/bugzilla/show_bug.cgi?id=48208

--- Comment #12 from Konstantin Kolinko knst.koli...@gmail.com 2011-03-07 
13:55:40 EST ---
Regarding implementation in 7.0.x: the tests added in r1078436 in TestCustomSsl
do work with BIO connector, but fail with NIO. I have not tested APR.

Tested with JDK 6u23, WinXP, Ant 1.8.2, trunk @1078628
TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt:

Testsuite: org.apache.tomcat.util.net.TestCustomSsl
Tests run: 3, Failures: 1, Errors: 0, Time elapsed: 7,187 sec
- Standard Error -
(...)
-  ---

Testcase: testCustomSslImplementation took 3,906 sec
Testcase: testCustomTrustManager1 took 1,641 sec
Testcase: testCustomTrustManager2 took 1,64 sec
FAILED
expected:200 but was:-1
junit.framework.AssertionFailedError: expected:200 but was:-1
at
org.apache.tomcat.util.net.TestCustomSsl.doTestCustomTrustManager(TestCustomSsl.java:133)
at
org.apache.tomcat.util.net.TestCustomSsl.testCustomTrustManager2(TestCustomSsl.java:79)

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Tomcat Wiki] Update of PoweredBy by Wen Tian

2011-03-07 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on Tomcat Wiki for change 
notification.

The PoweredBy page has been changed by Wen Tian.
http://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=319rev2=320

--

  
  === eTools.ch ===
  {{http://www.etools.ch/images/logo.gif}} [[http://www.etools.ch/|eTools.ch]] 
is a fast and transparent metasearch engine that simultaneously queries major 
search engines.
+ 
+ === Evocatus ===
+ {{http://c0026397.cdn1.cloudfiles.rackspacecloud.com/logo1.jpg}} 
[[http://evocatus.com/|evocatus.com]] Evocatus helps you find taste products 
you love and discover some new ones along the way. You can share what your 
favorite tastes are and see what others have recommended. We have meticulously 
gone through thousands of taste products and new ones are being added everyday.
  
  === FarmDirectory.org ===
  [[http://www.farmdirectory.org|FarmDirectory.org]] - Connects producers of 
agricultural goods with consumers.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 7.0.10

2011/3/5 Mark Thomas ma...@apache.org:
 The proposed Apache Tomcat 7.0.10 release is now available for voting.

 It can be obtained from:
 http://people.apache.org/~markt/dev/tomcat-7/v7.0.10/
 The svn tag is:
 http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_10/

 The proposed 7.0.10 release is:

 [ ] Broken - do not release
 [ ] Alpha  - go ahead and release as 7.0.10 Alpha
 [ ] Beta   - go ahead and release as 7.0.10 Beta
 [x] Stable - go ahead and release as 7.0.10 Stable


Looks good.

Unit tests all pass for BIO, NIO, APR with JDK 6u24 on WinXP.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

PoweredBy reverted to revision 319 on Tomcat Wiki

2011-03-07 Thread Apache Wiki

Dear wiki user,

You have subscribed to a wiki page Tomcat Wiki for change notification.

The page PoweredBy has been reverted to revision 319 by SebastianBazley.
The comment on this change is: DeSpam.
http://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=320rev2=321

--

  
  === eTools.ch ===
  {{http://www.etools.ch/images/logo.gif}} [[http://www.etools.ch/|eTools.ch]] 
is a fast and transparent metasearch engine that simultaneously queries major 
search engines.
- 
- === Evocatus ===
- {{http://c0026397.cdn1.cloudfiles.rackspacecloud.com/logo1.jpg}} 
[[http://evocatus.com/|evocatus.com]] Evocatus helps you find taste products 
you love and discover some new ones along the way. You can share what your 
favorite tastes are and see what others have recommended. We have meticulously 
gone through thousands of taste products and new ones are being added everyday.
  
  === FarmDirectory.org ===
  [[http://www.farmdirectory.org|FarmDirectory.org]] - Connects producers of 
agricultural goods with consumers.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Tomcat Wiki] Update of LocalBadContent by SebastianBazley

2011-03-07 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on Tomcat Wiki for change 
notification.

The LocalBadContent page has been changed by SebastianBazley.
The comment on this change is: spammer.
http://wiki.apache.org/tomcat/LocalBadContent?action=diffrev1=10rev2=11

--

  envy\.nu
  eseo\.cn
  eukhost\.com
+ evocatus\.com
  exactpages\.com
  fcpages\.com
  feeltime\.cn

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 41263] servletRequest.getRemotePort() returns incorrect value when behind mod_jk

https://issues.apache.org/bugzilla/show_bug.cgi?id=41263

Rainer Jung rainer.j...@kippdata.de changed:

   What|Removed |Added

 Resolution|LATER   |FIXED

--- Comment #7 from Rainer Jung rainer.j...@kippdata.de 2011-03-07 15:45:03 
EST ---
I added automatic forwarding of port info to mod_jk in r1078805.
Will be part of mod_jk 1.2.32.

A getRemotePort() working out of the box without workaround needs mod_jk 1.2.32
and Tomcat 5.5.28, 6.0.20 or 7.0.0 - or newer.

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1078805 - in /tomcat/jk/trunk: native/apache-1.3/ native/apache-2.0/ native/common/ native/iis/ native/netscape/ xdocs/generic_howto/ xdocs/miscellaneous/ xdocs/reference/

2011/3/7  rj...@apache.org:
 Author: rjung
 Date: Mon Mar  7 15:17:11 2011
 New Revision: 1078805

 URL: http://svn.apache.org/viewvc?rev=1078805view=rev
 Log:
 Support Servlet API getRemotePort().

 Works for Tomcat 5.5.28, 6.0.20 and 7.0.0 in
 combination with Apache and ISAPI plugins.

 BZ 41263

 Modified:
    tomcat/jk/trunk/native/apache-1.3/mod_jk.c
    tomcat/jk/trunk/native/apache-2.0/mod_jk.c
    tomcat/jk/trunk/native/common/jk_ajp_common.c
    tomcat/jk/trunk/native/common/jk_ajp_common.h
    tomcat/jk/trunk/native/common/jk_service.h
    tomcat/jk/trunk/native/common/jk_util.c
    tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
    tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c
    tomcat/jk/trunk/xdocs/generic_howto/proxy.xml
    tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
    tomcat/jk/trunk/xdocs/reference/apache.xml


In jk_nsapi_plugin.c:

 --- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
 +++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Mar  7 15:17:11 2011
 @@ -3011,7 +3011,7 @@ static int init_ws_service(isapi_private
     GET_SERVER_VARIABLE_VALUE(REMOTE_USER, s-remote_user);
     GET_SERVER_VARIABLE_VALUE(SERVER_PROTOCOL, s-protocol);
     GET_SERVER_VARIABLE_VALUE(REMOTE_HOST, s-remote_host);
 -    GET_SERVER_VARIABLE_VALUE(REMOTE_ADDR, s-remote_addr);
 +    GET_SERVER_VARIABLE_VALUE(REMOTE_PORT, s-remote_port);
     GET_SERVER_VARIABLE_VALUE(SERVER_NAME, s-server_name);
     GET_SERVER_VARIABLE_VALUE_INT(SERVER_PORT, s-server_port, 80);
     GET_SERVER_VARIABLE_VALUE(SERVER_SOFTWARE, s-server_software);

Was removal of REMOTE_ADDR line above intentional?


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[RESULT] [VOTE] Release Apache Tomcat 7.0.10

The result of the vote is that 7.0.10 should be released as stable.

I'll make the changes shortly, with a plan to announce early tomorrow.

Cheers,

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078978 - in /tomcat/site/trunk: docs/download-70.html docs/index.html docs/security-7.html docs/whichversion.html xdocs/download-70.xml xdocs/index.xml xdocs/security-7.xml xdocs/whichve

Author: markt
Date: Mon Mar  7 22:13:16 2011
New Revision: 1078978

URL: http://svn.apache.org/viewvc?rev=1078978view=rev
Log:
Changes for 7.0.10. I'll make these live once 7.0.10 reaches the mirrors

Modified:
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/download-70.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/security-7.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1078978r1=1078977r2=1078978view=diff
==
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Mon Mar  7 22:13:16 2011
@@ -227,8 +227,8 @@
 p
 blockquote
 a href=http://www.apache.org/dist/tomcat/tomcat-7/KEYS;KEYS/a |
-a href=#7.0.87.0.8/a |
-a href=[preferred]tomcat/tomcat-7/v7.0.8Browse/a |
+a href=#7.0.107.0.10/a |
+a href=[preferred]tomcat/tomcat-7/v7.0.10Browse/a |
 a href=http://archive.apache.org/dist/tomcat/tomcat-7;Archives/a
   /blockquote
 /p
@@ -328,8 +328,8 @@
 tr
 td bgcolor=#525D76
 font color=#ff face=arial,helvetica,sanserif
-a name=7.0.8
-strong7.0.8/strong
+a name=7.0.10
+strong7.0.10/strong
 /a
 /font
 /td
@@ -339,8 +339,8 @@
 p
 blockquote
   p
-  a name=7.0.8Please/a see the 
-  a href=[preferred]tomcat/tomcat-7/v7.0.8/README.htmlREADME/a
+  a name=7.0.10Please/a see the 
+  a href=[preferred]tomcat/tomcat-7/v7.0.10/README.htmlREADME/a
   file for packaging information.  It explains what every distribution 
contains.
   /p
 
@@ -364,95 +364,95 @@
 liCore:
   ul
   li
-a 
href=[preferred]tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8.zipzip/a 
-(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8.zip.asc;pgp/a,
 
-a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8.zip.md5;md5/a)
+a 
href=[preferred]tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10.zipzip/a 
+(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10.zip.asc;pgp/a,
 
+a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10.zip.md5;md5/a)
   /li
   li
-a 
href=[preferred]tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8.tar.gztar.gz/a
 
-(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8.tar.gz.asc;pgp/a,
 
-a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8.tar.gz.md5;md5/a)
+a 
href=[preferred]tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10.tar.gztar.gz/a
 
+(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10.tar.gz.asc;pgp/a,
 
+a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10.tar.gz.md5;md5/a)
   /li
   li
-a 
href=[preferred]tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8-windows-x86.zip32-bit
 Windows zip/a 
-(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8-windows-x86.zip.asc;pgp/a,
 
-a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8-windows-x86.zip.md5;md5/a)
+a 
href=[preferred]tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10-windows-x86.zip32-bit
 Windows zip/a 
+(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10-windows-x86.zip.asc;pgp/a,
 
+a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10-windows-x86.zip.md5;md5/a)
   /li
   li
-a 
href=[preferred]tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8-windows-x64.zip64-bit
 Windows zip/a 
-(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8-windows-x64.zip.asc;pgp/a,
 
-a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8-windows-x64.zip.md5;md5/a)
+a 
href=[preferred]tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10-windows-x64.zip64-bit
 Windows zip/a 
+(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10-windows-x64.zip.asc;pgp/a,
 
+a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.10/bin/apache-tomcat-7.0.10-windows-x64.zip.md5;md5/a)
   /li
   li
-a 
href=[preferred]tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8-windows-i64.zip64-bit
 Itanium Windows zip/a 
-(a

Re: svn commit: r1078863 - in /tomcat/trunk/java/org/apache/catalina/core: StandardWrapper.java StandardWrapperFacade.java

2011/3/7  ma...@apache.org:
 Author: markt
 Date: Mon Mar  7 17:42:52 2011
 New Revision: 1078863

 URL: http://svn.apache.org/viewvc?rev=1078863view=rev
 Log:
 Fix some warnings

 Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
    tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java


 --- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
 +++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Mon Mar  
 7 17:42:52 2011
 @@ -78,6 +78,7 @@ import org.apache.tomcat.util.modeler.Re
  * @author Remy Maucherat
  * @version $Id$
  */
 +@SuppressWarnings(deprecation) // SingleThreadModel
  public class StandardWrapper extends ContainerBase
     implements ServletConfig, Wrapper, NotificationEmitter {

 @@ -1602,8 +1603,7 @@ public class StandardWrapper extends Con
      *
      * @param mapperClass Java class name of the default Mapper
      */
 -    protected void addDefaultMapper(
 -            @SuppressWarnings(unused) String mapperClass) {
 +    protected void addDefaultMapper(String mapperClass) {

         // No need for a default Mapper on a Wrapper


It looks like the StandardWrapper.addDefaultMapper() method can be
removed as a whole.

(A protected method that is never called, does not @Override anything,
and does nothing).

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078981 - in /tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties StandardWrapper.java

Author: markt
Date: Mon Mar  7 22:18:02 2011
New Revision: 1078981

URL: http://svn.apache.org/viewvc?rev=1078981view=rev
Log:
Remove unused code

Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1078981r1=1078980r2=1078981view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Mon Mar  
7 22:18:02 2011
@@ -59,7 +59,6 @@ aprListener.aprDestroy=Failed shutdown o
 aprListener.sslInit=Failed to initialize the SSLEngine.
 aprListener.tcnValid=Loaded APR based Apache Tomcat Native library {0}.
 aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters 
[{2}], random [{3}].
-containerBase.addDefaultMapper=Exception configuring default mapper of class 
{0}
 containerBase.alreadyStarted=Container {0} has already been started
 containerBase.notConfigured=No basic Valve has been configured
 containerBase.notStarted=Container {0} has not been started

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1078981r1=1078980r2=1078981view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Mon 
Mar  7 22:18:02 2011
@@ -37,7 +37,6 @@ aprListener.aprDestroy = No pude apagar 
 aprListener.sslInit = No pude inicializar el SSLEngine (Motor SSL)
 aprListener.tcnValid = Cargada la biblioteca nativa APR de Apache Tomcat {0}
 aprListener.flags = Capacidades APR\: IPv6 [{0}], enviar fichero [{1}], 
aceptar filtros [{2}], aleatorio [{3}].
-containerBase.addDefaultMapper = Excepci\u00f3n configurando mapeador por 
defecto de clase {0}
 containerBase.alreadyStarted = Ya ha sido arrancado el Contenedor {0}
 containerBase.notConfigured = No se ha configurado V\u00e1lvula b\u00e1sica
 containerBase.notStarted = No se ha arrancado el Contenedor {0}

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1078981r1=1078980r2=1078981view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties Mon 
Mar  7 22:18:02 2011
@@ -27,7 +27,6 @@ applicationRequest.badParent=Impossible 
 applicationRequest.badRequest=La requ\u00eate n''est pas une 
javax.servlet.ServletRequestWrapper
 applicationResponse.badParent=Impossible de trouver une impl\u00e9mentation 
r\u00e9ponse parente (parent response)
 applicationResponse.badResponse=La r\u00e9ponse n''est pas une 
javax.servlet.ServletResponseWrapper
-containerBase.addDefaultMapper=Exception lors de la configuration du routeur 
par d\u00e9faut (default mapper) pour la classe {0}
 containerBase.alreadyStarted=Le conteneur {0} a d\u00e9j\u00e0 \u00e9t\u00e9 
d\u00e9marr\u00e9
 containerBase.notConfigured=Aucune Valve basique (basic valve) n''a 
\u00e9t\u00e9 configur\u00e9e
 containerBase.notStarted=Le conteneur {0} n''a pas \u00e9t\u00e9 
d\u00e9marr\u00e9

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties?rev=1078981r1=1078980r2=1078981view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties Mon 
Mar  7 22:18:02 2011
@@ -28,7 +28,6 @@ applicationRequest.badParent=\u89aa\u306
 
applicationRequest.badRequest=\u30ea\u30af\u30a8\u30b9\u30c8\u304cjavax.servlet.ServletRequestWrapper\u3067\u306f\u3042\u308a\u307e\u305b\u3093
 
applicationResponse.badParent=\u89aa\u306e\u30ec\u30b9\u30dd\u30f3\u30b9\u5b9f\u88c5\u3092\u914d\u7f6e\u3067\u304d\u307e\u305b\u3093
 
applicationResponse.badResponse=\u30ec\u30b9\u30dd\u30f3\u30b9\u304cjavax.servlet.ServletResponseWrapper\u3067\u306f\u3042\u308a\u307e\u305b\u3093

Re: svn commit: r1078863 - in /tomcat/trunk/java/org/apache/catalina/core: StandardWrapper.java StandardWrapperFacade.java

On 07/03/2011 22:14, Konstantin Kolinko wrote:
 It looks like the StandardWrapper.addDefaultMapper() method can be
 removed as a whole.
 
 (A protected method that is never called, does not @Override anything,
 and does nothing).

Unlike me to miss an opportunity to delete something :)

Thanks for that. It is gone along with some related i18n messages.

Cheers,

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1078978 - in /tomcat/site/trunk: docs/download-70.html docs/index.html docs/security-7.html docs/whichversion.html xdocs/download-70.xml xdocs/index.xml xdocs/security-7.xml xdocs/whi

2011/3/8  ma...@apache.org:
 Author: markt
 Date: Mon Mar  7 22:13:16 2011
 New Revision: 1078978

 URL: http://svn.apache.org/viewvc?rev=1078978view=rev
 Log:
 Changes for 7.0.10. I'll make these live once 7.0.10 reaches the mirrors

 Modified:
    tomcat/site/trunk/docs/download-70.html
    tomcat/site/trunk/docs/index.html
    tomcat/site/trunk/docs/security-7.html
    tomcat/site/trunk/docs/whichversion.html
    tomcat/site/trunk/xdocs/download-70.xml
    tomcat/site/trunk/xdocs/index.xml
    tomcat/site/trunk/xdocs/security-7.xml
    tomcat/site/trunk/xdocs/whichversion.xml


 --- tomcat/site/trunk/xdocs/security-7.xml (original)
 +++ tomcat/site/trunk/xdocs/security-7.xml Mon Mar  7 22:13:16 2011
 @@ -25,6 +25,31 @@
        a href=mailto:secur...@tomcat.apache.org;Tomcat Security 
 Team/a./p
   /section

 +  section name=Fixed in Apache Tomcat 7.0.10 (released 4 Mar 2011)

7 or 8 Mar 2011?
(that is 8th for me already)

[VOTE] was started on 5 Mar. (Sat, 05 Mar 2011 14:32:27 +)


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1078987 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Author: rjung
Date: Mon Mar  7 22:24:05 2011
New Revision: 1078987

URL: http://svn.apache.org/viewvc?rev=1078987view=rev
Log:
Put back line unintentionally removed by r1078805.

Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1078987r1=1078986r2=1078987view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Mar  7 22:24:05 2011
@@ -3011,6 +3011,7 @@ static int init_ws_service(isapi_private
 GET_SERVER_VARIABLE_VALUE(REMOTE_USER, s-remote_user);
 GET_SERVER_VARIABLE_VALUE(SERVER_PROTOCOL, s-protocol);
 GET_SERVER_VARIABLE_VALUE(REMOTE_HOST, s-remote_host);
+GET_SERVER_VARIABLE_VALUE(REMOTE_ADDR, s-remote_addr);
 GET_SERVER_VARIABLE_VALUE(REMOTE_PORT, s-remote_port);
 GET_SERVER_VARIABLE_VALUE(SERVER_NAME, s-server_name);
 GET_SERVER_VARIABLE_VALUE_INT(SERVER_PORT, s-server_port, 80);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1078805 - in /tomcat/jk/trunk: native/apache-1.3/ native/apache-2.0/ native/common/ native/iis/ native/netscape/ xdocs/generic_howto/ xdocs/miscellaneous/ xdocs/reference/

2011-03-07 Thread Rainer Jung


On 07.03.2011 22:56, Konstantin Kolinko wrote:

2011/3/7rj...@apache.org:
In jk_nsapi_plugin.c:


--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Mar  7 15:17:11 2011
@@ -3011,7 +3011,7 @@ static int init_ws_service(isapi_private
 GET_SERVER_VARIABLE_VALUE(REMOTE_USER, s-remote_user);
 GET_SERVER_VARIABLE_VALUE(SERVER_PROTOCOL, s-protocol);
 GET_SERVER_VARIABLE_VALUE(REMOTE_HOST, s-remote_host);
-GET_SERVER_VARIABLE_VALUE(REMOTE_ADDR, s-remote_addr);
+GET_SERVER_VARIABLE_VALUE(REMOTE_PORT, s-remote_port);
 GET_SERVER_VARIABLE_VALUE(SERVER_NAME, s-server_name);
 GET_SERVER_VARIABLE_VALUE_INT(SERVER_PORT, s-server_port, 80);
 GET_SERVER_VARIABLE_VALUE(SERVER_SOFTWARE, s-server_software);


Was removal of REMOTE_ADDR line above intentional?


Oups, no. Fixed in r1078987. Thanks for your review.

Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1079000 - in /tomcat/site/trunk: docs/security-7.html xdocs/security-7.xml

Author: markt
Date: Mon Mar  7 22:36:59 2011
New Revision: 1079000

URL: http://svn.apache.org/viewvc?rev=1079000view=rev
Log:
Fix release date

Modified:
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/xdocs/security-7.xml

Modified: tomcat/site/trunk/docs/security-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1079000r1=1078999r2=1079000view=diff
==
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Mon Mar  7 22:36:59 2011
@@ -201,7 +201,7 @@
 a href=#Apache_Tomcat_7.x_vulnerabilitiesApache Tomcat 7.x 
vulnerabilities/a
 /li
 li
-a href=#Fixed_in_Apache_Tomcat_7.0.10_(released_4_Mar_2011)Fixed in Apache 
Tomcat 7.0.10 (released 4 Mar 2011)/a
+a href=#Fixed_in_Apache_Tomcat_7.0.10_(released_8_Mar_2011)Fixed in Apache 
Tomcat 7.0.10 (released 8 Mar 2011)/a
 /li
 li
 a href=#Fixed_in_Apache_Tomcat_7.0.8_(released_5_Feb_2011)Fixed in Apache 
Tomcat 7.0.8 (released 5 Feb 2011)/a
@@ -273,11 +273,11 @@
 tr
 td bgcolor=#525D76
 font color=#ff face=arial,helvetica,sanserif
-a name=Fixed in Apache Tomcat 7.0.10 (released 4 Mar 2011)
+a name=Fixed in Apache Tomcat 7.0.10 (released 8 Mar 2011)
 !--()--
 /a
-a name=Fixed_in_Apache_Tomcat_7.0.10_(released_4_Mar_2011)
-strongFixed in Apache Tomcat 7.0.10 (released 4 Mar 2011)/strong
+a name=Fixed_in_Apache_Tomcat_7.0.10_(released_8_Mar_2011)
+strongFixed in Apache Tomcat 7.0.10 (released 8 Mar 2011)/strong
 /a
 /font
 /td

Modified: tomcat/site/trunk/xdocs/security-7.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1079000r1=1078999r2=1079000view=diff
==
--- tomcat/site/trunk/xdocs/security-7.xml (original)
+++ tomcat/site/trunk/xdocs/security-7.xml Mon Mar  7 22:36:59 2011
@@ -25,7 +25,7 @@
a href=mailto:secur...@tomcat.apache.org;Tomcat Security 
Team/a./p
   /section
 
-  section name=Fixed in Apache Tomcat 7.0.10 (released 4 Mar 2011)
+  section name=Fixed in Apache Tomcat 7.0.10 (released 8 Mar 2011)
 
 pstrongImportant: Security constraint bypass/strong
a href=http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1088;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1078978 - in /tomcat/site/trunk: docs/download-70.html docs/index.html docs/security-7.html docs/whichversion.html xdocs/download-70.xml xdocs/index.xml xdocs/security-7.xml xdocs/whi

On 07/03/2011 22:21, Konstantin Kolinko wrote:

 +  section name=Fixed in Apache Tomcat 7.0.10 (released 4 Mar 2011)
 
 7 or 8 Mar 2011?
 (that is 8th for me already)

Fixed. It will be the 8th when announced.

Cheers,

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DefaultServlet and getWriter()/getInputStream()

Hi!

Regarding the issue we discussed recently about issue 50748,
Content-Length header and DefaultServlet.

Usually DefaultServlet serves the content using an OutputStream, but
if getWriter() was already called, the stream will not be available
and ISE will be thrown.

There is a workaround implemented for that:

In DefaultServlet#serveResource(..):

try {
ostream = response.getOutputStream();
} catch (IllegalStateException e) {
// If it fails, we try to get a Writer instead if we're
// trying to serve a text file
if ( (contentType == null)
|| (contentType.startsWith(text))
|| (contentType.endsWith(xml)) ) {
writer = response.getWriter();
} else {
throw e;
}
}


I think that if we fall back to using a Writer, the content-length
header must not be set by the DefaultServlet in the lines that follow
the above block of code.


That said, I am not sure why anybody should rely on DefaultServlet
being able to serve the resource in this case at all.  It is a nice
feature, though.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: DefaultServlet and getWriter()/getInputStream()

On 07/03/2011 22:52, Konstantin Kolinko wrote:
 Hi!
 
 Regarding the issue we discussed recently about issue 50748,
 Content-Length header and DefaultServlet.
 
 Usually DefaultServlet serves the content using an OutputStream, but
 if getWriter() was already called, the stream will not be available
 and ISE will be thrown.
 
 There is a workaround implemented for that:
 
 In DefaultServlet#serveResource(..):
 
 try {
 ostream = response.getOutputStream();
 } catch (IllegalStateException e) {
 // If it fails, we try to get a Writer instead if we're
 // trying to serve a text file
 if ( (contentType == null)
 || (contentType.startsWith(text))
 || (contentType.endsWith(xml)) ) {
 writer = response.getWriter();
 } else {
 throw e;
 }
 }
 
 
 I think that if we fall back to using a Writer, the content-length
 header must not be set by the DefaultServlet in the lines that follow
 the above block of code.

On what basis? It is just as likely that a Filter has called
getOutputStream() as it is it called getWriter(). The Default Servlet
has a 50/50 chance of calling the 'right' one first.

 That said, I am not sure why anybody should rely on DefaultServlet
 being able to serve the resource in this case at all.  It is a nice
 feature, though.

It has to be able to handle both cases where a Filter calls getWriter()
or getOutputStream()?

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: DefaultServlet and getWriter()/getInputStream()

2011/3/8 Mark Thomas ma...@apache.org:
 On 07/03/2011 22:52, Konstantin Kolinko wrote:
 Hi!

 Regarding the issue we discussed recently about issue 50748,
 Content-Length header and DefaultServlet.

 Usually DefaultServlet serves the content using an OutputStream, but
 if getWriter() was already called, the stream will not be available
 and ISE will be thrown.

 There is a workaround implemented for that:

 In DefaultServlet#serveResource(..):

             try {
                 ostream = response.getOutputStream();
             } catch (IllegalStateException e) {
                 // If it fails, we try to get a Writer instead if we're
                 // trying to serve a text file
                 if ( (contentType == null)
                         || (contentType.startsWith(text))
                         || (contentType.endsWith(xml)) ) {
                     writer = response.getWriter();
                 } else {
                     throw e;
                 }
             }


 I think that if we fall back to using a Writer, the content-length
 header must not be set by the DefaultServlet in the lines that follow
 the above block of code.

 On what basis? It is just as likely that a Filter has called
 getOutputStream() as it is it called getWriter(). The Default Servlet
 has a 50/50 chance of calling the 'right' one first.


I thought about if (ostream != null) test before
response.setContentLength( ) call.

On second thought though, OK,
 I agree that it does not help much.


If some content was added before DefaultServlet was called:

1) We will not be able to process HEAD requests correctly.

In those cases we do not serve the resource, but Content-Length header
is returned.

Returning the content-length header consistently (and trimming the
output by that length) is the best what we can do here.


2) Support for the Content-Range header will be broken. (Unless
turned off in DefaultServlet configuration).

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1078595 - /tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java

2011/3/7  ma...@apache.org:
 Author: markt
 Date: Sun Mar  6 22:02:28 2011
 New Revision: 1078595

 URL: http://svn.apache.org/viewvc?rev=1078595view=rev
 Log:
 Clean-up, mainly unused code

 Modified:
    
 tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java


Apparently it was the alternative method to configure protocol handler
for the jndi: URLs,  instead of using a custom URLStreamHandlerFactory
implementation, as documented in JavaDoc for constructors of
java.net.URL. [1]

It worked together with the following class (already removed from
Tomcat 7, but present in 6.0):

 org.apache.naming.resources.jndi.Handler

(removed in http://svn.apache.org/viewvc?rev=1078798view=rev )

The current method that Tomcat uses is to call static method
URL.setURLStreamHandlerFactory( ) which is done in
WebappLoader.startInternal().


I think that I do not mind removing this feature from Tomcat 7, but I
wonder whether it were useful in some embedded scenarios,  where
container app has its own system-wide URLStreamHandlerFactory.

Removal of the below code is not crucial for such a use case (as the
app can update the system property by itself),  but removal of the
Handler class is crucial.


[1] 
http://download.oracle.com/javase/1.4.2/docs/api/java/net/URL.html#URL%28java.lang.String,%20java.lang.String,%20int,%20java.lang.String%29
[2] 
http://download.oracle.com/javase/6/docs/api/java/net/URL.html#URL%28java.lang.String,%20java.lang.String,%20int,%20java.lang.String%29


Best regards,
Konstantin Kolinko


 Modified: 
 tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java?rev=1078595r1=1078594r2=1078595view=diff
 ==
 --- 
 tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java 
 (original)
 +++ 
 tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java 
 Sun Mar  6 22:02:28 2011
 @@ -31,8 +31,7 @@ import javax.naming.directory.DirContext
  * @author a href=mailto:r...@apache.org;Remy Maucherat/a
  * @version $Revision$
  */
 -public class DirContextURLStreamHandler
 -    extends URLStreamHandler {
 +public class DirContextURLStreamHandler extends URLStreamHandler {


     // --- 
 Constructors
 @@ -134,21 +133,6 @@ public class DirContextURLStreamHandler


     /**
 -     * Set the java.protocol.handler.pkgs system property.
 -     */
 -    public static void setProtocolHandler() {
 -        String value = 
 System.getProperty(Constants.PROTOCOL_HANDLER_VARIABLE);
 -        if (value == null) {
 -            value = Constants.Package;
 -            System.setProperty(Constants.PROTOCOL_HANDLER_VARIABLE, value);
 -        } else if (value.indexOf(Constants.Package) == -1) {
 -            value += | + Constants.Package;
 -            System.setProperty(Constants.PROTOCOL_HANDLER_VARIABLE, value);
 -        }
 -    }
 -
 -
 -    /**
      * Returns true if the thread or the context class loader of the current
      * thread is bound.
      */


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48208] allow to configure a custom client certificate Trust Manager in server.xml per connector attribute trustManagerClassName

https://issues.apache.org/bugzilla/show_bug.cgi?id=48208

--- Comment #13 from Konstantin Kolinko knst.koli...@gmail.com 2011-03-07 
21:26:55 EST ---
(In reply to comment #10)
 Created an attachment (id=26732)
 -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26732) [details]
 Proposed patch for Tomcat 6

Regarding this patch for tc6:

When trustManageClassName is specified, there is a lot of work to get and
configure a TrustManagerFactory instance (tmf) in
JSSESocketFactory#getTrustManagers() and then that getTrustManagers() method
just ignores this tmf instance.

The documentation update part of the patch says that If this attribute is set,
the trust store attributes may be ignored. but with the current code they
actually cannot be ignored because that (unneeded) tmf.init() call is likely to
fail if those values are bogus.

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50885] New: JspServletWrapper can call destroy() on a JSP page that is still in service()