DO NOT REPLY [Bug 47714] Reponse mixed between users

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47714

ronanker r...@viragegroup.com changed:

   What|Removed |Added

 CC||r...@viragegroup.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



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

2010-04-20 Thread kkolinko
Author: kkolinko
Date: Tue Apr 20 14:35:33 2010
New Revision: 935941

URL: http://svn.apache.org/viewvc?rev=935941view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
and avoid https://issues.apache.org/bugzilla/show_bug.cgi?id=48616
Fix compilation error with some nested tag files and simple tags.
Do not declare or synchronize scripting variables for JSP fragments
since they are scriptless.

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

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=935941r1=935940r2=935941view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Apr 20 14:35:33 2010
@@ -42,13 +42,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, rjung
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
-  Fix compilation error with some nested tag files and simple tags
-  https://issues.apache.org/bugzilla/show_bug.cgi?id=48616#c22
-  (https://issues.apache.org/bugzilla/attachment.cgi?id=24993)
-  +1: kkolinko, markt, jfclere
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041
   Threading issue in class loading plus fix for
   https://issues.apache.org/bugzilla/show_bug.cgi?id=48694 a potential deadlock

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=935941r1=935940r2=935941view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Apr 20 
14:35:33 2010
@@ -80,6 +80,12 @@
   subsection name=Jasper
 changelog
   fix
+bug42390/bug, bug48616/bug: Fix compilation error with some
+nested tag files and simple tags. Do not declare or synchronize
+scripting variables for JSP fragments since they are scriptless.
+(kkolinko)
+  /fix
+  fix
 bug48701/bug: Add a system property to allow disabling enforcement
 of JSP.5.3. The specification recommends, but does not require, this
 enforcement. (kkolinko)

Modified: 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java?rev=935941r1=935940r2=935941view=diff
==
--- 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java 
(original)
+++ 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java 
Tue Apr 20 14:35:33 2010
@@ -311,6 +311,9 @@ class Generator {
 }
 
 public void visit(Node.CustomTag n) throws JasperException {
+// XXX - Actually there is no need to declare those
+// _jspx_ + varName + _ + nestingLevel variables when we 
are
+// inside a JspFragment.
 
 if (n.getCustomNestingLevel()  0) {
 TagVariableInfo[] tagVarInfos = n.getTagVariableInfos();
@@ -2476,6 +2479,11 @@ class Generator {
 }
 
 private void declareScriptingVars(Node.CustomTag n, int scope) {
+if (isFragment) {
+// No need to declare Java variables, if we inside a
+// JspFragment, because a fragment is always scriptless.
+return;
+}
 
 Vector vec = n.getScriptingVars(scope);
 if (vec != null) {
@@ -2525,6 +2533,14 @@ class Generator {
 if (n.getCustomNestingLevel() == 0) {
 return;
 }
+if (isFragment) {
+// No need to declare Java variables, if we inside a
+// JspFragment, because a fragment is always scriptless.
+// Thus, there is no need to save/ restore/ sync them.
+// Note, that JspContextWrapper.syncFoo() methods will take
+// care of saving/ restoring/ sync'ing of JspContext 
attributes.
+return;
+}
 
 TagVariableInfo[] tagVarInfos = n.getTagVariableInfos();
 VariableInfo[] varInfos = n.getVariableInfos();
@@ -2586,6 +2602,14 @@ class Generator {
 if (n.getCustomNestingLevel() == 0) {
 return;
 }
+if (isFragment) {
+// No need to declare Java variables, if we inside a
+// JspFragment, because a fragment is always scriptless.
+// Thus, there is no need to save/ restore/ sync them.
+  

DO NOT REPLY [Bug 42390] JSP compilation error with nested tagfile tags with variables with AT_BEGIN scope

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=42390

Konstantin Kolinko knst.koli...@gmail.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #10 from Konstantin Kolinko knst.koli...@gmail.com 2010-04-20 
10:37:43 EDT ---
This issue was fixed in 5.5.x in r935941 and will be in 5.5.30 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 48616] Struts 1.2 and bean:define tag throws jsp 1.1 regression exception

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48616

Konstantin Kolinko knst.koli...@gmail.com changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #28 from Konstantin Kolinko knst.koli...@gmail.com 2010-04-20 
10:38:33 EDT ---
This patch was applied to 5.5.x in r935941 and will be in 5.5.30 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



svn commit: r935947 - in /tomcat/tc5.5.x/trunk: ./ container/catalina/src/share/org/apache/catalina/loader/ container/webapps/docs/ jasper/src/share/org/apache/jasper/servlet/

2010-04-20 Thread kkolinko
Author: kkolinko
Date: Tue Apr 20 14:53:28 2010
New Revision: 935947

URL: http://svn.apache.org/viewvc?rev=935947view=rev
Log:
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44041
and avoid http://issues.apache.org/bugzilla/show_bug.cgi?id=48694
Fix duplicate class definition under load. Avoid possible deadlocks.

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

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/ResourceEntry.java

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

tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/servlet/JasperLoader.java

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=935947r1=935946r2=935947view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Apr 20 14:53:28 2010
@@ -42,19 +42,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, rjung
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041
-  Threading issue in class loading plus fix for
-  https://issues.apache.org/bugzilla/show_bug.cgi?id=48694 a potential deadlock
-  http://people.apache.org/~markt/patches/2010-03-25-bug44041.patch
-  +1: markt, kkolinko, jfclere
-  -1: 
-
-  Mark ResourceEntry.loadedClass as volatile.
-  http://svn.apache.org/viewvc?rev=927877view=rev
-  +1: kkolinko, markt, rjung
-  -1:
-
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47878
   Return 404's rather than a permanent 500 if a JSP is deleted
   Make sure first response post deletion is correct

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/ResourceEntry.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/ResourceEntry.java?rev=935947r1=935946r2=935947view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/ResourceEntry.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/ResourceEntry.java
 Tue Apr 20 14:53:28 2010
@@ -47,7 +47,7 @@ public class ResourceEntry {
 /**
  * Loaded class.
  */
-public Class loadedClass = null;
+public volatile Class loadedClass = null;
 
 
 /**

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=935947r1=935946r2=935947view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
 Tue Apr 20 14:53:28 2010
@@ -944,9 +944,7 @@ public class WebappClassLoader
 }
 if ((clazz == null)  hasExternalRepositories) {
 try {
-synchronized (this) {
-clazz = super.findClass(name);
-}
+clazz = super.findClass(name);
 } catch(AccessControlException ace) {
 log.warn(WebappClassLoader.findClassInternal( + name
 + ) security exception:  + ace.getMessage(), 
ace);
@@ -1311,7 +1309,7 @@ public class WebappClassLoader
  *
  * @exception ClassNotFoundException if the class was not found
  */
-public Class loadClass(String name, boolean resolve)
+public synchronized Class loadClass(String name, boolean resolve)
 throws ClassNotFoundException {
 
 if (log.isDebugEnabled())

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=935947r1=935946r2=935947view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Apr 20 
14:53:28 2010
@@ -51,6 +51,11 @@
   subsection name=Catalina
 changelog
   fix
+bug44041/bug, bug48694/bug: Fix duplicate class definition
+under load. Avoid possible deadlock in class loading.
+(markt/kkolinko)
+  /fix
+  fix
 bug47774/bug: Ensure web application class loader is used when 
 calling session listeners. (kfujino)
   /fix

Modified: 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/servlet/JasperLoader.java
URL: 

svn commit: r935959 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-20 Thread kkolinko
Author: kkolinko
Date: Tue Apr 20 15:18:50 2010
New Revision: 935959

URL: http://svn.apache.org/viewvc?rev=935959view=rev
Log:
Add comment. This is to not forget to close BZ 44041 which is not mentioned in 
proposal.
Still waiting for the third vote here.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=935959r1=935958r2=935959view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 20 15:18:50 2010
@@ -150,6 +150,11 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
+  Note: (kkolinko): Applied to 5.5.x in r935947. The above patches address
+  BZ 44041, BZ 48903, BZ 48694. Those three issues are to be marked as 
RESOLVED,
+  when these patches are applied.
+
+
 * Correct SSL session timeout attribute name
   http://people.apache.org/~markt/patches/2010-04-07-SslSessionTimeout.patch
   +1: markt



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



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

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44041

--- Comment #15 from Konstantin Kolinko knst.koli...@gmail.com 2010-04-20 
11:20:17 EDT ---
The issue was fixed in 5.5.x in r935947 and will be in 5.5.30 onwards.

The patch for 6.0.x mentioned in Comment 13 is tracked as bug 48903. As of now,
it has been proposed for 6.0.x, but has not been applied yet.

-- 
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 48694] WebappClassLoader deadlock if web application uses it's own classloader

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48694

Konstantin Kolinko knst.koli...@gmail.com changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||DUPLICATE

--- Comment #14 from Konstantin Kolinko knst.koli...@gmail.com 2010-04-20 
11:26:18 EDT ---
The issue (both the original one, and the one in Comment 5 and below) was fixed
in 5.5.x in r935947 and will be in 5.5.30 onwards.

The issue in Comment 5 and below has not been fixed in 6.0.x yet, but the patch
is already proposed. It is tracked as bug 48903. Thus, I am closing this one.

*** This bug has been marked as a duplicate of bug 48903 ***

-- 
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 48903] ClassLoader deadlock when compiling JSP pages in 6.0.26

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48903

Konstantin Kolinko knst.koli...@gmail.com changed:

   What|Removed |Added

 CC||eugene.petre...@jetbrains.c
   ||om

--- Comment #7 from Konstantin Kolinko knst.koli...@gmail.com 2010-04-20 
11:26:18 EDT ---
*** Bug 48694 has been marked as a duplicate of this bug. ***

-- 
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 48903] ClassLoader deadlock when compiling JSP pages in 6.0.26

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48903

--- Comment #8 from Konstantin Kolinko knst.koli...@gmail.com 2010-04-20 
11:27:55 EDT ---
The issue was fixed in 5.5.x in r935947 and will be in 5.5.30 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 49158] New: More than one JSESSIONID cookie headers set

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49158

   Summary: More than one JSESSIONID cookie headers set
   Product: Tomcat 6
   Version: 6.0.26
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: fha...@apache.org


The following JSP

%
  session.invalidate();
  session = request.getSession();
  session.invalidate();
  session = request.getSession();
%
Done!


Generates this response from Apache Tomcat
HTTP/1.x 200 OK

Server: Apache-Coyote/1.1

Set-Cookie: JSESSIONID=8C65C3AB20B8BBD15788B67983B1; Path=; HttpOnly

Set-Cookie: JSESSIONID=498BD2E8B22C5121143B7305A0ECB249; Path=; HttpOnly

Set-Cookie: JSESSIONID=49F58AE7833522293F8EAD2AB2D13F19; Path=; HttpOnly

Content-Type: text/html;charset=ISO-8859-1

Content-Length: 7

Date: Tue, 20 Apr 2010 15:38:47 GMT

-- 
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: [RESULT] [VOTE] Release build 5.5.29

2010-04-20 Thread Mark Thomas
On 31/03/2010 14:52, Filip Hanik - Dev Lists wrote:
 The candidates binaries are available here:
 http://people.apache.org/~fhanik/tomcat/tomcat-5.5/v5.5.29/

With 4 binding +1s (fhanik, jimjag, kkolinko and markt) the release vote
has passed.

Mark



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



svn commit: r935974 - in /tomcat/site/trunk: docs/doap_Tomcat.rdf docs/download-55.html docs/security-5.html docs/whichversion.html xdocs/doap_Tomcat.rdf xdocs/download-55.xml xdocs/security-5.xml xdo

2010-04-20 Thread markt
Author: markt
Date: Tue Apr 20 16:03:22 2010
New Revision: 935974

URL: http://svn.apache.org/viewvc?rev=935974view=rev
Log:
Release 5.5.29

Modified:
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-55.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-55.xml
tomcat/site/trunk/xdocs/security-5.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=935974r1=935973r2=935974view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Tue Apr 20 16:03:22 2010
@@ -31,22 +31,15 @@ Apache Tomcat powers numerous large-scal
 release
   Version
 nameLatest Stable 6.0.x Release/name
-created2008-07-31/created
-revision6.0.18/revision
+created2010-03-12/created
+revision6.0.26/revision
   /Version
 /release
 release
   Version
 nameLatest Stable 5.5.x release/name
-created2008-09-08/created
-revision5.5.27/revision
-  /Version
-/release
-release
-  Version
-nameLatest Stable 4.1.x release/name
-created2008-02-12/created
-revision4.1.37/revision
+created2010-04-20/created
+revision5.5.29/revision
   /Version
 /release
 repository

Modified: tomcat/site/trunk/docs/download-55.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=935974r1=935973r2=935974view=diff
==
--- tomcat/site/trunk/docs/download-55.html (original)
+++ tomcat/site/trunk/docs/download-55.html Tue Apr 20 16:03:22 2010
@@ -215,8 +215,8 @@
 p
 blockquote
 a href=http://www.apache.org/dist/tomcat/tomcat-5/KEYS;KEYS/a |
-a href=#5.5.285.5.28/a |
-a href=[preferred]/tomcat/tomcat-5/v5.5.28Browse/a |
+a href=#5.5.295.5.29/a |
+a href=[preferred]/tomcat/tomcat-5/v5.5.29Browse/a |
 a href=http://archive.apache.org/dist/tomcat/tomcat-5;Archives/a
   /blockquote
 /p
@@ -313,8 +313,8 @@
 tr
 td bgcolor=#525D76
 font color=#ff face=arial,helvetica,sanserif
-a name=5.5.28
-strong5.5.28/strong
+a name=5.5.29
+strong5.5.29/strong
 /a
 /font
 /td
@@ -324,8 +324,8 @@
 p
 blockquote
   p
-  a name=5.5.28Please/a see the 
-  a href=[preferred]/tomcat/tomcat-5/v5.5.28/README.htmlREADME/a
+  a name=5.5.29Please/a see the 
+  a href=[preferred]/tomcat/tomcat-5/v5.5.29/README.htmlREADME/a
   file for packaging information.  It explains what every distribution 
contains.
   /p
 
@@ -346,19 +346,19 @@
 liCore:
   ul
   li
-  a 
href=[preferred]/tomcat/tomcat-5/v5.5.28/bin/apache-tomcat-5.5.28.zipzip/a 
-  (a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.28/bin/apache-tomcat-5.5.28.zip.asc;pgp/a,
 
-  a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.28/bin/apache-tomcat-5.5.28.zip.md5;md5/a)
+  a 
href=[preferred]/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.zipzip/a 
+  (a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.zip.asc;pgp/a,
 
+  a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.zip.md5;md5/a)
   /li
   li
-  a 
href=[preferred]/tomcat/tomcat-5/v5.5.28/bin/apache-tomcat-5.5.28.tar.gztar.gz/a
 
-  (a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.28/bin/apache-tomcat-5.5.28.tar.gz.asc;pgp/a,
 
-  a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.28/bin/apache-tomcat-5.5.28.tar.gz.md5;md5/a)
+  a 
href=[preferred]/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.tar.gztar.gz/a
 
+  (a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.tar.gz.asc;pgp/a,
 
+  a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.tar.gz.md5;md5/a)
   /li
   li
-  a 
href=[preferred]/tomcat/tomcat-5/v5.5.28/bin/apache-tomcat-5.5.28.exeWindows 
Service Installer/a 
-  (a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.28/bin/apache-tomcat-5.5.28.exe.asc;pgp/a,
 
-  a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.28/bin/apache-tomcat-5.5.28.exe.md5;md5/a)
+  a 
href=[preferred]/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.exeWindows 
Service Installer/a 
+  (a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.exe.asc;pgp/a,
 
+  a 
href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.exe.md5;md5/a)
   /li
  

Re: svn commit: r935974 - in /tomcat/site/trunk: docs/doap_Tomcat.rdf docs/download-55.html docs/security-5.html docs/whichversion.html xdocs/doap_Tomcat.rdf xdocs/download-55.xml xdocs/security-5.xml

2010-04-20 Thread Mark Thomas
On 20/04/2010 17:03, ma...@apache.org wrote:
 Author: markt
 Date: Tue Apr 20 16:03:22 2010
 New Revision: 935974
 
 URL: http://svn.apache.org/viewvc?rev=935974view=rev
 Log:
 Release 5.5.29

The 5.5.29 files are in place. I am waiting for them to sync to the
mirrors then I'll svn up these changes and make the release announcement.

Mark



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



svn commit: r935978 - in /tomcat/site/trunk: docs/index.html docs/oldnews.html xdocs/index.xml xdocs/oldnews.xml

2010-04-20 Thread markt
Author: markt
Date: Tue Apr 20 16:14:44 2010
New Revision: 935978

URL: http://svn.apache.org/viewvc?rev=935978view=rev
Log:
Add 5.5.29 to the front page
Move the older 6.0.x announcement to old news

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/oldnews.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=935978r1=935977r2=935978view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue Apr 20 16:14:44 2010
@@ -216,14 +216,14 @@ and their stories are listed on the 
 tr
 td bgcolor=#525D76
 font color=#ff face=arial,helvetica,sanserif
-a name=Tomcat 6.0.26 Released
-strongTomcat 6.0.26 Released/strong
+a name=Tomcat 5.5.29 Released
+strongTomcat 5.5.29 Released/strong
 /a
 /font
 /td
 td align=right bgcolor=#525D76
 font color=#ff face=arial,helvetica.sanserif
-strong2010-03-11/strong
+strong2010-04-20/strong
 /font
 /td
 /tr
@@ -232,13 +232,14 @@ and their stories are listed on the 
 p
 blockquote
 p
-The Apache Tomcat Project is proud to announce the release of version 6.0.26 
of Apache Tomcat.
-This release includes many bugfixes over Apache Tomcat 6.0.24.
+The Apache Tomcat Project is proud to announce the release of version 5.5.29 of
+Apache Tomcat. This release includes many bug fixes and a number of security
+fixes over Apache Tomcat 5.5.28.
 
 /p
 p align=center
-a href=download-60.cgiDownload/a |
-a href=tomcat-6.0-doc/changelog.htmlChangeLog for 6.0.26/a
+a href=download-55.cgiDownload/a |
+a href=tomcat-5.5-doc/changelog.htmlChangeLog for 5.5.29/a
 /p
 /blockquote
 /p
@@ -254,14 +255,14 @@ This release includes many bugfixes over
 tr
 td bgcolor=#525D76
 font color=#ff face=arial,helvetica,sanserif
-a name=Tomcat Connectors 1.2.30 Released
-strongTomcat Connectors 1.2.30 Released/strong
+a name=Tomcat 6.0.26 Released
+strongTomcat 6.0.26 Released/strong
 /a
 /font
 /td
 td align=right bgcolor=#525D76
 font color=#ff face=arial,helvetica.sanserif
-strong2010-03-01/strong
+strong2010-03-11/strong
 /font
 /td
 /tr
@@ -270,18 +271,13 @@ This release includes many bugfixes over
 p
 blockquote
 p
-The Apache Tomcat Project is proud to announce the release of version 1.2.30 of
-Apache Tomcat Connectors.
-This release includes mainly bug fixes and some small improvements over Apache 
Tomcat Connectors 1.2.28.
+The Apache Tomcat Project is proud to announce the release of version 6.0.26 
of Apache Tomcat.
+This release includes many bugfixes over Apache Tomcat 6.0.24.
+
 /p
 p align=center
-a href=download-connectors.cgiDownload/a |
-a href=connectors-doc/miscellaneous/changelog.htmlChangeLog for 1.2.30/a
-/p
-p
-br/
-bNotice/b Apache Tomcat Connectors version 1.2.29 was withdrawn from the 
release due to
-regression with Microsoft IIS connector. 
+a href=download-60.cgiDownload/a |
+a href=tomcat-6.0-doc/changelog.htmlChangeLog for 6.0.26/a
 /p
 /blockquote
 /p
@@ -297,14 +293,14 @@ regression with Microsoft IIS connector.
 tr
 td bgcolor=#525D76
 font color=#ff face=arial,helvetica,sanserif
-a name=Tomcat 6.0.24 Released
-strongTomcat 6.0.24 Released/strong
+a name=Tomcat Connectors 1.2.30 Released
+strongTomcat Connectors 1.2.30 Released/strong
 /a
 /font
 /td
 td align=right bgcolor=#525D76
 font color=#ff face=arial,helvetica.sanserif
-strong2010-01-21/strong
+strong2010-03-01/strong
 /font
 /td
 /tr
@@ -313,13 +309,18 @@ regression with Microsoft IIS connector.
 p
 blockquote
 p
-The Apache Tomcat Project is proud to announce the release of version 6.0.24 
of Apache Tomcat.
-This release includes many bugfixes over Apache Tomcat 6.0.20.
-
+The Apache Tomcat Project is proud to announce the release of version 1.2.30 of
+Apache Tomcat Connectors.
+This release includes mainly bug fixes and some small improvements over Apache 
Tomcat Connectors 1.2.28.
 /p
 p align=center
-a href=download-60.cgiDownload/a |
-a href=tomcat-6.0-doc/changelog.htmlChangeLog for 6.0.24/a
+a href=download-connectors.cgiDownload/a |
+a href=connectors-doc/miscellaneous/changelog.htmlChangeLog for 1.2.30/a
+/p
+p
+br/
+bNotice/b Apache Tomcat Connectors version 1.2.29 was withdrawn from the 
release due to
+regression with Microsoft IIS connector. 
 /p
 /blockquote
 /p

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=935978r1=935977r2=935978view=diff
==
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Tue Apr 20 16:14:44 2010
@@ -177,6 +177,44 @@
 tr
 td bgcolor=#525D76
 font color=#ff face=arial,helvetica,sanserif
+a name=Tomcat 6.0.24 Released
+strongTomcat 6.0.24 Released/strong
+/a
+/font
+/td
+td align=right 

svn commit: r935983 - /tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java

2010-04-20 Thread kkolinko
Author: kkolinko
Date: Tue Apr 20 16:30:52 2010
New Revision: 935983

URL: http://svn.apache.org/viewvc?rev=935983view=rev
Log:
Additional patch for https://issues.apache.org/bugzilla/show_bug.cgi?id=48589
Do not access JNDIRealm$User class fields directly, but use the getter methods,
as (theoretically) those can be overwritten in subclasses.

Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=935983r1=935982r2=935983view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Apr 20 
16:30:52 2010
@@ -1425,10 +1425,10 @@ public class JNDIRealm extends RealmBase
  if (containerLog.isTraceEnabled()) {
  if (validated) {
  
containerLog.trace(sm.getString(jndiRealm.authenticateSuccess,
-  user.username));
+  user.getUserName()));
  } else {
  
containerLog.trace(sm.getString(jndiRealm.authenticateFailure,
-  user.username));
+  user.getUserName()));
  }
  }
  return (validated);
@@ -1454,7 +1454,7 @@ public class JNDIRealm extends RealmBase
 if (info == null || credentials == null)
 return (false);
 
-String password = info.password;
+String password = info.getPassword();
 if (password == null)
 return (false);
 
@@ -1544,7 +1544,7 @@ public class JNDIRealm extends RealmBase
  if (credentials == null || user == null)
  return (false);
 
- String dn = user.dn;
+ String dn = user.getDN();
  if (dn == null)
  return (false);
 
@@ -1608,8 +1608,8 @@ public class JNDIRealm extends RealmBase
 if (user == null)
 return (null);
 
-String dn = user.dn;
-String username = user.username;
+String dn = user.getDN();
+String username = user.getUserName();
 
 if (dn == null || username == null)
 return (null);
@@ -1618,7 +1618,7 @@ public class JNDIRealm extends RealmBase
 containerLog.trace(  getRoles( + dn + ));
 
 // Start with roles retrieved from the user entry
-ListString list = user.roles;
+ListString list = user.getRoles();
 if (list == null) {
 list = new ArrayListString();
 }
@@ -1933,7 +1933,7 @@ public class JNDIRealm extends RealmBase
 User user = getUser(context, username);
 
 if (user != null) {
-return new GenericPrincipal(user.username, user.password,
+return new GenericPrincipal(user.getUserName(), user.getPassword(),
 getRoles(context, user));
 }
 



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



svn commit: r935984 - /tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java

2010-04-20 Thread fhanik
Author: fhanik
Date: Tue Apr 20 16:34:27 2010
New Revision: 935984

URL: http://svn.apache.org/viewvc?rev=935984view=rev
Log:
Add test case for bug 49158

Added:
tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java   (with 
props)

Added: tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java?rev=935984view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java (added)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java Tue Apr 20 
16:34:27 2010
@@ -0,0 +1,85 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the License); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an AS IS BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.tomcat.util.http;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+/**
+ * Test case for {...@link Cookies}. bNote/b because of the use of 
codefinal
+ * static/code constants in {...@link Cookies}, each of these tests must be
+ * executed in a new JVM instance. The tests have been place in separate 
classes
+ * to facilitate this when running the unit tests via Ant.
+ */
+public class TestBug49158 extends CookiesBaseTest {
+public static final String path = 49158;
+
+@Override
+public void testCookiesInstance() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+addServlets(tomcat);
+tomcat.start();
+MapString,ListString headers = new HashMapString,ListString();
+ByteChunk res = new ByteChunk(); 
+getUrl(http://localhost:; + getPort() + /+path, res, headers);
+ListString cookieHeaders = headers.get(Set-Cookie);
+int count = 0;
+for (String cookieHeader : cookieHeaders) {
+count++;
+}
+assertEquals(There should only be one Set-Cookie header in this 
test,1, count);
+}
+
+public static void addServlets(Tomcat tomcat) {
+// Must have a real docBase - just use temp
+Context ctx = 
+tomcat.addContext(/, System.getProperty(java.io.tmpdir));
+
+Tomcat.addServlet(ctx, path, new TestBug49158Servlet());
+ctx.addServletMapping(/+path, path);
+}
+
+public static class TestBug49158Servlet extends HttpServlet {
+
+private static final long serialVersionUID = 2725990508758127399L;
+
+@Override
+public void service(HttpServletRequest req, HttpServletResponse res)
+throws ServletException, IOException {
+HttpSession session = req.getSession();
+session.invalidate();
+session = req.getSession();
+session.invalidate();
+session = req.getSession();
+}
+
+}
+
+}

Propchange: tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
--
svn:eol-style = native



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



DO NOT REPLY [Bug 49158] More than one JSESSIONID cookie headers set

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49158

--- Comment #1 from Filip Hanik fha...@apache.org 2010-04-20 12:37:28 EDT ---
Test case added
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java?view=log

-- 
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 SupportAndTraining by WikiEdi tor

2010-04-20 Thread Apache Wiki
Dear Wiki user,

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

The SupportAndTraining page has been changed by WikiEditor.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diffrev1=14rev2=15

--

  
  
[[http://www.mulesoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif|http://www.mulesoft.com}}]]
  
- !MuleSoft provides global [[http://www.mulesoft.com/tomcat-support|enterprise 
support]] for users of Apache Tomcat. !MuleSoft employs leading experts and 
authors on Apache Tomcat to ensure that customers can get their questions 
answered quickly and accurately. !MuleSoft also provides 
[[http://www.mulesoft.com/free-tomcat-assistance|Free Tomcat Assistance]].
+ !MuleSoft provides global [[http://www.mulesoft.com/tomcat-support|enterprise 
Tomcat support]] as well as free, user-contributed howto guides. A 
general-audience [[http://www.mulesoft.com/understanding-apache-tomcat|Apache 
Tomcat]] is meant for beginners, while intermediate Tomcat users can ebenefit 
from guides on how to resolve [[http://www.mulesoft.com/tomcat-logging|Tomcat 
logging]] problems or how to use 
[[http://www.mulesoft.com/tomcat-eclipse|Tomcat in eclipse]]. MuleSoft also 
provides resources on upcoming releases of Tomcat like 
[[http://www.mulesoft.com/tomcat-7|Tomcat 7]]. MuleSoft employs leading experts 
and authors on Apache Tomcat to ensure that customers can get their questions 
answered quickly and accurately. !MuleSoft also provides 
[[http://www.mulesoft.com/free-apache-tomcat-support|Free Tomcat Assistance]].
+ ||style=font-family: arial,helvetica,sans-serif,sanserif; font-size: 1.5em; 
font-weight: bold;[[http://innraz.ru/|InnRaz.ru]] ||
  
- 
||style=font-family:arial,helvetica,sans-serif,sanserif;font-size:1.5em;font-weight:bold;[[http://innraz.ru/|InnRaz.ru]]||
+ 
+ 
  
  [[http://innraz.ru/|InnRaz.ru]] offers enterprise support and consulting for 
Apache Tomcat users.
  

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



svn commit: r935988 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-20 Thread kkolinko
Author: kkolinko
Date: Tue Apr 20 16:47:39 2010
New Revision: 935988

URL: http://svn.apache.org/viewvc?rev=935988view=rev
Log:
vote and proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=935988r1=935987r2=935988view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 20 16:47:39 2010
@@ -97,7 +97,12 @@ PATCHES PROPOSED TO BACKPORT:
 
   Additional patch:
   http://svn.apache.org/viewvc?view=revisionrevision=932357
-  +1: markt
+  +1: markt, kkolinko
+  -1:
+
+  Additional patch:
+  http://svn.apache.org/viewvc?rev=935983view=rev
+  +1: kkolinko
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
@@ -295,5 +300,6 @@ PATCHES PROPOSED TO BACKPORT:
   Avoid ClassCastException.
   http://svn.apache.org/viewvc?view=revisionrevision=935510
   +1: kfujino
+  +1: kkolinko: and also +1 for 
http://svn.apache.org/viewvc?rev=935777view=rev
   -1: 
 



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



DO NOT REPLY [Bug 49158] More than one JSESSIONID cookie headers set

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49158

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

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE

--- Comment #2 from Mark Thomas ma...@apache.org 2010-04-20 13:12:34 EDT ---
48913 has a proposed patch. I'll look at committing it today.

*** This bug has been marked as a duplicate of bug 48913 ***

-- 
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 48913] Request.changeSessionId adds a second Set-Cookie JSESSIONID

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48913

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

   What|Removed |Added

 CC||fha...@apache.org

--- Comment #3 from Mark Thomas ma...@apache.org 2010-04-20 13:12:35 EDT ---
*** Bug 49158 has been marked as a duplicate of this bug. ***

-- 
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: r935998 - in /tomcat/trunk/java/org/apache/catalina/connector: Request.java Response.java

2010-04-20 Thread fhanik
Author: fhanik
Date: Tue Apr 20 17:13:37 2010
New Revision: 935998

URL: http://svn.apache.org/viewvc?rev=935998view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=49158
Session cookies should only set one header


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

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=935998r1=935997r2=935998view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Apr 20 
17:13:37 2010
@@ -2298,7 +2298,7 @@ public class Request
 Cookie newCookie =
 ApplicationSessionCookieConfig.createSessionCookie(context,
 newSessionId, secure);
-response.addCookieInternal(newCookie);
+response.addSessionCookieInternal(newCookie);
 }
 }
 
@@ -2622,7 +2622,7 @@ public class Request
 ApplicationSessionCookieConfig.createSessionCookie(
 context, session.getIdInternal(), isSecure());
 
-response.addCookieInternal(cookie);
+response.addSessionCookieInternal(cookie);
 }
 
 if (session != null) {

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=935998r1=935997r2=935998view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Tue Apr 20 
17:13:37 2010
@@ -969,7 +969,37 @@ public class Response
 
 }
 
-
+/**
+ * Special method for adding a session cookie as we should be overriding 
+ * any previous 
+ * @param cookie
+ */
+public void addSessionCookieInternal(final Cookie cookie) {
+if (isCommitted())
+return;
+
+String name = cookie.getName();
+final String headername = Set-Cookie;
+final String startsWith = name + =;
+final StringBuffer sb = generateCookieString(cookie);
+boolean set = false;
+MimeHeaders headers = coyoteResponse.getMimeHeaders();
+int n = headers.size();
+for (int i = 0; i  n; i++) {
+if (headers.getName(i).toString().equals(headername)) {
+if (headers.getValue(i).toString().startsWith(startsWith)) {
+headers.setValue(sb.toString());
+set = true;
+}
+}
+}
+if (!set) {
+addHeader(headername, sb.toString());
+cookies.add(cookie);
+}
+
+
+}
 /**
  * Add the specified Cookie to those that will be included with
  * this Response.
@@ -981,6 +1011,17 @@ public class Response
 if (isCommitted())
 return;
 
+final StringBuffer sb = generateCookieString(cookie);
+//if we reached here, no exception, cookie is valid
+// the header name is Set-Cookie for both old and v.1 ( RFC2109 )
+// RFC2965 is not supported by browsers and the Servlet spec
+// asks for 2109.
+addHeader(Set-Cookie, sb.toString());
+
+cookies.add(cookie);
+}
+
+public StringBuffer generateCookieString(final Cookie cookie) {
 final StringBuffer sb = new StringBuffer();
 //web application code can receive a IllegalArgumentException 
 //from the appendCookieValue invocation
@@ -1003,13 +1044,7 @@ public class Response
  cookie.getMaxAge(), cookie.getSecure(),
  cookie.isHttpOnly());
 }
-//if we reached here, no exception, cookie is valid
-// the header name is Set-Cookie for both old and v.1 ( RFC2109 )
-// RFC2965 is not supported by browsers and the Servlet spec
-// asks for 2109.
-addHeader(Set-Cookie, sb.toString());
-
-cookies.add(cookie);
+return sb;
 }
 
 



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



DO NOT REPLY [Bug 49158] More than one JSESSIONID cookie headers set

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49158

Filip Hanik fha...@apache.org changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|DUPLICATE   |

--- Comment #3 from Filip Hanik fha...@apache.org 2010-04-20 13:14:26 EDT ---
Fixed in trunk in SVN r935998

-- 
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 44041] WebappClassLoader duplicate class definition under high Load if hasExternalRepositories is true

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44041

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

   What|Removed |Added

  Component|Catalina|Catalina
Version|5.5.25  |6.0.26
Product|Tomcat 5|Tomcat 6
   Target Milestone|--- |default

--- Comment #16 from Mark Thomas ma...@apache.org 2010-04-20 13:15:13 EDT ---
Moving to 6 since this is fixed in 5.

-- 
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 49158] More than one JSESSIONID cookie headers set

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49158

--- Comment #4 from Filip Hanik fha...@apache.org 2010-04-20 13:16:20 EDT ---
(In reply to comment #2)
 48913 has a proposed patch. I'll look at committing it today.
 
 *** This bug has been marked as a duplicate of bug 48913 ***

Didn't see this until I had committed my patch. The patch in 48913 doesn't seem
to capture the changeSessionId use case. But both patches do the same thing

-- 
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 48913] Request.changeSessionId adds a second Set-Cookie JSESSIONID

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48913

Filip Hanik fha...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE

--- Comment #4 from Filip Hanik fha...@apache.org 2010-04-20 13:17:04 EDT ---


*** This bug has been marked as a duplicate of bug 49158 ***

-- 
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 49158] More than one JSESSIONID cookie headers set

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49158

Filip Hanik fha...@apache.org changed:

   What|Removed |Added

 CC||stephan.zlata...@yahoo.com

--- Comment #5 from Filip Hanik fha...@apache.org 2010-04-20 13:17:04 EDT ---
*** Bug 48913 has been marked as a duplicate of this bug. ***

-- 
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: r936003 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-20 Thread fhanik
Author: fhanik
Date: Tue Apr 20 17:17:57 2010
New Revision: 936003

URL: http://svn.apache.org/viewvc?rev=936003view=rev
Log:
proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936003r1=936002r2=936003view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 20 17:17:57 2010
@@ -303,3 +303,9 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko: and also +1 for 
http://svn.apache.org/viewvc?rev=935777view=rev
   -1: 
 
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49158
+  http://svn.apache.org/viewvc?view=revisionrevision=935998
+  +1: fhanik
+  -1: 
+
+



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



svn commit: r936007 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ webapps/docs/ webapps/docs/config/

2010-04-20 Thread markt
Author: markt
Date: Tue Apr 20 17:30:19 2010
New Revision: 936007

URL: http://svn.apache.org/viewvc?rev=936007view=rev
Log:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48895
Make clearing thread locals optional and disabled by default since it isn't 
thread-safe

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 20 17:30:19 2010
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918594,918684,918787,918792,918799,918885,919851,919914,920025,920055,920298,920449,920596,931709
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 

DO NOT REPLY [Bug 48895] WebAppClassLoader.clearThreadLocalMap() concurrency issues

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48895

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

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas ma...@apache.org 2010-04-20 13:31:23 EDT ---
This has been made optional in 6.0.x and will be included in 6.0.27 onwards.

I'll create a new BZ enhancement for Tomcat 7 to track the better ways of doing
this.

-- 
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 49159] New: Improve ThreadLocal memory leak clean-up

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49159

   Summary: Improve ThreadLocal memory leak clean-up
   Product: Tomcat 7
   Version: trunk
  Platform: All
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: ma...@apache.org


Doing this in a thread-safe way means performing the clean-up in the thread
where the ThreadLocal exists. A likely point is just before the Thread gets
returned to the pool.

-- 
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: r936010 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jk/config/ApacheConfig.java webapps/docs/changelog.xml

2010-04-20 Thread markt
Author: markt
Date: Tue Apr 20 17:37:10 2010
New Revision: 936010

URL: http://svn.apache.org/viewvc?rev=936010view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48917
Correct name of mod_jk module in ApacheConfig
Patch provided by Todd Hicks

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936010r1=936009r2=936010view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 20 17:37:10 2010
@@ -222,13 +222,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48917
-  Correct name of mod_jk module in ApacheConfig
-  https://issues.apache.org/bugzilla/attachment.cgi?id=25132
-  Patch provided by Todd Hicks
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49030
   Failure of one connector should not leave some connectors started and some
   ignored

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java?rev=936010r1=936009r2=936010view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java Tue Apr 20 
17:37:10 2010
@@ -135,7 +135,7 @@ public class ApacheConfig  extends BaseJ
 static{
 String os = System.getProperty(os.name).toLowerCase();
 if(os.indexOf(windows)=0){ 
-   MOD_JK = modules/mod_jk.dll;
+   MOD_JK = modules/mod_jk.so;
 }else if(os.indexOf(netware)=0){
MOD_JK = modules/mod_jk.nlm;
 }else{

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=936010r1=936009r2=936010view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 20 17:37:10 2010
@@ -85,6 +85,10 @@
 bug48862/bug: Add support for the backlog parameter to the AJP
 connector. (pero/markt)
   /add
+  fix
+bug48917/bug: Correct name of mod_jk module in ApacheConfig. Patch
+provided by Todd Hicks. (markt)
+  /fix
   add
 Use chunked encoding for http 1.1 requests with no content-length
 (regardless of keep-alive) so client can differentiate between complete



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



DO NOT REPLY [Bug 48917] ApacheConfig.java update windows default module mod_jk.dll - mod_jk.so

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48917

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

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #4 from Mark Thomas ma...@apache.org 2010-04-20 13:38:08 EDT ---
The patch has been applied to 6.0.x and will be included in 6.0.27 onwards.

Thanks for your contribution.

-- 
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: r936045 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml

2010-04-20 Thread markt
Author: markt
Date: Tue Apr 20 19:44:00 2010
New Revision: 936045

URL: http://svn.apache.org/viewvc?rev=936045view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48983
Improve debug logging for situations when RemoteIpValve is bypassed
Patch provided by Cyrille Le Clerc
I kept the code the same as Tomcat 7

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936045r1=936044r2=936045view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 20 19:44:00 2010
@@ -234,15 +234,6 @@ PATCHES PROPOSED TO BACKPORT:
 message text (starting),  vs. what actually happened (initialize()) -
 I won't insist on fixing that inconsistency.
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48983
-  Improve debug logging for situations when RemoteIpValve is bypassed
-  https://issues.apache.org/bugzilla/attachment.cgi?id=25181
-  Patch provided by Cyrille Le Clerc
-  +1: markt, kkolinko, rjung
-  -1: 
-  rjung: maybe using originalRemoteAddr instead of request.getRemoteAddr().
-  kkolinko: I agree with rjung, though the difference will be not noticeable
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48379
   Make session cookie name, domain and path configurable per context.
   http://people.apache.org/~markt/patches/2010-04-08-bug48379.patch

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=936045r1=936044r2=936045view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Tue 
Apr 20 19:44:00 2010
@@ -627,6 +627,11 @@ public class RemoteIpValve extends Valve
   + originalScheme + ' will be seen as 
newRemoteAddr=' + request.getRemoteAddr() + ', newRemoteHost='
   + request.getRemoteHost() + ', newScheme=' + 
request.getScheme() + ', newSecure=' + request.isSecure() + ');
 }
+} else {
+if (log.isDebugEnabled()) {
+log.debug(Skip RemoteIpValve for request  + 
request.getRequestURI() +  with originalRemoteAddr '
++ request.getRemoteAddr() + ');
+}
 }
 try {
 getNext().invoke(request, response);

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=936045r1=936044r2=936045view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 20 19:44:00 2010
@@ -74,6 +74,11 @@
 process of clearing them is not thread-safe. (markt)
   /fix
   fix
+bug48983/bug: Improve debug logging for situations when
+codeRemoteIpValve/code is bypassed. Patch provided by Cyrille Le
+Clerc. (markt)
+  /fix
+  fix
 bug49018/bug: Fix processing of time argument in the Expire 
sessions 
 action in the Manager web application. (kkolinko)
   /fix



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



DO NOT REPLY [Bug 49151] ClassCastException in BackupManager#stopInternal.

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49151

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

   What|Removed |Added

  Component|Cluster |Cluster
Version|unspecified |6.0.26
Product|Tomcat 7|Tomcat 6
   Target Milestone|--- |

--- Comment #2 from Mark Thomas ma...@apache.org 2010-04-20 15:46:04 EDT ---
Moving to 6 since this is fixed in trunk

-- 
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: r936047 - /tomcat/trunk/java/javax/mail/internet/MimeMessage.java

2010-04-20 Thread markt
Author: markt
Date: Tue Apr 20 19:49:10 2010
New Revision: 936047

URL: http://svn.apache.org/viewvc?rev=936047view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49141
Stop Findbugs complaining

Modified:
tomcat/trunk/java/javax/mail/internet/MimeMessage.java

Modified: tomcat/trunk/java/javax/mail/internet/MimeMessage.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/mail/internet/MimeMessage.java?rev=936047r1=936046r2=936047view=diff
==
--- tomcat/trunk/java/javax/mail/internet/MimeMessage.java (original)
+++ tomcat/trunk/java/javax/mail/internet/MimeMessage.java Tue Apr 20 19:49:10 
2010
@@ -18,7 +18,7 @@ package javax.mail.internet;
 
 import javax.mail.Session;
 
-public class MimeMessage {
+public class MimeMessage implements MimePart {
 public MimeMessage(Session session) {
 }
 public void setFrom(InternetAddress from) {



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



DO NOT REPLY [Bug 49141] Impossible cast in naming.factory.SendMailFactory.getObjectInstance

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49141

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

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas ma...@apache.org 2010-04-20 15:50:04 EDT ---
I've updated the dummy impl to stop the false positive from find bugs.

-- 
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 SupportAndTraining by GregBel l

2010-04-20 Thread Apache Wiki
Dear Wiki user,

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

The SupportAndTraining page has been changed by GregBell.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diffrev1=16rev2=17

--

  If you would like to add your company to this page, feel free to do so. You 
will need to create a wiki account to do so. There aren't any hard and fast 
rules about what is acceptable but please keep your entry to a few lines, a 
link and a small logo. Excessive entries will be edited. Remember to add you 
company to both sections if you provide support and training.
  
  = Support =
+ 
[[http://www.openlogic.com/|{{http://www.openlogic.com/assets/layout/openlogic-logo.gif}}]]
+ 
+ OpenLogic provides commercial-grade 
[[http://www.openlogic.com/products/open-source-support.php|support for 
Tomcat]] and hundreds of other open source packages. Our open source support 
comes with guaranteed Service Level Agreements and either business hours or 
around-the-clock coverage.
+ 
  
[[http://www.kippdata.de|{{http://www.kippdata.de/site/themes/kippdata/img/elements/kippdata_logo.gif|http://www.kippdata.de}}]]
  
  Kippdata's [[https://www.kippdata.de/tomcat/|eSupport for Apache Tomcat]] 
features several eSupport packages starting from basic support levels up to 
mission critical enterprise support. We actively contribute to the Apache 
Tomcat project, so that our bug fixes and other code enhancements become part 
of the standard Apache Tomcat code. Kippdata is located in Bonn, Germany.
@@ -36, +40 @@

  Use this example as a basis for your entry. New entries should be added just 
above this example.
  
  = Training =
+ 
[[http://www.openlogic.com/|{{http://www.openlogic.com/assets/layout/openlogic-logo.gif}}]]
+ 
+ OpenLogic offers 
[[http://www.openlogic.com/products/open-source-training.php|training for 
Tomcat]] and a wide range of other open source packages. Training options 
include open-enrollment training for individuals and customized, multi-day 
enterprise training courses.
+ 
  
[[http://www.kippdata.de|{{http://www.kippdata.de/site/themes/kippdata/img/elements/kippdata_logo.gif|http://www.kippdata.de}}]]
  
  kippdata offers a 
[[http://www.kippdata.de/red/workshops/opensource/|selection of trainings for 
Apache Tomcat]]. We focus on single day trainings like „Apache Tomcat Best 
Practices“, „Java Memory Sizing and Garbage Collection Tuning“. Kippdata is 
located in Bonn, Germany.

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



[Tomcat Wiki] Update of SupportAndTraining by markt

2010-04-20 Thread Apache Wiki
Dear Wiki user,

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

The SupportAndTraining page has been changed by markt.
The comment on this change is: New entries are mean to be added at the end.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diffrev1=17rev2=18

--

  If you would like to add your company to this page, feel free to do so. You 
will need to create a wiki account to do so. There aren't any hard and fast 
rules about what is acceptable but please keep your entry to a few lines, a 
link and a small logo. Excessive entries will be edited. Remember to add you 
company to both sections if you provide support and training.
  
  = Support =
- 
[[http://www.openlogic.com/|{{http://www.openlogic.com/assets/layout/openlogic-logo.gif}}]]
- 
- OpenLogic provides commercial-grade 
[[http://www.openlogic.com/products/open-source-support.php|support for 
Tomcat]] and hundreds of other open source packages. Our open source support 
comes with guaranteed Service Level Agreements and either business hours or 
around-the-clock coverage.
- 
  
[[http://www.kippdata.de|{{http://www.kippdata.de/site/themes/kippdata/img/elements/kippdata_logo.gif|http://www.kippdata.de}}]]
  
  Kippdata's [[https://www.kippdata.de/tomcat/|eSupport for Apache Tomcat]] 
features several eSupport packages starting from basic support levels up to 
mission critical enterprise support. We actively contribute to the Apache 
Tomcat project, so that our bug fixes and other code enhancements become part 
of the standard Apache Tomcat code. Kippdata is located in Bonn, Germany.
@@ -36, +32 @@

  
  [[http://innraz.ru/|InnRaz.ru]] offers enterprise support and consulting for 
Apache Tomcat users.
  
+ 
[[http://www.openlogic.com/|{{http://www.openlogic.com/assets/layout/openlogic-logo.gif}}]]
+ 
+ 
+ OpenLogic provides commercial-grade 
[[http://www.openlogic.com/products/open-source-support.php|support for 
Tomcat]] and hundreds of other open source packages. Our open source support 
comes with guaranteed Service Level Agreements and either business hours or 
around-the-clock coverage.
+ 
  === Example company name ===
  Use this example as a basis for your entry. New entries should be added just 
above this example.
  
  = Training =
- 
[[http://www.openlogic.com/|{{http://www.openlogic.com/assets/layout/openlogic-logo.gif}}]]
- 
- OpenLogic offers 
[[http://www.openlogic.com/products/open-source-training.php|training for 
Tomcat]] and a wide range of other open source packages. Training options 
include open-enrollment training for individuals and customized, multi-day 
enterprise training courses.
- 
  
[[http://www.kippdata.de|{{http://www.kippdata.de/site/themes/kippdata/img/elements/kippdata_logo.gif|http://www.kippdata.de}}]]
  
  kippdata offers a 
[[http://www.kippdata.de/red/workshops/opensource/|selection of trainings for 
Apache Tomcat]]. We focus on single day trainings like „Apache Tomcat Best 
Practices“, „Java Memory Sizing and Garbage Collection Tuning“. Kippdata is 
located in Bonn, Germany.
@@ -62, +59 @@

  
  !NobleProg provides comprehensive 
[[http://www.nobleprog.com/tomcat-training/training-course|Online 
Instructor-led Tomcat Traininig]] all around the world. !NobleProg also 
provides intensive[[http://www.nobleprog.co.uk/apache/training|Tomcat Classroom 
Courses in the UK]]. The training can be bespoken as users want with hands-on 
exercises. The course can be conducted even if there is only one person by 
experienced Tomcat instructors.
  
+ 
[[http://www.openlogic.com/|{{http://www.openlogic.com/assets/layout/openlogic-logo.gif}}]]
+ 
+ OpenLogic offers 
[[http://www.openlogic.com/products/open-source-training.php|training for 
Tomcat]] and a wide range of other open source packages. Training options 
include open-enrollment training for individuals and customized, multi-day 
enterprise training courses.
+ 
  === Example company name ===
  Use this example as a basis for your entry. New entries should be added just 
above this example.
  

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



[Tomcat Wiki] Update of SupportAndTraining by markt

2010-04-20 Thread Apache Wiki
Dear Wiki user,

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

The SupportAndTraining page has been changed by markt.
The comment on this change is: Space out source so it is easier to edit.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diffrev1=18rev2=19

--

  
  Kippdatas [[https://www.kippdata.de/tomcat/|eSupport für Apache Tomcat]] 
bietet von Basis Level Support bis hin zu Support für unternehmenskritische 
Anwendungen verschiedene eSupport-Pakete. Wir beteiligen uns aktiv am Apache 
Tomcat Projekt, so dass unsere Fehlerbeseitigungen und andere Erweiterungen des 
Codes in den Standard Apache Tomcat Code einfliessen. Kippdata ist in Bonn, 
Deutschland, ansässig.
  
+ 
  
[[http://www.springsource.com|{{http://www.springframework.org/sites/all/themes/zen/framework/logo.png|http://www.springsource.com}}]]
  
  !SpringSource provides global, 24x7, 
[[http://www.covalent.net/supportservices/tomcat/index.html?aw|enterprise 
support]] for production users of Apache Tomcat. !SpringSource employs the 
leading experts on Apache Tomcat to ensure that support customers can get their 
questions answered quickly and accurately and that bug fixes are incorporated 
into the open source code base.
+ 
  
  
[[http://www.opengate.biz/|{{http://office.opengate.biz/images/og.png|http://www.opengate.biz/}}]]
  
  !OpenGate provides support for Apache Tomcat enterprise users located in 
Italy. !OpenGate has 8 years experience in helping customers adopting Apache 
Tomcat and hundreds of success stories.BR !OpenGate fornisce supporto in 
Italia per gli utenti di Apache Tomcat. !OpenGate ha 8 anni di esperienza 
nell'aiutare i clienti nell'adozione di Apache Tomcat e centinaia di storie di 
successo.
  
+ 
  
[[http://www.mulesoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif|http://www.mulesoft.com}}]]
  
  !MuleSoft provides global [[http://www.mulesoft.com/tomcat-support|enterprise 
Tomcat support]] as well as free, user-contributed howto guides. A 
general-audience [[http://www.mulesoft.com/understanding-apache-tomcat|Apache 
Tomcat]] guide is meant for absolute beginners, while intermediate Tomcat users 
can ebenefit from guides on how to resolve 
[[http://www.mulesoft.com/tomcat-logging|Tomcat logging]] problems or how to 
use [[http://www.mulesoft.com/tomcat-eclipse|Tomcat in eclipse]]. MuleSoft also 
provides resources on upcoming releases of Tomcat like 
[[http://www.mulesoft.com/tomcat-7|Tomcat 7]]. !MuleSoft employs leading 
experts and authors on Apache Tomcat to ensure that customers can get their 
questions answered quickly and accurately. !MuleSoft also provides 
[[http://www.mulesoft.com/free-apache-tomcat-support|Free Tomcat Assistance]].
+ 
+ 
  ||style=font-family: arial,helvetica,sans-serif,sanserif; font-size: 1.5em; 
font-weight: bold;[[http://innraz.ru/|InnRaz.ru]] ||
  
+ [[http://innraz.ru/|InnRaz.ru]] offers enterprise support and consulting for 
Apache Tomcat users.
  
- 
- 
- [[http://innraz.ru/|InnRaz.ru]] offers enterprise support and consulting for 
Apache Tomcat users.
  
  
[[http://www.openlogic.com/|{{http://www.openlogic.com/assets/layout/openlogic-logo.gif}}]]
  
  
  OpenLogic provides commercial-grade 
[[http://www.openlogic.com/products/open-source-support.php|support for 
Tomcat]] and hundreds of other open source packages. Our open source support 
comes with guaranteed Service Level Agreements and either business hours or 
around-the-clock coverage.
+ 
  
  === Example company name ===
  Use this example as a basis for your entry. New entries should be added just 
above this example.
@@ -47, +51 @@

  
  Kippdata bietet eine 
[[http://www.kippdata.de/red/workshops/opensource/|Auswahl an Schulungen für 
Apache Tomcat]] an. Wir haben uns auf Ein-Tages-Schulungen zu Themen wie 
„Apache Tomcat Best Practices“, „Java Memory Sizing and Garbage Collection 
Tuning“ spezialisiert. Kippdata ist in Bonn, Deutschland, ansässig.
  
+ 
  
[[http://www.springsource.com|{{http://www.springframework.org/sites/all/themes/zen/framework/logo.png|http://www.springsource.com}}]]
  
  !SpringSource provides comprehensive 
[[http://www.springsource.com/training?aw|education]] on enterprise Java with 
specific [[http://springsource.com/training/apa001/syllabus?aw|training]] for 
Apache Tomcat. The four-day, intensive instructor-led training provides 
practical, hands-on knowledge about installation, configuration, deployment, 
load balancing and troubleshooting for production systems using Apache Tomcat.
+ 
  
  
[[http://www.MuleSoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif|http://www.MuleSoft.com}}]]
  
  !MuleSoft provides comprehensive 
[[http://www.mulesoft.com/mule-training|Tomcat Traininig]] for users of Apache 
Tomcat. !MuleSoft offers a FREE prerecorded training course to help users to 
get started with Apache Tomcat and also intensive 

[Tomcat Wiki] Update of SupportAndTraining by markt

2010-04-20 Thread Apache Wiki
Dear Wiki user,

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

The SupportAndTraining page has been changed by markt.
The comment on this change is: Fix various typos. Can anyone spot the copy and 
paste?.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diffrev1=19rev2=20

--

  
  
[[http://www.mulesoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif|http://www.mulesoft.com}}]]
  
- !MuleSoft provides global [[http://www.mulesoft.com/tomcat-support|enterprise 
Tomcat support]] as well as free, user-contributed howto guides. A 
general-audience [[http://www.mulesoft.com/understanding-apache-tomcat|Apache 
Tomcat]] guide is meant for absolute beginners, while intermediate Tomcat users 
can ebenefit from guides on how to resolve 
[[http://www.mulesoft.com/tomcat-logging|Tomcat logging]] problems or how to 
use [[http://www.mulesoft.com/tomcat-eclipse|Tomcat in eclipse]]. MuleSoft also 
provides resources on upcoming releases of Tomcat like 
[[http://www.mulesoft.com/tomcat-7|Tomcat 7]]. !MuleSoft employs leading 
experts and authors on Apache Tomcat to ensure that customers can get their 
questions answered quickly and accurately. !MuleSoft also provides 
[[http://www.mulesoft.com/free-apache-tomcat-support|Free Tomcat Assistance]].
+ !MuleSoft provides global [[http://www.mulesoft.com/tomcat-support|enterprise 
Tomcat support]] as well as free, user-contributed howto guides. A 
general-audience [[http://www.mulesoft.com/understanding-apache-tomcat|Apache 
Tomcat]] guide is meant for absolute beginners, while intermediate Tomcat users 
can benefit from guides on how to resolve 
[[http://www.mulesoft.com/tomcat-logging|Tomcat logging]] problems or how to 
use [[http://www.mulesoft.com/tomcat-eclipse|Tomcat in eclipse]]. !MuleSoft 
also provides resources on upcoming releases of Tomcat like 
[[http://www.mulesoft.com/tomcat-7|Tomcat 7]]. !MuleSoft employs leading 
experts and authors on Apache Tomcat to ensure that customers can get their 
questions answered quickly and accurately. !MuleSoft also provides 
[[http://www.mulesoft.com/free-apache-tomcat-support|Free Tomcat Assistance]].
  
  
  ||style=font-family: arial,helvetica,sans-serif,sanserif; font-size: 1.5em; 
font-weight: bold;[[http://innraz.ru/|InnRaz.ru]] ||
@@ -38, +38 @@

  
[[http://www.openlogic.com/|{{http://www.openlogic.com/assets/layout/openlogic-logo.gif}}]]
  
  
- OpenLogic provides commercial-grade 
[[http://www.openlogic.com/products/open-source-support.php|support for 
Tomcat]] and hundreds of other open source packages. Our open source support 
comes with guaranteed Service Level Agreements and either business hours or 
around-the-clock coverage.
+ !OpenLogic provides commercial-grade 
[[http://www.openlogic.com/products/open-source-support.php|support for 
Tomcat]] and hundreds of other open source packages. Our open source support 
comes with guaranteed Service Level Agreements and either business hours or 
around-the-clock coverage.
  
  
  === Example company name ===
@@ -47, +47 @@

  = Training =
  
[[http://www.kippdata.de|{{http://www.kippdata.de/site/themes/kippdata/img/elements/kippdata_logo.gif|http://www.kippdata.de}}]]
  
- kippdata offers a 
[[http://www.kippdata.de/red/workshops/opensource/|selection of trainings for 
Apache Tomcat]]. We focus on single day trainings like „Apache Tomcat Best 
Practices“, „Java Memory Sizing and Garbage Collection Tuning“. Kippdata is 
located in Bonn, Germany.
+ Kippdata offers a 
[[http://www.kippdata.de/red/workshops/opensource/|selection of trainings for 
Apache Tomcat]]. We focus on single day trainings like „Apache Tomcat Best 
Practices“, „Java Memory Sizing and Garbage Collection Tuning“. Kippdata is 
located in Bonn, Germany.
  
  Kippdata bietet eine 
[[http://www.kippdata.de/red/workshops/opensource/|Auswahl an Schulungen für 
Apache Tomcat]] an. Wir haben uns auf Ein-Tages-Schulungen zu Themen wie 
„Apache Tomcat Best Practices“, „Java Memory Sizing and Garbage Collection 
Tuning“ spezialisiert. Kippdata ist in Bonn, Deutschland, ansässig.
  
@@ -59, +59 @@

  
  
[[http://www.MuleSoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif|http://www.MuleSoft.com}}]]
  
- !MuleSoft provides comprehensive 
[[http://www.mulesoft.com/mule-training|Tomcat Traininig]] for users of Apache 
Tomcat. !MuleSoft offers a FREE prerecorded training course to help users to 
get started with Apache Tomcat and also intensive instructor led training 
courses on advanced topics such as 
[[http://www.mulesoft.com/tomcat-performance-tuning|Tomcat performance 
tuning]], [[http://www.mulesoft.com/tomcat-configuration-training|configuration 
management]]. The training is designed by Tomcat experts and delivered by 
experienced instructors.
+ !MuleSoft provides comprehensive 
[[http://www.mulesoft.com/mule-training|Tomcat Training]] for users of Apache 

svn commit: r936086 - in /tomcat/trunk/java/org/apache/catalina: connector/Response.java core/DummyResponse.java

2010-04-20 Thread markt
Author: markt
Date: Tue Apr 20 22:11:15 2010
New Revision: 936086

URL: http://svn.apache.org/viewvc?rev=936086view=rev
Log:
getCookies is a httpServletRequestMethod, not a httpServletResponseMethod

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=936086r1=936085r2=936086view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Tue Apr 20 
22:11:15 2010
@@ -235,12 +235,6 @@ public class Response
 
 
 /**
- * The set of Cookies associated with this Response.
- */
-protected ArrayListCookie cookies = new ArrayListCookie();
-
-
-/**
  * Using output stream flag.
  */
 protected boolean usingOutputStream = false;
@@ -281,8 +275,6 @@ public class Response
 error = false;
 isCharacterEncodingSet = false;
 
-cookies.clear();
-
 if (Globals.IS_SECURITY_ENABLED || Connector.RECYCLE_FACADES) {
 if (facade != null) {
 facade.clear();
@@ -865,15 +857,6 @@ public class Response
 
 
 /**
- * Return an array of all cookies set for this response, or
- * a zero-length array if no cookies have been set.
- */
-public Cookie[] getCookies() {
-return cookies.toArray(new Cookie[cookies.size()]);
-}
-
-
-/**
  * Return the value for the specified header, or codenull/code if this
  * header has not been set.  If more than one value was added for this
  * name, only the first is returned; use getHeaderValues() to retrieve all
@@ -995,7 +978,6 @@ public class Response
 }
 if (!set) {
 addHeader(headername, sb.toString());
-cookies.add(cookie);
 }
 
 
@@ -1017,8 +999,6 @@ public class Response
 // RFC2965 is not supported by browsers and the Servlet spec
 // asks for 2109.
 addHeader(Set-Cookie, sb.toString());
-
-cookies.add(cookie);
 }
 
 public StringBuffer generateCookieString(final Cookie cookie) {

Modified: tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java?rev=936086r1=936085r2=936086view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java Tue Apr 20 
22:11:15 2010
@@ -100,7 +100,6 @@ public class DummyResponse
 public void setContentType(String type) {}
 public void setLocale(Locale locale) {}
 
-public Cookie[] getCookies() { return null; }
 public String getHeader(String name) { return null; }
 public CollectionString getHeaderNames() { return null; }
 public String[] getHeaderValues(@SuppressWarnings(unused) String name) {



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



svn commit: r936091 - in /tomcat/trunk/java/org/apache/catalina: connector/Response.java core/DummyResponse.java

2010-04-20 Thread markt
Author: markt
Date: Tue Apr 20 22:19:42 2010
New Revision: 936091

URL: http://svn.apache.org/viewvc?rev=936091view=rev
Log:
Remove mystery method

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=936091r1=936090r2=936091view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Tue Apr 20 
22:19:42 2010
@@ -859,8 +859,8 @@ public class Response
 /**
  * Return the value for the specified header, or codenull/code if this
  * header has not been set.  If more than one value was added for this
- * name, only the first is returned; use getHeaderValues() to retrieve all
- * of them.
+ * name, only the first is returned; use {...@link #getHeaders(String)} to
+ * retrieve all of them.
  *
  * @param name Header name to look up
  */

Modified: tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java?rev=936091r1=936090r2=936091view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java Tue Apr 20 
22:19:42 2010
@@ -102,9 +102,7 @@ public class DummyResponse
 
 public String getHeader(String name) { return null; }
 public CollectionString getHeaderNames() { return null; }
-public String[] getHeaderValues(@SuppressWarnings(unused) String name) {
-return null;
-}
+public CollectionString getHeaders(String name) { return null; }
 public String getMessage() { return null; }
 public int getStatus() { return -1; }
 public void reset(@SuppressWarnings(unused) int status,
@@ -133,5 +131,4 @@ public class DummyResponse
 /** @deprecated */
 @Deprecated
 public void setStatus(int status, String message) {}
-public CollectionString getHeaders(String name) { return null; }
 }



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



svn commit: r936093 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-20 Thread markt
Author: markt
Date: Tue Apr 20 22:29:24 2010
New Revision: 936093

URL: http://svn.apache.org/viewvc?rev=936093view=rev
Log:
Vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936093r1=936092r2=936093view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 20 22:29:24 2010
@@ -102,7 +102,7 @@ PATCHES PROPOSED TO BACKPORT:
 
   Additional patch:
   http://svn.apache.org/viewvc?rev=935983view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
@@ -251,7 +251,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49116
   If session is already invalid, expire session to prevent memory leak. 
   http://svn.apache.org/viewvc?view=revisionrevision=933881
-  +1: kfujino
+  +1: kfujino, markt
   -1: 
 
 * sessionCounter and expiredSessions declares as long instead of int.
@@ -259,6 +259,7 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kfujino
   -1: kkolinko: I think that we cannot change o.a.c.Manager API in such way
 in a dot release. Alternative proposal below.
+  -1: markt: We can't change the API in 6. It will have to wait until 7.
 
 * Fix possible overflows when calculating session statistics
   Fixes a) miscalculating the average because of multiplication overflow,
@@ -266,11 +267,13 @@ PATCHES PROPOSED TO BACKPORT:
   The fix for trunk is already provided by r934337.
   
http://people.apache.org/~kkolinko/patches/2010-04-17_tc6_StandardSession_statistics.patch
   +1: kkolinko
+  +0: markt You can still update the average, even if you can't update the
+count
   -1:
 
 * Improve the ChatServlet comet example and fix some issues there
   http://svn.apache.org/viewvc?rev=935105view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49151
@@ -278,11 +281,11 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?view=revisionrevision=935510
   +1: kfujino
   +1: kkolinko: and also +1 for 
http://svn.apache.org/viewvc?rev=935777view=rev
-  -1: 
+  -1: markt: and also +1 for http://svn.apache.org/viewvc?rev=935777view=rev
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49158
   http://svn.apache.org/viewvc?view=revisionrevision=935998
-  +1: fhanik
+  +1: fhanik, markt
   -1: 
 
 



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



DO NOT REPLY [Bug 49141] Impossible cast in naming.factory.SendMailFactory.getObjectInstance

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49141

--- Comment #4 from Sebb s...@apache.org 2010-04-20 18:58:46 EDT ---
The change fixes the complaint, however the class is still far removed from the
actual API.

Would it not be better to use something like geronimo-javamail_1.4_spec-1.6.jar
(e.g. from
http://repo2.maven.org/maven2/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.6/)
so that the code is compiled against a more accurate 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



Re: svn commit: r936093 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-20 Thread Konstantin Kolinko
2010/4/21  ma...@apache.org:
 Author: markt
 Date: Tue Apr 20 22:29:24 2010
 New Revision: 936093

 URL: http://svn.apache.org/viewvc?rev=936093view=rev
 Log:
 Vote


 @@ -278,11 +281,11 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?view=revisionrevision=935510
   +1: kfujino
   +1: kkolinko: and also +1 for 
 http://svn.apache.org/viewvc?rev=935777view=rev
 -  -1:
 +  -1: markt: and also +1 for http://svn.apache.org/viewvc?rev=935777view=rev

Mark, I think you meant +1: above.

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: r936093 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-20 Thread Mark Thomas
On 20/04/2010 23:58, Konstantin Kolinko wrote:
 2010/4/21  ma...@apache.org:
 Author: markt
 Date: Tue Apr 20 22:29:24 2010
 New Revision: 936093

 URL: http://svn.apache.org/viewvc?rev=936093view=rev
 Log:
 Vote

 
 @@ -278,11 +281,11 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?view=revisionrevision=935510
   +1: kfujino
   +1: kkolinko: and also +1 for 
 http://svn.apache.org/viewvc?rev=935777view=rev
 -  -1:
 +  -1: markt: and also +1 for 
 http://svn.apache.org/viewvc?rev=935777view=rev
 
 Mark, I think you meant +1: above.
I did. BMy bad. I'll fix that.

Mark



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



svn commit: r936104 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-20 Thread markt
Author: markt
Date: Tue Apr 20 23:01:05 2010
New Revision: 936104

URL: http://svn.apache.org/viewvc?rev=936104view=rev
Log:
Correct vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936104r1=936103r2=936104view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 20 23:01:05 2010
@@ -259,7 +259,8 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kfujino
   -1: kkolinko: I think that we cannot change o.a.c.Manager API in such way
 in a dot release. Alternative proposal below.
-  -1: markt: We can't change the API in 6. It will have to wait until 7.
+  +1: markt: We can't change the API in 6. It will have to wait until 7.
+  -1: 
 
 * Fix possible overflows when calculating session statistics
   Fixes a) miscalculating the average because of multiplication overflow,



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



svn commit: r936139 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-20 Thread kkolinko
Author: kkolinko
Date: Wed Apr 21 02:27:11 2010
New Revision: 936139

URL: http://svn.apache.org/viewvc?rev=936139view=rev
Log:
vote and proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936139r1=936138r2=936139view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 21 02:27:11 2010
@@ -287,6 +287,12 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49158
   http://svn.apache.org/viewvc?view=revisionrevision=935998
   +1: fhanik, markt
+  -1: kkolinko: 1) because Response#addSessionCookieInternal(..) skips
+cookies.add(cookie); call
+2) you need to take care of the useHttpOnly flag
   -1: 
 
-
+* Configure Tomcat to use HttpOnly for session cookies by default
+  
http://people.apache.org/~kkolinko/patches/2010-04-21_tc6_context_httpOnly.patch
+  +1: kkolinko
+  -1:



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



svn commit: r936140 - /tomcat/tc5.5.x/trunk/STATUS.txt

2010-04-20 Thread kkolinko
Author: kkolinko
Date: Wed Apr 21 02:34:09 2010
New Revision: 936140

URL: http://svn.apache.org/viewvc?rev=936140view=rev
Log:
proposal

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=936140r1=936139r2=936140view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Apr 21 02:34:09 2010
@@ -108,3 +108,8 @@ PATCHES PROPOSED TO BACKPORT:
   
http://people.apache.org/~kkolinko/patches/2010-04-17_tc6_StandardSession_statistics.patch
   +1: kkolinko
   -1:
+
+* Configure Tomcat to use HttpOnly for session cookies by default
+  
http://people.apache.org/~kkolinko/patches/2010-04-21_tc55_context_httpOnly.patch
+  +1: kkolinko
+  -1:



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



svn commit: r936141 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

2010-04-20 Thread kkolinko
Author: kkolinko
Date: Wed Apr 21 02:42:28 2010
New Revision: 936141

URL: http://svn.apache.org/viewvc?rev=936141view=rev
Log:
update proposed patch to address Mark's review comment

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=936141r1=936140r2=936141view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Apr 21 02:42:28 2010
@@ -105,7 +105,7 @@ PATCHES PROPOSED TO BACKPORT:
   Fixes a) miscalculating the average because of multiplication overflow,
   b) ArithmeticException division by zero when numExpired overflows.
   The fix for trunk is already provided by r934337.
-  
http://people.apache.org/~kkolinko/patches/2010-04-17_tc6_StandardSession_statistics.patch
+  
http://people.apache.org/~kkolinko/patches/2010-04-21_tc6_StandardSession_statistics.patch
   +1: kkolinko
   -1:
 

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936141r1=936140r2=936141view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 21 02:42:28 2010
@@ -265,10 +265,8 @@ PATCHES PROPOSED TO BACKPORT:
   Fixes a) miscalculating the average because of multiplication overflow,
   b) ArithmeticException division by zero when numExpired overflows.
   The fix for trunk is already provided by r934337.
-  
http://people.apache.org/~kkolinko/patches/2010-04-17_tc6_StandardSession_statistics.patch
+  
http://people.apache.org/~kkolinko/patches/2010-04-21_tc6_StandardSession_statistics.patch
   +1: kkolinko
-  +0: markt You can still update the average, even if you can't update the
-count
   -1:
 
 * Improve the ChatServlet comet example and fix some issues there



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



DO NOT REPLY [Bug 49161] New: Unknown Publisher when installing tomcat 6.0.26

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49161

   Summary: Unknown Publisher when installing tomcat 6.0.26
   Product: Tomcat 6
   Version: 6.0.26
  Platform: PC
OS/Version: Windows Vista
Status: NEW
  Severity: major
  Priority: P2
 Component: Native:Packaging
AssignedTo: dev@tomcat.apache.org
ReportedBy: mathada.samar...@googlemail.com


Version - 6.0.26
OS - Windows XP,Vista
Java - jre6/jdk1.6.0_18
Component - Installer

Repro steps:

1. Download the tomcat windows installer.
2. Double click the installer.

Actual result:
We see the installer window with publisher as 'Unknown Publisher'.
Windows Vista gives user a message 'The Publisher could not be verified. Are
you sure you want to run this software?'

Expected result:
User should see 'The Apache Software Foundation (ASF)' under the publisher
section.

Clearly a digital certificate issue with the installer. Might be a case where
in the digital certificate is not getting picked up ??.

-- 
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 49161] Unknown Publisher when installing tomcat 6.0.26

2010-04-20 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49161

mathada mathada.samar...@googlemail.com changed:

   What|Removed |Added

 CC||mathada.samar...@googlemail
   ||.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