date:20100303

Author: kkolinko
Date: Thu Mar  4 01:07:16 2010
New Revision: 918804

URL: http://svn.apache.org/viewvc?rev=918804&view=rev
Log:
votes 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=918804&r1=918803&r2=918804&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar  4 01:07:16 2010
@@ -85,7 +85,7 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48660
   Vary should add to Vary header rather than over-write it
   http://svn.apache.org/viewvc?rev=918093&view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48545
@@ -103,9 +103,14 @@
   Based on a patch by Candid Dauth
   http://svn.apache.org/viewvc?rev=910485&view=rev
   http://svn.apache.org/viewvc?rev=918489&view=rev (review feedback)
-  +1: markt
+  +1: markt, kkolinko
   -1: 
 
+  Additional patch:
+  http://svn.apache.org/viewvc?rev=918803&view=rev
+  +1: kkolinko
+  -1:
+
 * Improve logging behaviour when shutdown occurs via a shutdownhook. If 
present,
   use Catalina's shutdown hook to shutdown Tomcat and JULI. This enables them 
to
   be shutdown in the correct order. 



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

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

Author: kkolinko
Date: Thu Mar  4 01:01:48 2010
New Revision: 918803

URL: http://svn.apache.org/viewvc?rev=918803&view=rev
Log:
Mark JNDIRealm.User class constructor as public. The class itself remains 
protected.

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=918803&r1=918802&r2=918803&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Thu Mar  4 
01:01:48 2010
@@ -2227,7 +2227,7 @@
  final private String password;
  final private List roles;
 
- protected User(String username, String dn, String password,
+ public User(String username, String dn, String password,
  List roles) {
  this.username = username;
  this.dn = dn;



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

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

Author: kkolinko
Date: Thu Mar  4 00:53:05 2010
New Revision: 918802

URL: http://svn.apache.org/viewvc?rev=918802&view=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=918802&r1=918801&r2=918802&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar  4 00:53:05 2010
@@ -112,8 +112,16 @@
   http://svn.apache.org/viewvc?rev=910974&view=rev
   http://svn.apache.org/viewvc?rev=918594&view=rev (review feedback BZ48831)
   +1: markt
+  +1: kkolinko: with the additional patches proposed below
   -1: 
 
+  Additional patches:
+  http://svn.apache.org/viewvc?rev=918792&view=rev (FileHandler: whitespace)
+  http://svn.apache.org/viewvc?rev=918799&view=rev (FileHandler: try/finally)
+  http://svn.apache.org/viewvc?rev=918787&view=rev (ClassLoaderLogManager: fix 
BZ48831)
+  +1: kkolinko
+  -1:
+
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48827 a regression in
   the original fix for
   https://issues.apache.org/bugzilla/show_bug.cgi?id=47977



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

svn commit: r918799 - /tomcat/trunk/java/org/apache/juli/FileHandler.java

Author: kkolinko
Date: Thu Mar  4 00:46:44 2010
New Revision: 918799

URL: http://svn.apache.org/viewvc?rev=918799&view=rev
Log:
Followup to r918594
Be more strict with try/finally when locking

Modified:
tomcat/trunk/java/org/apache/juli/FileHandler.java

Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=918799&r1=918798&r2=918799&view=diff
==
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Thu Mar  4 00:46:44 2010
@@ -138,39 +138,43 @@
 // Update to writeLock before we switch
 writerLock.readLock().unlock();
 writerLock.writeLock().lock();
-// Make sure another thread hasn't already done this
-if (!date.equals(tsDate)) {
-closeWriter();
-date = tsDate;
-openWriter();
-}
-// Down grade to read-lock. This ensures the writer remains valid
-// until the log message is written
-writerLock.readLock().lock();
-writerLock.writeLock().unlock();
+try {
+// Make sure another thread hasn't already done this
+if (!date.equals(tsDate)) {
+closeWriter();
+date = tsDate;
+openWriter();
+}
+// Down grade to read-lock. This ensures the writer remains 
valid
+// until the log message is written
+writerLock.readLock().lock();
+} finally {
+writerLock.writeLock().unlock();
+}
 }
 
-String result = null;
-try {
-result = getFormatter().format(record);
-} catch (Exception e) {
-reportError(null, e, ErrorManager.FORMAT_FAILURE);
-writerLock.readLock().unlock();
-return;
-}
-
 try {
-if (writer!=null) {
-writer.write(result);
-if (bufferSize < 0) {
-writer.flush();
+String result = null;
+try {
+result = getFormatter().format(record);
+} catch (Exception e) {
+reportError(null, e, ErrorManager.FORMAT_FAILURE);
+return;
+}
+
+try {
+if (writer!=null) {
+writer.write(result);
+if (bufferSize < 0) {
+writer.flush();
+}
+} else {
+reportError("FileHandler is closed or not yet initialized, 
unable to log ["+result+"]", null, ErrorManager.WRITE_FAILURE);
 }
-} else {
-reportError("FileHandler is closed or not yet initialized, 
unable to log ["+result+"]", null, ErrorManager.WRITE_FAILURE);
+} catch (Exception e) {
+reportError(null, e, ErrorManager.WRITE_FAILURE);
+return;
 }
-} catch (Exception e) {
-reportError(null, e, ErrorManager.WRITE_FAILURE);
-return;
 } finally {
 writerLock.readLock().unlock();
 }
@@ -190,8 +194,8 @@
 
 protected void closeWriter() {
 
+writerLock.writeLock().lock();
 try {
-writerLock.writeLock().lock();
 if (writer == null)
 return;
 writer.write(getFormatter().getTail(this));
@@ -213,8 +217,8 @@
 @Override
 public void flush() {
 
+writerLock.readLock().lock();
 try {
-writerLock.readLock().lock();
 if (writer == null)
 return;
 writer.flush();
@@ -319,13 +323,13 @@
 dir.mkdirs();
 
 // Open the current log file
+writerLock.writeLock().lock();
 try {
 String pathname = dir.getAbsolutePath() + File.separator +
 prefix + date + suffix;
 String encoding = getEncoding();
 FileOutputStream fos = new FileOutputStream(pathname, true);
 OutputStream os = bufferSize>0?new 
BufferedOutputStream(fos,bufferSize):fos;
-writerLock.writeLock().lock();
 writer = new PrintWriter(
 (encoding != null) ? new OutputStreamWriter(os, encoding)
: new OutputStreamWriter(os), false);



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

svn commit: r918792 - /tomcat/trunk/java/org/apache/juli/FileHandler.java

Author: kkolinko
Date: Thu Mar  4 00:28:47 2010
New Revision: 918792

URL: http://svn.apache.org/viewvc?rev=918792&view=rev
Log:
Followup to markt's r918594
Replace tabs with four spaces. No functional change.

Modified:
tomcat/trunk/java/org/apache/juli/FileHandler.java

Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=918792&r1=918791&r2=918792&view=diff
==
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Thu Mar  4 00:28:47 2010
@@ -135,15 +135,15 @@
 writerLock.readLock().lock();
 // If the date has changed, switch log files
 if (!date.equals(tsDate)) {
-   // Update to writeLock before we switch
+// Update to writeLock before we switch
 writerLock.readLock().unlock();
-   writerLock.writeLock().lock();
-   // Make sure another thread hasn't already done this
-   if (!date.equals(tsDate)) {
-   closeWriter();
-   date = tsDate;
-   openWriter();
-   }
+writerLock.writeLock().lock();
+// Make sure another thread hasn't already done this
+if (!date.equals(tsDate)) {
+closeWriter();
+date = tsDate;
+openWriter();
+}
 // Down grade to read-lock. This ensures the writer remains valid
 // until the log message is written
 writerLock.readLock().lock();
@@ -155,7 +155,7 @@
 result = getFormatter().format(record);
 } catch (Exception e) {
 reportError(null, e, ErrorManager.FORMAT_FAILURE);
-   writerLock.readLock().unlock();
+writerLock.readLock().unlock();
 return;
 }
 
@@ -172,7 +172,7 @@
 reportError(null, e, ErrorManager.WRITE_FAILURE);
 return;
 } finally {
-   writerLock.readLock().unlock();
+writerLock.readLock().unlock();
 }
 }
 
@@ -214,14 +214,14 @@
 public void flush() {
 
 try {
-   writerLock.readLock().lock();
+writerLock.readLock().lock();
 if (writer == null)
 return;
 writer.flush();
 } catch (Exception e) {
 reportError(null, e, ErrorManager.FLUSH_FAILURE);
 } finally {
-   writerLock.readLock().unlock();
+writerLock.readLock().unlock();
 }
 
 }



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

svn commit: r918787 - /tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java

Author: kkolinko
Date: Thu Mar  4 00:18:44 2010
New Revision: 918787

URL: http://svn.apache.org/viewvc?rev=918787&view=rev
Log:
Fix 2. of https://issues.apache.org/bugzilla/show_bug.cgi?id=48831#c3
When resetting a logger do not close handlers that do not belong to the current 
class loader.

Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java

Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=918787&r1=918786&r2=918787&view=diff
==
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Thu Mar  4 
00:18:44 2010
@@ -300,6 +300,14 @@
 
 }
 
+@Override
+public void reset() throws SecurityException {
+ClassLoader classLoader = Thread.currentThread()
+.getContextClassLoader();
+ClassLoaderLogInfo clLogInfo = getClassLoaderInfo(classLoader);
+resetLoggers(clLogInfo);
+super.reset();
+}
 
 /**
  * Shuts down the logging system.
@@ -308,23 +316,33 @@
 // The JVM is being shutdown. Make sure all loggers for all class
 // loaders are shutdown
 for (ClassLoaderLogInfo clLogInfo : classLoaderLoggers.values()) {
-for (Logger logger : clLogInfo.loggers.values()) {
-resetLogger(logger);
-}
+resetLoggers(clLogInfo);
 }
 }
 
 //  Private Methods
-private void resetLogger(Logger logger) {
-
-Handler[] handlers = logger.getHandlers();
-for (Handler handler : handlers) {
-logger.removeHandler(handler);
-try {
-handler.close();
-} catch (Exception e) {
-// Ignore
+private void resetLoggers(ClassLoaderLogInfo clLogInfo) {
+// This differs from LogManager#resetLogger() in that we close not all
+// handlers of all loggers, but only those that are present in our
+// ClassLoaderLogInfo#handlers list. That is because our #addLogger(..)
+// method can use handlers from the parent class loaders, and closing
+// handlers that the current class loader does not own would be not
+// good.
+synchronized (clLogInfo) {
+for (Logger logger : clLogInfo.loggers.values()) {
+Handler[] handlers = logger.getHandlers();
+for (Handler handler : handlers) {
+logger.removeHandler(handler);
+}
+}
+for (Handler handler : clLogInfo.handlers.values()) {
+try {
+handler.close();
+} catch (Exception e) {
+// Ignore
+}
 }
+clLogInfo.handlers.clear();
 }
 }
 



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

DO NOT REPLY [Bug 48845] real timeout interval less than setting interval

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2010-03-03 23:56:51 UTC ---
Bugzilla is not a support forum. Please use the Tomcat users mailing list.

-- 
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 48851] Receiving http status 505 on tomcat v6.0.16

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2010-03-03 23:43:36 UTC ---
Bugzilla is not a support forum. Please use the Tomcat users mailing list.

-- 
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 48686] Cannot delete hosts using Administration Tool webapp (HTTP 500 error)

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2010-03-03 23:42:51 UTC ---
This has been fixed in 5.5.x and will be included in 5.5.29 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: r918779 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java container/webapps/docs/changelog.xml

Author: markt
Date: Wed Mar  3 23:42:33 2010
New Revision: 918779

URL: http://svn.apache.org/viewvc?rev=918779&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48686
Fix NPE in host delete

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

tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918779&r1=918778&r2=918779&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 23:42:33 2010
@@ -113,12 +113,6 @@
   +1: kkolinko, rjung
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48686
-  Fix NPE in host delete
-  https://issues.apache.org/bugzilla/attachment.cgi?id=24966
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582
   Avoid NPE on background compile
   http://svn.apache.org/viewvc?rev=910471&view=rev

Modified: 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java?rev=918779&r1=918778&r2=918779&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
 Wed Mar  3 23:42:33 2010
@@ -113,7 +113,7 @@
 // this host cannot be deleted from the admin tool
 try {
 adminHost = Lists.getAdminAppHost(
-  mBServer, "domain" ,request);
+  mBServer, domain ,request);
 } catch (Exception e) {
 String message =
 resources.getMessage(locale, "error.hostName.bad",

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=918779&r1=918778&r2=918779&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar  3 
23:42:33 2010
@@ -278,6 +278,10 @@
 in the documentation web application to specify how the defaults for 
the
 various trust store attributes are determined. (markt)
   
+  
+48686: Fix deleting a host via the Administration web
+application rather than failign with a HTTP 500 response. (markt)
+  
   
 Make changelog.xml be directly rendered as HTML by certain browsers.
 (kkolinko)



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

DO NOT REPLY [Bug 48851] New: Receiving http status 505 on tomcat v6.0.16

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

   Summary: Receiving http status 505 on tomcat v6.0.16
   Product: Tomcat 6
   Version: unspecified
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: man-sin@alliancebernstein.com


Hi,

I was just wondering if there is any report that tomcatv6.0.16 casues http
status 505.  The user browse the site fine for awhile and then this error came.

Regards,
Man

-- 
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 48581] 5.5.28: AccessControlException in InternalOutputBuffer.sendStatus

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2010-03-03 23:39:38 UTC ---
This has been fixed in 5.5.x and will be included in 5.5.29 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: r918778 - in /tomcat/tc5.5.x/trunk: ./ connectors/http11/src/java/org/apache/coyote/http11/ connectors/jk/java/org/apache/coyote/ajp/ connectors/jk/java/org/apache/jk/common/ container/web

Author: markt
Date: Wed Mar  3 23:39:19 2010
New Revision: 918778

URL: http://svn.apache.org/viewvc?rev=918778&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48581
Avoid security exception on first access

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

tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Constants.java

tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java

tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java

tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/coyote/ajp/Constants.java

tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/jk/common/AjpConstants.java

tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/jk/common/JkInputStream.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918778&r1=918777&r2=918778&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 23:39:19 2010
@@ -100,12 +100,6 @@
   +1: markt, rjung
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48581
-  Avoid security exception on first access
-  http://people.apache.org/~markt/patches/2010-02-02-bug48581.patch
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48179
   Improve processing of TLD cache file
   https://issues.apache.org/bugzilla/attachment.cgi?id=24918

Modified: 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Constants.java?rev=918778&r1=918777&r2=918778&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Constants.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Constants.java
 Wed Mar  3 23:39:19 2010
@@ -206,4 +206,10 @@
 public static final String POST = "POST";
 
 
+/**
+ * Should custom status messages be allowed in headers? Replicated to avoid
+ * an exception on first access if running under a security manager.
+ */
+public static final boolean USE_CUSTOM_STATUS_MSG_IN_HEADER =
+org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER;
 }

Modified: 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=918778&r1=918777&r2=918778&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
 Wed Mar  3 23:39:19 2010
@@ -430,7 +430,7 @@
 
 // Write message
 String message = null;
-if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER &&
+if (Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER &&
 HttpMessages.isSafeInHttpHeader(response.getMessage())) {
 message = response.getMessage();
 } 

Modified: 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=918778&r1=918777&r2=918778&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
 Wed Mar  3 23:39:19 2010
@@ -449,7 +449,7 @@
 
 // Write message
 String message = null;
-if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER &&
+if (Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER &&
 HttpMessages.isSafeInHttpHeader(response.getMessage())) {
 message = response.getMessage();
 } 

Modified: 
tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=918778&r1=918777&r2=918778&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connector

DO NOT REPLY [Bug 48004] setHeader() does not replace the previous value for a "Server"

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #5 from Mark Thomas  2010-03-03 23:31:49 UTC ---
This has been fixed in 5..5.x and will be included in 5.5.29 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: r918772 - in /tomcat/tc5.5.x/trunk: ./ connectors/http11/src/java/org/apache/coyote/http11/ container/webapps/docs/ container/webapps/docs/config/

Author: markt
Date: Wed Mar  3 23:31:31 2010
New Revision: 918772

URL: http://svn.apache.org/viewvc?rev=918772&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48004
Allow applications to set the Server header

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

tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java

tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918772&r1=918771&r2=918772&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 23:31:31 2010
@@ -100,12 +100,6 @@
   +1: markt, rjung
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48004
-  Allow applications to set the Server header
-  http://svn.apache.org/viewvc?rev=898527&view=rev
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48581
   Avoid security exception on first access
   http://people.apache.org/~markt/patches/2010-02-02-bug48581.patch

Modified: 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=918772&r1=918771&r2=918772&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
 Wed Mar  3 23:31:31 2010
@@ -1659,8 +1659,10 @@
 
 // Add server header
 if (server != null) {
+// Always overrides anything the app might set
 headers.setValue("Server").setString(server);
-} else {
+} else if (headers.getValue("Server") == null) {
+// If app didn't set the header, use the default
 outputBuffer.write(Constants.SERVER_BYTES);
 }
 

Modified: 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java?rev=918772&r1=918771&r2=918772&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
 Wed Mar  3 23:31:31 2010
@@ -1617,8 +1617,10 @@
 
 // Add server header
 if (server != null) {
+// Always overrides anything the app might set
 headers.setValue("Server").setString(server);
-} else {
+} else if (headers.getValue("Server") == null) {
+// If app didn't set the header, use the default
 outputBuffer.write(Constants.SERVER_BYTES);
 }
 

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=918772&r1=918771&r2=918772&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar  3 
23:31:31 2010
@@ -116,6 +116,9 @@
 with RFC2616. (markt/kkolinko)
   
   
+48004: Allow applications to set the Server header. (markt)
+  
+  
 48049: Fix copy and paste error so
 NamingContext.destroySubContext() works correctly.
 Patch provided by gingyang.xu (markt)

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml?rev=918772&r1=918771&r2=918772&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml Wed Mar  3 
23:31:31 2010
@@ -326,8 +326,12 @@
 
 
 
-  The Server header for the http response.
- Unless you are paranoid, you won't need this feature.
+  Overrides the Server header for the http response. If set, the value
+  for this attribute overrides the Tomcat default and any Server header set
+  by a web application. If not set, any value specified by the application
+  is used.

DO NOT REPLY [Bug 47963] HTTP status reason-phrase contains illegal characters in Japanese locale

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #6 from Mark Thomas  2010-03-03 23:26:16 UTC ---
This has been fixed in 5.5.x and will be included in 5.5.29 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: r918767 - in /tomcat/tc5.5.x/trunk: ./ connectors/http11/src/java/org/apache/coyote/http11/ connectors/jk/java/org/apache/coyote/ajp/ connectors/jk/java/org/apache/jk/common/ connectors/ut

Author: markt
Date: Wed Mar  3 23:26:05 2010
New Revision: 918767

URL: http://svn.apache.org/viewvc?rev=918767&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47963
Prevent use of non-RFC2616 compliant custom status messages

Added:

tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java

tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java

tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java

tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/jk/common/JkInputStream.java

tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/HttpMessages.java

tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings.properties

tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties

tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_fr.properties
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918767&r1=918766&r2=918767&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 23:26:05 2010
@@ -100,12 +100,6 @@
   +1: markt, rjung
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47963
-  Prevent use of non-RFC2616 compliant custom status messages
-  http://svn.apache.org/viewvc?view=revision&revision=892777
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48004
   Allow applications to set the Server header
   http://svn.apache.org/viewvc?rev=898527&view=rev

Modified: 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=918767&r1=918766&r2=918767&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
 Wed Mar  3 23:26:05 2010
@@ -430,13 +430,14 @@
 
 // Write message
 String message = null;
-if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER &&
+HttpMessages.isSafeInHttpHeader(response.getMessage())) {
 message = response.getMessage();
 } 
 if (message == null) {
 write(HttpMessages.getMessage(status));
 } else {
-write(message.replace('\n', ' ').replace('\r', ' '));
+write(message);
 }
 
 // End the response status line

Modified: 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=918767&r1=918766&r2=918767&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
 Wed Mar  3 23:26:05 2010
@@ -449,13 +449,14 @@
 
 // Write message
 String message = null;
-if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER &&
+HttpMessages.isSafeInHttpHeader(response.getMessage())) {
 message = response.getMessage();
 } 
 if (message == null) {
 write(getMessage(status));
 } else {
-write(message.replace('\n', ' ').replace('\r', ' '));
+write(message);
 }
 
 // End the response status line

Modified: 
tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=918767&r1=918766&r2=918767&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
 (or

DO NOT REPLY [Bug 45255] support disable jsessionid from url against session fixation attacks

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #27 from Mark Thomas  2010-03-03 23:12:24 UTC ---
The ability to change the session ID on authentication has been added to 5.5.x
and will be included in 5.5.29 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: r918761 - in /tomcat/tc5.5.x/trunk: ./ container/catalina/src/share/org/apache/catalina/ container/catalina/src/share/org/apache/catalina/authenticator/ container/catalina/src/share/org/ap

Author: markt
Date: Wed Mar  3 23:11:30 2010
New Revision: 918761

URL: http://svn.apache.org/viewvc?rev=918761&view=rev
Log:
Address https://issues.apache.org/bugzilla/show_bug.cgi?id=45255
Prevent session fixation by providing option (disabled by default) to change 
session ID on authentication

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

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

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java

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

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/session/ManagerBase.java

tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java

tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/valve.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918761&r1=918760&r2=918761&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 23:11:30 2010
@@ -100,26 +100,6 @@
   +1: markt, rjung
   -1: 
 
-* Address https://issues.apache.org/bugzilla/show_bug.cgi?id=45255
-  Prevent session fixation by changing session ID on authentication by default
-  If you don't like the session ID changing by default, feel free to caveat 
your
-  vote. If there is sufficient support for the patch but insufficient support
-  for changing the ID by default I'll apply the patch with the default set to
-  not change the session ID
-  http://svn.apache.org/viewvc?rev=889716&view=rev
-  +1: markt, rjung
-  +1: kkolinko: with r892415
-  -1: 
-  rjung: I'd prefer off by default, because 5.5 is assumed to be very stable,
-  and changing by default can break things like e.g. existing profiles for
-  automated stress testing.
-  kkolinko: I agree to have off by default
-
-  Provide setter for the new AuthenticatorBase property
-  http://svn.apache.org/viewvc?rev=892415&view=rev
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47963
   Prevent use of non-RFC2616 compliant custom status messages
   http://svn.apache.org/viewvc?view=revision&revision=892777

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Manager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Manager.java?rev=918761&r1=918760&r2=918761&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Manager.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Manager.java
 Wed Mar  3 23:11:30 2010
@@ -260,6 +260,15 @@
 
 
 /**
+ * Change the session ID of the current session to a new randomly generated
+ * session ID.
+ * 
+ * @param session   The session to change the session ID for
+ */
+public void changeSessionId(Session session);
+
+
+/**
  * Get a session from the recycled ones or create a new empty one.
  * The PersistentManager manager does not need to create session data
  * because it reads it from the Store.

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=918761&r1=918760&r2=918761&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
 Wed Mar  3 23:11:30 2010
@@ -37,6 +37,7 @@
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Manager;
 import org.apache.catalina.Pipeline;
 import org.apache.catalina.Realm;
 import org.apache.catalina.Session;
@@ -113,6 +114,12 @@
 
 
 /**
+ * Should the session ID, if any, be changed upon a successful
+ * authentication to prevent a session fixation attack?
+ */
+protected boolean changeSessionIdOnAuthentication = false;
+
+/**
  * The Context to which this Valve is attached.
  */
 protected Context context = null;
@@ -366,6 +373,31 @@
 this.securePagesWithPragma = securePagesWithPragma;

svn commit: r918755 - /tomcat/tc5.5.x/trunk/build/build.xml

Author: markt
Date: Wed Mar  3 23:03:50 2010
New Revision: 918755

URL: http://svn.apache.org/viewvc?rev=918755&view=rev
Log:
Fix broken 5.5.x build - jkstatus has moved to tomcat/jk/trunk

Modified:
tomcat/tc5.5.x/trunk/build/build.xml

Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=918755&r1=918754&r2=918755&view=diff
==
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Wed Mar  3 23:03:50 2010
@@ -144,11 +144,6 @@
   
 
 
-   
-  
-
-
 
   
@@ -293,25 +288,6 @@
 
   
 
-  
-== Building: tomcat-jkstatus-ant 
-
-
-  
-  
-
-
-   
-   
-
-  
-  
-
-
-  
-  
   
@@ -619,7 +595,6 @@
 
 
 
-
 
 
 
@@ -1494,8 +1469,6 @@
 
 
 
-
-
 
 
 



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

svn commit: r918746 - /tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java

Author: markt
Date: Wed Mar  3 22:46:14 2010
New Revision: 918746

URL: http://svn.apache.org/viewvc?rev=918746&view=rev
Log:
Backport: Handle session suffix rewrite at JvmRouteBinderValve with parallel 
requests from same client (pero)
Should have been applied at the same time 
o.a.c.cluster.session.JvMRouteBinderValve was patched

Modified:

tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java

Modified: 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=918746&r1=918745&r2=918746&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
 Wed Mar  3 22:46:14 2010
@@ -35,6 +35,7 @@
 import org.apache.catalina.ha.ClusterManager;
 import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.ha.ClusterValve;
+import org.apache.catalina.ha.session.DeltaSession;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.session.ManagerBase;
@@ -235,16 +236,19 @@
  * @param response current response
  */
 protected void handlePossibleTurnover(Request request, Response response) {
-Session session = request.getSessionInternal(false);
-if (session != null) {
-long t1 = System.currentTimeMillis();
+String sessionID = request.getRequestedSessionId() ;
+if (sessionID != null) {
+long t1 = 0 ;
+if (log.isDebugEnabled()) {
+t1 = System.currentTimeMillis();
+}
 String jvmRoute = getLocalJvmRoute(request);
 if (jvmRoute == null) {
 if (log.isWarnEnabled())
 
log.warn(sm.getString("jvmRoute.missingJvmRouteAttribute"));
 return;
 }
-handleJvmRoute( request, response,session.getIdInternal(), 
jvmRoute);
+handleJvmRoute( request, response, sessionID, jvmRoute);
 if (log.isDebugEnabled()) {
 long t2 = System.currentTimeMillis();
 long time = t2 - t1;
@@ -324,23 +328,32 @@
 log.debug(sm.getString("jvmRoute.failover", requestJvmRoute,
 localJvmRoute, sessionId));
 }
-// OK - turnover the session ?
-String newSessionID = sessionId.substring(0, index) + "."
-+ localJvmRoute;
 Session catalinaSession = null;
 try {
 catalinaSession = getManager(request).findSession(sessionId);
 } catch (IOException e) {
 // Hups!
 }
+String id = sessionId.substring(0, index);
+String newSessionID = id + "." + localJvmRoute;
+// OK - turnover the session and inform other cluster nodes
 if (catalinaSession != null) {
 changeSessionID(request, response, sessionId, newSessionID,
 catalinaSession);
 numberOfSessions++;
 } else {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("jvmRoute.cannotFindSession",
-sessionId));
+try {
+catalinaSession = 
getManager(request).findSession(newSessionID);
+} catch (IOException e) {
+// Hups!
+}
+if (catalinaSession != null) {
+// session is rewrite at other request, rewrite this also
+changeRequestSessionID(request, response, sessionId, 
newSessionID);
+} else {
+if (log.isDebugEnabled()) {
+
log.debug(sm.getString("jvmRoute.cannotFindSession",sessionId));
+}
 }
 }
 }
@@ -362,20 +375,14 @@
 Response response, String sessionId, String newSessionID, Session 
catalinaSession) {
 lifecycle.fireLifecycleEvent("Before session migration",
 catalinaSession);
-request.setRequestedSessionId(newSessionID);
+// FIXME: setId trigger session Listener, but only chance to 
registiert manager with correct id!
 catalinaSession.setId(newSessionID);
+// FIXME: Why we remove change data from other running request?
+// setId also trigger resetDeltaRequest!!
 if (catalinaSession instanceof DeltaSession)
 ((DeltaSession) catalinaSession).resetDeltaRequest();
-if(request.

svn commit: r918743 - /tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java

Author: markt
Date: Wed Mar  3 22:38:59 2010
New Revision: 918743

URL: http://svn.apache.org/viewvc?rev=918743&view=rev
Log:
More whitespace alignment.
No functional change.

Modified:

tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java

Modified: 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=918743&r1=918742&r2=918743&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
 Wed Mar  3 22:38:59 2010
@@ -213,13 +213,14 @@
  // valve cluster can access manager - other cluster handle 
turnover 
  // at host level - hopefully!
  Manager manager = request.getContext().getManager();
-
+ 
  if (manager != null && (
  (manager instanceof ClusterManager
&& getCluster() != null
&& 
getCluster().getManager(((ClusterManager)manager).getName()) != null)
  ||
  (manager instanceof PersistentManager)))
+ 
  handlePossibleTurnover(request, response);
 }
 // Pass this request on to the next valve in our pipeline



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

svn commit: r918742 - /tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java

Author: markt
Date: Wed Mar  3 22:37:21 2010
New Revision: 918742

URL: http://svn.apache.org/viewvc?rev=918742&view=rev
Log:
Align comments and whitespace between the two JvmRouteBinderValve 
implementations.
No functional change.

Modified:

tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java

Modified: 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=918742&r1=918741&r2=918742&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
 Wed Mar  3 22:37:21 2010
@@ -78,6 +78,7 @@
  * 
  * 
  * Before 5.5.10 as Host element:
+ * 
  * 
  *  
  *    



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

svn commit: r918741 - /tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java

Author: markt
Date: Wed Mar  3 22:36:41 2010
New Revision: 918741

URL: http://svn.apache.org/viewvc?rev=918741&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47554
httpOnly flag not applied to migrated session cookie
(should be been applied at same time as fix was applied to 
o.a.c.ha.session.JvmRouteBinderValve)

Modified:

tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java

Modified: 
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?rev=918741&r1=918740&r2=918741&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
 Wed Mar  3 22:36:41 2010
@@ -475,12 +475,14 @@
 newCookie.setSecure(true);
 }
 if (log.isDebugEnabled()) {
-log.debug(sm.getString("jvmRoute.newSessionCookie",
-sessionId, Globals.SESSION_COOKIE_NAME, newCookie
-.getPath(), new Boolean(newCookie
-.getSecure(;
+Object[] args = new Object[] {sessionId,
+Globals.SESSION_COOKIE_NAME,
+newCookie.getPath(),
+new Boolean(newCookie.getSecure()),
+new Boolean(context.getUseHttpOnly())};
+log.debug(sm.getString("jvmRoute.newSessionCookie", args));
 }
-response.addCookie(newCookie);
+response.addCookieInternal(newCookie, 
context.getUseHttpOnly());
 }
 }
 }



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

svn commit: r918737 - /tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java

Author: markt
Date: Wed Mar  3 22:18:01 2010
New Revision: 918737

URL: http://svn.apache.org/viewvc?rev=918737&view=rev
Log:
Align comments and whitespace between the two JvmRouteBinderValve 
implementations.
No functional change.

Modified:

tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java

Modified: 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=918737&r1=918736&r2=918737&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
 Wed Mar  3 22:18:01 2010
@@ -45,40 +45,51 @@
 
 /**
  * Valve to handle Tomcat jvmRoute takeover using mod_jk module after node
- * failure. After a node crashed the next request going to other cluster node.
- * Now the answering from apache is slower ( make some error handshaking. Very
- * bad with apache at my windows.). We rewrite now the cookie jsessionid
- * information to the backup cluster node. After the next response all client
- * request goes direct to the backup node. The change sessionid send also to 
all
- * other cluster nodes. Well, now the session stickyness work directly to the
- * backup node and traffic don't go back too restarted cluster nodes!
+ * failure. After a node crashes, subsequent requests go to other cluster 
nodes.
+ * That incurs a drop in performance. When this Valve is enabled on a backup
+ * node and sees a request, which was intended for another (thus failed) node,
+ * it will rewrite the cookie jsessionid information to use the route to this
+ * backup cluster node, that answered the request. After the response is
+ * delivered to the client, all subsequent client requests will go directly to
+ * the backup node. The change of sessionid is also sent to all other cluster
+ * nodes. After all that, the session stickyness will work directly to the
+ * backup node and the traffic will not go back to the failed node after it is
+ * restarted!
  * 
- * At all cluster node you must configure the as ClusterListener since 5.5.10
- * {...@link org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener 
JvmRouteSessionIDBinderListener}
- * or before with
- * org.apache.catalina.ha.session.JvmRouteSessionIDBinderListenerLifecycle.
+ * 
+ * For this valve to function correctly, so that all nodes of the cluster
+ * receive the sessionid change notifications that it generates, the following
+ * ClusterListener MUST be configured at all nodes of the cluster:
+ * {...@link 
org.apache.catalina.cluster.session.JvmRouteSessionIDBinderListener
+ * JvmRouteSessionIDBinderListener} since Tomcat 5.5.10, and both
+ * JvmRouteSessionIDBinderListener and JvmRouteSessionIDBinderLifecycleListener
+ * for earlier versions of Tomcat.
  * 
+ * 
  * Add this Valve to your host definition at conf/server.xml .
  * 
  * Since 5.5.10 as direct cluster valve:
+ * 
  * 
  *  
  *    
  *  
  * 
+ * 
  * 
  * Before 5.5.10 as Host element:
  * 
- *  
+ *  
  *    
- *  
+ *  
  * 
  * 
- * Trick:
- * You can enable this mod_jk turnover mode via JMX before you drop a node to 
all backup nodes!
- * Set enable true on all JvmRouteBinderValve backups, disable worker at 
mod_jk 
- * and then drop node and restart it! Then enable mod_jk Worker and disable 
JvmRouteBinderValves again. 
- * This use case means that only requested session are migrated.
+ * A Trick:
+ * You can enable this mod_jk turnover mode via JMX before you drop a node to
+ * all backup nodes! Set enable true on all JvmRouteBinderValve backups, 
disable
+ * worker at mod_jk and then drop node and restart it! Then enable mod_jk 
worker
+ * and disable JvmRouteBinderValves again. This use case means that only
+ * requested sessions are migrated.
  * 
  * @author Peter Rossbach
  * @version $Revision$ $Date$
@@ -369,8 +380,7 @@
 sendSessionIDClusterBackup(manager,request,sessionId, 
newSessionID);
 }
 
-lifecycle
-.fireLifecycleEvent("After session migration", 
catalinaSession);
+lifecycle.fireLifecycleEvent("After session migration", 
catalinaSession);
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("jvmRoute.changeSession", sessionId,
 newSessionID));



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

svn commit: r918711 - /tomcat/jk/trunk/native/common/jk_mt.h

2010-03-03 Thread fuankg

Author: fuankg
Date: Wed Mar  3 21:46:42 2010
New Revision: 918711

URL: http://svn.apache.org/viewvc?rev=918711&view=rev
Log:
fixed comment.

Modified:
tomcat/jk/trunk/native/common/jk_mt.h

Modified: tomcat/jk/trunk/native/common/jk_mt.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_mt.h?rev=918711&r1=918710&r2=918711&view=diff
==
--- tomcat/jk/trunk/native/common/jk_mt.h (original)
+++ tomcat/jk/trunk/native/common/jk_mt.h Wed Mar  3 21:46:42 2010
@@ -73,7 +73,7 @@
 
 #if defined(AS400) || defined(NETWARE)
 #define jk_pthread_t   jk_uint32_t
-#endif /* AS400 */
+#endif /* AS400 || NETWARE */
 jk_pthread_t jk_gettid(void);
 #endif /* WIN32 */
 



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

Re: Feedback on tomcat memory leak protection

2010-03-03 Thread Mark Thomas

On 03/03/2010 21:12, Sylvain Laurent wrote:
> 1) first of all THANK YOU for providing some solutions to those problems. 
> It's not perfect, but it's very valuable
Glad you are finding it useful.

> 2) About JreMemoryLeakPreventionListener : Here are other leaks I know of :
> 2.1) When using JNDI for LDAP access, if you use connection pooling, the JRE 
> spawns a Thread whose context classloader is set to the one of the thread 
> that initializes com.sun.jndi.ldap.LdapPoolManager. If it's a 
> WebAppClassLoader, there's a leak. So, we could the initialization of 
> com.sun.jndi.ldap.LdapPoolManager as an option for 
> JreMemoryLeakPreventionListener.
> 
> 2.2) Not JRE, but of the same kind : with Oracle JDBC driver 10.2.x, the 
> first time "statement timeouts" are used, a thread is spawned with the same 
> CCL leak. One can force the spawning by initializing 
> oracle.jdbc.driver.OracleTimeoutThreadPerVM before starting webapps. We could 
> provide a new *MemoryLeakPreventionListener for this kind of 3rd-party leak.
I'll add those to my todo list.

> 3) a couple of months ago I had proposed on this very list a kind of memory 
> leak protection for those leaks caused by threads with incorrect CCL. I 
> called this the ExpendableClassLoader. Please have a look at my post back 
> then : 
> http://mail-archives.apache.org/mod_mbox/tomcat-dev/200903.mbox/%3cb1be8ffd-f13f-4b2b-b25a-83f2f855b...@m4x.org%3e
> Since I did not get any feedback about this idea at all, neither positive nor 
> negative, I can only assume that my post got lost in the middle of the other 
> ones. I still think that this ExpendableClassLoader would improve the memory 
> leak protection. Actually it would make the JreMemoryLeakPreventionListener 
> useless and developers would not have to think about which option of the 
> JreMemoryLeakPreventionListener is useful to them.
I suspect the lack of full source code (the Tomcat lists drop
attachments) had something to do with it. The concept sounds promising
and would be better than continually adding to the
JreLeakPreventionListener.

> 4) Not tomcat specific, but it might interest you anyways :
> there's definitely a problem with Sun's server VM, even with the latest 
> 6.0_18. Classloaders are not always collected by the GC and this can lead to 
> an OOME in the perm gen. I managed to reproduce this with tomcat 6.0.24 and 
> the petcare.war sample of Spring 3. When using the client VM, the 
> WebAppClassLoader is always correctly GCed. When using the server VM (either 
> 32 or 64 bits, on Windows or MacOS), the classloader is not collected and 
> after a couple of redeployments, the perm gen is full and an OOME is raised. 
> When analyzing the heap dump, I can see several instances of 
> WebAppClassLoaders, and eclipse MAT (www.eclipse.org/mat) shows that there's 
> no strong reference to them :-(((
That sounds like http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6916498

Mark



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

Feedback on tomcat memory leak protection

2010-03-03 Thread Sylvain Laurent

Hello,

After reading Mark Thomas's interview at DZone
http://java.dzone.com/articles/memory-leak-protection-tomcat and having
experimented with classloader leaks issues, I'd like to share my thoughts with
you :

1) first of all THANK YOU for providing some solutions to those problems. It's
not perfect, but it's very valuable

2) About JreMemoryLeakPreventionListener : Here are other leaks I know of :
2.1) When using JNDI for LDAP access, if you use connection pooling, the JRE
spawns a Thread whose context classloader is set to the one of the thread that
initializes com.sun.jndi.ldap.LdapPoolManager. If it's a WebAppClassLoader,
there's a leak. So, we could the initialization of
com.sun.jndi.ldap.LdapPoolManager as an option for
JreMemoryLeakPreventionListener.

2.2) Not JRE, but of the same kind : with Oracle JDBC driver 10.2.x, the first
time "statement timeouts" are used, a thread is spawned with the same CCL leak.
One can force the spawning by initializing
oracle.jdbc.driver.OracleTimeoutThreadPerVM before starting webapps. We could
provide a new *MemoryLeakPreventionListener for this kind of 3rd-party leak.

3) a couple of months ago I had proposed on this very list a kind of memory
leak protection for those leaks caused by threads with incorrect CCL. I called
this the ExpendableClassLoader. Please have a look at my post back then :
http://mail-archives.apache.org/mod_mbox/tomcat-dev/200903.mbox/%3cb1be8ffd-f13f-4b2b-b25a-83f2f855b...@m4x.org%3e
Since I did not get any feedback about this idea at all, neither positive nor
negative, I can only assume that my post got lost in the middle of the other
ones. I still think that this ExpendableClassLoader would improve the memory
leak protection. Actually it would make the JreMemoryLeakPreventionListener
useless and developers would not have to think about which option of the
JreMemoryLeakPreventionListener is useful to them.

4) Not tomcat specific, but it might interest you anyways :
there's definitely a problem with Sun's server VM, even with the latest 6.0_18.
Classloaders are not always collected by the GC and this can lead to an OOME in
the perm gen. I managed to reproduce this with tomcat 6.0.24 and the
petcare.war sample of Spring 3. When using the client VM, the WebAppClassLoader
is always correctly GCed. When using the server VM (either 32 or 64 bits, on
Windows or MacOS), the classloader is not collected and after a couple of
redeployments, the perm gen is full and an OOME is raised. When analyzing the
heap dump, I can see several instances of WebAppClassLoaders, and eclipse MAT
(www.eclipse.org/mat) shows that there's no strong reference to them :-(((

Thank you for your attention,

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

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

Author: markt
Date: Wed Mar  3 21:07:47 2010
New Revision: 918691

URL: http://svn.apache.org/viewvc?rev=918691&view=rev
Log:
Withdraw broken patch proposal, vote for Konstantin's new version

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=918691&r1=918690&r2=918691&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 21:07:47 2010
@@ -42,17 +42,9 @@
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
   Fix compilation error with some nested tag files and simple tags
-  Concerns were raised regarding possible regressions. I have tested tag files,
-  simple tags and tags and can't find any regression issues. The TCK also
-  passes.
-  http://people.apache.org/~markt/patches/2010-02-02-bug42390-tc5.patch
-  +1: markt
-  -1: kkolinko: The same concerns as for TC 6 patch
-
-  Alternative proposal:
   https://issues.apache.org/bugzilla/show_bug.cgi?id=48616#c22
   (https://issues.apache.org/bugzilla/attachment.cgi?id=24993)
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041



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

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

2010-03-03 Thread Mark Thomas

On 03/03/2010 21:01, ma...@apache.org wrote:
> Author: markt
> Date: Wed Mar  3 21:01:48 2010
> New Revision: 918686
> 
> URL: http://svn.apache.org/viewvc?rev=918686&view=rev
> Log:
> Proposal

This is the remaining regression in 6.0.24/25. Assuming this gets the
votes, once it is committed I think we'll be ready for 6.0.26. The other
patches would be nice to have but are not essential.

Mark

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

DO NOT REPLY [Bug 48827] Error validating empty tag that contains jsp:attribute in JSP documents in XML syntax

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

--- Comment #3 from Mark Thomas  2010-03-03 21:05:22 UTC ---
Fixed in trunk (with a couple of test cases) and proposed for 6.0.x

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

Author: markt
Date: Wed Mar  3 21:01:48 2010
New Revision: 918686

URL: http://svn.apache.org/viewvc?rev=918686&view=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=918686&r1=918685&r2=918686&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar  3 21:01:48 2010
@@ -113,3 +113,12 @@
   http://svn.apache.org/viewvc?rev=918594&view=rev (review feedback BZ48831)
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48827 a regression in
+  the original fix for
+  https://issues.apache.org/bugzilla/show_bug.cgi?id=47977
+  Using a body with tags specified to have empty body content should cause an
+  error 
+  http://svn.apache.org/viewvc?rev=918684&view=rev
+  +1: markt
+  -1: 



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

svn commit: r918684 - /tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java

Author: markt
Date: Wed Mar  3 21:00:22 2010
New Revision: 918684

URL: http://svn.apache.org/viewvc?rev=918684&view=rev
Log:
Revert previous fix for 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47977 that caused regression 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48827 and implement an 
alternative fix

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=918684&r1=918683&r2=918684&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Wed Mar 
 3 21:00:22 2010
@@ -109,8 +109,6 @@
 // Flag set to delay incrementing tagDependentNesting until jsp:body
 // is first encountered
 private boolean tagDependentPending = false;
-// Tag being parsed that should have an empty body 
-private Node tagEmptyBody = null;
 
 /*
  * Constructor
@@ -271,8 +269,6 @@
 AttributesImpl nonTaglibAttrs = null;
 AttributesImpl nonTaglibXmlnsAttrs = null;
 
-checkEmptyBody();
-
 processChars();
 
 checkPrefixes(uri, qName, attrs);
@@ -430,10 +426,9 @@
 if (scriptlessBodyNode == null
 && 
bodyType.equalsIgnoreCase(TagInfo.BODY_CONTENT_SCRIPTLESS)) {
 scriptlessBodyNode = node;
-} else if 
(TagInfo.BODY_CONTENT_TAG_DEPENDENT.equalsIgnoreCase(bodyType)) {
+}
+else if 
(TagInfo.BODY_CONTENT_TAG_DEPENDENT.equalsIgnoreCase(bodyType)) {
 tagDependentPending = true;
-} else if 
(TagInfo.BODY_CONTENT_EMPTY.equalsIgnoreCase(bodyType)) {
-tagEmptyBody = node;
 }
 }
 }
@@ -458,10 +453,7 @@
  * @throws SAXException
  */
 @Override
-public void characters(char[] buf, int offset, int len)
-throws SAXException {
-
-checkEmptyBody();
+public void characters(char[] buf, int offset, int len) {
 
 if (charBuffer == null) {
 charBuffer = new StringBuilder();
@@ -621,10 +613,6 @@
 public void endElement(String uri, String localName, String qName)
 throws SAXException {
 
-if (tagEmptyBody != null) {
-tagEmptyBody = null;
-}
-
 processChars();
 
 if (directivesOnly &&
@@ -676,6 +664,23 @@
 scriptlessBodyNode = null;
 }
 
+if (current instanceof Node.CustomTag) {
+   String bodyType = getBodyType((Node.CustomTag) current);
+   if (TagInfo.BODY_CONTENT_EMPTY.equalsIgnoreCase(bodyType)) {
+   // Children - if any - must be JSP attributes
+   Node.Nodes children = current.getBody();
+   if (children != null && children.size() > 0) {
+   for (int i = 0; i < children.size(); i++) {
+   Node child = children.getNode(i);
+   if (!(child instanceof 
Node.NamedAttribute)) {
+   throw new 
SAXParseException(Localizer.getMessage(
+   
"jasper.error.emptybodycontent.nonempty",
+   current.qName), 
locator); 
+   }
+   }
+   }
+   }
+}
 if (current.getParent() != null) {
 current = current.getParent();
 }
@@ -715,7 +720,6 @@
  */
 public void startCDATA() throws SAXException {
 
-checkEmptyBody();
 processChars();  // Flush char buffer and remove white spaces
 startMark = new Mark(ctxt, path, locator.getLineNumber(),
  locator.getColumnNumber());
@@ -1401,13 +1405,6 @@
 return "";
 }
 
-private void checkEmptyBody() throws SAXException {
-if (tagEmptyBody != null) {
-throw new SAXParseException(Localizer.getMessage(
-"jasper.error.emptybodycontent.nonempty",
-tagEmptyBody.qName), locator);
-}
-}
 /*
  * Gets SAXParser.
  *



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

svn commit: r918682 - in /tomcat/trunk/test: org/apache/TestAll.java org/apache/jasper/compiler/TestJspDocumentParser.java webapp/bug47977.jspx webapp/bug48827.jspx

Author: markt
Date: Wed Mar  3 20:59:23 2010
New Revision: 918682

URL: http://svn.apache.org/viewvc?rev=918682&view=rev
Log:
Add tests for bugs 47977 and 48827

Added:
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
tomcat/trunk/test/webapp/bug47977.jspx
tomcat/trunk/test/webapp/bug48827.jspx
Modified:
tomcat/trunk/test/org/apache/TestAll.java

Modified: tomcat/trunk/test/org/apache/TestAll.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/TestAll.java?rev=918682&r1=918681&r2=918682&view=diff
==
--- tomcat/trunk/test/org/apache/TestAll.java (original)
+++ tomcat/trunk/test/org/apache/TestAll.java Wed Mar  3 20:59:23 2010
@@ -39,6 +39,7 @@
 import org.apache.el.lang.TestELSupport;
 import org.apache.jasper.compiler.TestAttributeParser;
 import org.apache.jasper.compiler.TestGenerator;
+import org.apache.jasper.compiler.TestJspDocumentParser;
 import org.apache.jasper.compiler.TestParser;
 import org.apache.jasper.compiler.TestScriptingVariabler;
 import org.apache.jasper.compiler.TestValidator;
@@ -89,6 +90,7 @@
 
 // o.a.jasper
 suite.addTestSuite(TestAttributeParser.class);
+suite.addTestSuite(TestJspDocumentParser.class);
 suite.addTestSuite(TestGenerator.class);
 suite.addTestSuite(TestParser.class);
 suite.addTestSuite(TestScriptingVariabler.class);

Added: tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java?rev=918682&view=auto
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java 
(added)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java Wed 
Mar  3 20:59:23 2010
@@ -0,0 +1,69 @@
+/*
+ * 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.jasper.compiler;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+
+public class TestJspDocumentParser extends TomcatBaseTest {
+
+public void testBug47977() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = 
+new File("test/webapp");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+Exception e = null;
+try {
+getUrl("http://localhost:"; + getPort() + "/test/bug47977.jspx");
+} catch (IOException ioe) {
+e = ioe;
+}
+
+// Failure is expected
+assertNotNull(e);
+}
+
+public void testBug48827() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = 
+new File("test/webapp");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+Exception e = null;
+try {
+getUrl("http://localhost:"; + getPort() + "/test/bug48827.jspx");
+} catch (IOException ioe) {
+e = ioe;
+}
+
+// Should not fail
+assertNull(e);
+}
+}

Added: tomcat/trunk/test/webapp/bug47977.jspx
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug47977.jspx?rev=918682&view=auto
==
--- tomcat/trunk/test/webapp/bug47977.jspx (added)
+++ tomcat/trunk/test/webapp/bug47977.jspx Wed Mar  3 20:59:23 2010
@@ -0,0 +1,26 @@
+
+http://java.sun.com/JSP/Page"; version="2.2"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >
+  
+
+  
+xxx
+  
+
+
\ No newline at end of file

Added: tomcat/trunk/test/webapp/bug48827.jspx
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug48827.jspx?rev=918682&view=auto
==
--- tomcat/trunk/test/webapp/bug48827.jspx (added)
+++ tomcat/trunk/test/webapp/bug4882

DO NOT REPLY [Bug 48827] Error validating empty tag that contains jsp:attribute in JSP documents in XML syntax

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

--- Comment #2 from Mark Thomas  2010-03-03 20:25:55 UTC ---
It is a regression in the fix for bug47977. Looking at a fix now...

-- 
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: r918651 - in /tomcat/trunk/test/webapp/WEB-INF/tags: echo-deferred.tag echo-double.tag echo-long.tag echo-noel.tag echo.tag

Author: markt
Date: Wed Mar  3 19:27:25 2010
New Revision: 918651

URL: http://svn.apache.org/viewvc?rev=918651&view=rev
Log:
Echo tags are not expected to have bodies. Has the happy side-effect of 
providing a tag that can be used to test bug 48827.

Modified:
tomcat/trunk/test/webapp/WEB-INF/tags/echo-deferred.tag
tomcat/trunk/test/webapp/WEB-INF/tags/echo-double.tag
tomcat/trunk/test/webapp/WEB-INF/tags/echo-long.tag
tomcat/trunk/test/webapp/WEB-INF/tags/echo-noel.tag
tomcat/trunk/test/webapp/WEB-INF/tags/echo.tag

Modified: tomcat/trunk/test/webapp/WEB-INF/tags/echo-deferred.tag
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/tags/echo-deferred.tag?rev=918651&r1=918650&r2=918651&view=diff
==
--- tomcat/trunk/test/webapp/WEB-INF/tags/echo-deferred.tag (original)
+++ tomcat/trunk/test/webapp/WEB-INF/tags/echo-deferred.tag Wed Mar  3 19:27:25 
2010
@@ -14,4 +14,5 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@ tag %><%@ attribute name="echo" deferredValue="true" %>${echo}
\ No newline at end of file
+<%@ tag %><%@ attribute name="echo" deferredValue="true" %><%@
+tag body-content="empty" %>${echo}
\ No newline at end of file

Modified: tomcat/trunk/test/webapp/WEB-INF/tags/echo-double.tag
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/tags/echo-double.tag?rev=918651&r1=918650&r2=918651&view=diff
==
--- tomcat/trunk/test/webapp/WEB-INF/tags/echo-double.tag (original)
+++ tomcat/trunk/test/webapp/WEB-INF/tags/echo-double.tag Wed Mar  3 19:27:25 
2010
@@ -16,4 +16,5 @@
 --%>
 <%@ tag %><%@
 attribute name="echo" type="java.lang.Double"%><%@
-attribute name="index" type="java.lang.String" %>${index}-${echo}
\ No newline at end of file
+attribute name="index" type="java.lang.String" %><%@
+tag body-content="empty" %>${index}-${echo}
\ No newline at end of file

Modified: tomcat/trunk/test/webapp/WEB-INF/tags/echo-long.tag
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/tags/echo-long.tag?rev=918651&r1=918650&r2=918651&view=diff
==
--- tomcat/trunk/test/webapp/WEB-INF/tags/echo-long.tag (original)
+++ tomcat/trunk/test/webapp/WEB-INF/tags/echo-long.tag Wed Mar  3 19:27:25 2010
@@ -16,4 +16,5 @@
 --%>
 <%@ tag %><%@
 attribute name="echo" type="java.lang.Long"%><%@
-attribute name="index" type="java.lang.String" %>${index}-${echo}
\ No newline at end of file
+attribute name="index" type="java.lang.String" %><%@
+tag body-content="empty" %>${index}-${echo}
\ No newline at end of file

Modified: tomcat/trunk/test/webapp/WEB-INF/tags/echo-noel.tag
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/tags/echo-noel.tag?rev=918651&r1=918650&r2=918651&view=diff
==
--- tomcat/trunk/test/webapp/WEB-INF/tags/echo-noel.tag (original)
+++ tomcat/trunk/test/webapp/WEB-INF/tags/echo-noel.tag Wed Mar  3 19:27:25 2010
@@ -16,4 +16,4 @@
 --%>
 <%@ tag%><%@
 attribute name="echo" type="java.lang.String" rtexprvalue="false"
-%>${echo}
\ No newline at end of file
+%><%@ tag body-content="empty" %>${echo}
\ No newline at end of file

Modified: tomcat/trunk/test/webapp/WEB-INF/tags/echo.tag
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/tags/echo.tag?rev=918651&r1=918650&r2=918651&view=diff
==
--- tomcat/trunk/test/webapp/WEB-INF/tags/echo.tag (original)
+++ tomcat/trunk/test/webapp/WEB-INF/tags/echo.tag Wed Mar  3 19:27:25 2010
@@ -14,4 +14,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@ tag %><%@ attribute name="echo" type="java.lang.String"%>${echo}
\ No newline at end of file
+<%@ tag %><%@
+attribute name="echo" type="java.lang.String"%><%@
+tag body-content="empty" %>${echo}
\ No newline at end of file



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

svn commit: r918636 - /tomcat/jk/trunk/native/common/jk_mt.h

2010-03-03 Thread fuankg

Author: fuankg
Date: Wed Mar  3 19:06:17 2010
New Revision: 918636

URL: http://svn.apache.org/viewvc?rev=918636&view=rev
Log:
Fixed broken NetWare build.

Modified:
tomcat/jk/trunk/native/common/jk_mt.h

Modified: tomcat/jk/trunk/native/common/jk_mt.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_mt.h?rev=918636&r1=918635&r2=918636&view=diff
==
--- tomcat/jk/trunk/native/common/jk_mt.h (original)
+++ tomcat/jk/trunk/native/common/jk_mt.h Wed Mar  3 19:06:17 2010
@@ -71,7 +71,7 @@
 #define JK_LEAVE_CS(x, rc)\
 if(pthread_mutex_unlock(x)) rc = JK_FALSE; else rc = JK_TRUE
 
-#ifdef AS400
+#if defined(AS400) || defined(NETWARE)
 #define jk_pthread_t   jk_uint32_t
 #endif /* AS400 */
 jk_pthread_t jk_gettid(void);



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

svn commit: r918630 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/manager/LocalStrings.properties webapps/docs/changelog.xml

Author: markt
Date: Wed Mar  3 18:59:43 2010
New Revision: 918630

URL: http://svn.apache.org/viewvc?rev=918630&view=rev
Log:
Amend the messages displayed by Find Leaks diagnostics in the Manager 
application. (kkolinko)

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  3 18:59:43 2010
@@ -1,2 +1,2 @@
 /tomcat:883362
-/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,915226,915737,915861,916097,916141,916157,916170,917598
+/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,8282

svn commit: r918620 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/manager/ webapps/docs/ webapps/manager/ webapps/manager/WEB-INF/jsp/

Author: markt
Date: Wed Mar  3 18:44:19 2010
New Revision: 918620

URL: http://svn.apache.org/viewvc?rev=918620&view=rev
Log:
Move sessionDetail.jsp sessionsList.jsp of Manager webapp into WEB-INF 
(kkolinko)

Added:
tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/
tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
  - copied unchanged from r918596, 
tomcat/tc6.0.x/trunk/webapps/manager/sessionDetail.jsp
tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
  - copied unchanged from r918596, 
tomcat/tc6.0.x/trunk/webapps/manager/sessionsList.jsp
Removed:
tomcat/tc6.0.x/trunk/webapps/manager/sessionDetail.jsp
tomcat/tc6.0.x/trunk/webapps/manager/sessionsList.jsp
Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  3 18:44:19 2010
@@ -1,2 +1,2 @@
 /tomcat:883362
-/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,915226,915737,915861,916097,916141,916157,916170
+/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,784

svn commit: r918615 - in /tomcat/tc6.0.x/trunk: STATUS.txt webapps/docs/changelog.xml webapps/manager/WEB-INF/web.xml

Author: markt
Date: Wed Mar  3 18:26:38 2010
New Revision: 918615

URL: http://svn.apache.org/viewvc?rev=918615&view=rev
Log:
Add constraint for findleaks manager command

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=918615&r1=918614&r2=918615&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar  3 18:26:38 2010
@@ -114,11 +114,6 @@
   +1: markt
   -1: 
 
-* Add constraint for findleaks manager command
-  http://people.apache.org/~kkolinko/patches/2010-02-28_tc6_findLeaks.patch
-  +1: kkolinko, mturk, markt, jfclere,funkman
-  -1:
-
 * Move sessionDetail.jsp sessionsList.jsp of Manager webapp into WEB-INF
   That is rev.917598
   1)

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=918615&r1=918614&r2=918615&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Mar  3 18:26:38 2010
@@ -39,6 +39,14 @@
  Catalina, Coyote, Jasper, Cluster, Webapps, Other
 -->
 
+  
+
+  
+Close security hole in unreleased 6.0.25 by ensuring new find leaks
+functionality is protected by a security constraint. (kkolinko)
+  
+
+  
   
 
   

Modified: tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml?rev=918615&r1=918614&r2=918615&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml Wed Mar  3 18:26:38 
2010
@@ -172,6 +172,7 @@
   /status/*
   /roles
   /resources
+  /findleaks
 
 




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

DO NOT REPLY [Bug 48847] Classloaders hierarchy messed up when working with wlfullclient.jar

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2010-03-03 18:17:41 UTC ---
This isn't a Tomcat bug so it doesn't belong in Bugzilla.

There are probably a couple of ways around this. The Tomcat users list can help
with 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 48371] addWebXmlMappings does not place servlet tags correctly

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #4 from Mark Thomas  2010-03-03 17:40:52 UTC ---
This has been fixed for 6.0.x and will be included in 6.0.26 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: r918597 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/JspC.java java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xml

Author: markt
Date: Wed Mar  3 17:40:39 2010
New Revision: 918597

URL: http://svn.apache.org/viewvc?rev=918597&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48371
Take account of comments when working out where to insert generated web.xml
Also
 - Deprecate methods, removed in TC7
 - Allow the encoding used for web.xml files to be configured, and allow the 
addWebXmlMappings option to be specified on the command line

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  3 17:40:39 2010
@@ -1,2 +1,2 @@
 /tomcat:883362
-/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,909875,909887,910266,910370,910442,910471,915226,915861,916141,916170
+/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,797

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

Author: markt
Date: Wed Mar  3 17:28:33 2010
New Revision: 918595

URL: http://svn.apache.org/viewvc?rev=918595&view=rev
Log:
Address review feedback

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=918595&r1=918594&r2=918595&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar  3 17:28:33 2010
@@ -120,10 +120,10 @@
 * Improve logging behaviour when shutdown occurs via a shutdownhook. If 
present,
   use Catalina's shutdown hook to shutdown Tomcat and JULI. This enables them 
to
   be shutdown in the correct order. 
-  http://svn.apache.org/viewvc?rev=910974&view=rev 
+  http://svn.apache.org/viewvc?rev=910974&view=rev
+  http://svn.apache.org/viewvc?rev=918594&view=rev (review feedback BZ48831)
   +1: markt
-  -1: kkolinko: Catalina.stop() calls Runtime.removeShutdownHook(shutdownHook)
-  and thus ClassLoaderLogManager.shutdown() will not be called. See BZ 48831.
+  -1: 
 
 * Add constraint for findleaks manager command
   http://people.apache.org/~kkolinko/patches/2010-02-28_tc6_findLeaks.patch



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

DO NOT REPLY [Bug 48831] Properly closing JULI FileHandler

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #4 from Mark Thomas  2010-03-03 17:28:18 UTC ---
Issues 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: r918594 - in /tomcat/trunk/java/org/apache: catalina/startup/Catalina.java juli/ClassLoaderLogManager.java juli/FileHandler.java

Author: markt
Date: Wed Mar  3 17:26:54 2010
New Revision: 918594

URL: http://svn.apache.org/viewvc?rev=918594&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48831
Address issues 1 & 2 by using a ReadWriteLock to control access to the writer. 
This ensures messages won't be written while the writer is null. Note there is 
no (easy) way to not close the handler.
Address issue 3 by re-enabling the JULI shutdown hook if JULI is being used and 
Tomcat isn't stopped via a shutdown hook.
Address issue 4 by making ClassLoaderLogManager#useShutdownHook volatile

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/juli/FileHandler.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=918594&r1=918593&r2=918594&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Wed Mar  3 
17:26:54 2010
@@ -607,6 +607,14 @@
 // doesn't get invoked twice
 if (useShutdownHook) {
 Runtime.getRuntime().removeShutdownHook(shutdownHook);
+
+// If JULI is being used, re-enable JULI's shutdown to ensure
+// log messages are not lost
+LogManager logManager = LogManager.getLogManager();
+if (logManager instanceof ClassLoaderLogManager) {
+((ClassLoaderLogManager) logManager).setUseShutdownHook(
+true);
+}
 }
 } catch (Throwable t) {
 // This will fail on JDK 1.2. Ignoring, as Tomcat can run

Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=918594&r1=918593&r2=918594&view=diff
==
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Wed Mar  3 
17:26:54 2010
@@ -93,9 +93,9 @@
  * Determines if the shutdown hook is used to perform any necessary
  * clean-up such as flushing buffered handlers on JVM shutdown. Defaults to
  * true but may be set to false if another component ensures
- * that 
+ * that {...@link #shutdown()} is called.
  */
-protected boolean useShutdownHook = true;
+protected volatile boolean useShutdownHook = true;
 
 
 // - Properties

Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=918594&r1=918593&r2=918594&view=diff
==
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Wed Mar  3 17:26:54 2010
@@ -26,6 +26,8 @@
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.sql.Timestamp;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.logging.ErrorManager;
 import java.util.logging.Filter;
 import java.util.logging.Formatter;
@@ -96,9 +98,16 @@
  * The PrintWriter to which we are currently logging, if any.
  */
 private volatile PrintWriter writer = null;
-
+
+
+/**
+ * Lock used to control access to the writer.
+ */
+protected ReadWriteLock writerLock = new ReentrantReadWriteLock();
+
+
 /**
- * Log buffer size
+ * Log buffer size.
  */
 private int bufferSize = -1;
 
@@ -123,15 +132,22 @@
 String tsString = ts.toString().substring(0, 19);
 String tsDate = tsString.substring(0, 10);
 
+writerLock.readLock().lock();
 // If the date has changed, switch log files
 if (!date.equals(tsDate)) {
-synchronized (this) {
-if (!date.equals(tsDate)) {
-closeWriter();
-date = tsDate;
-openWriter();
-}
-}
+   // Update to writeLock before we switch
+writerLock.readLock().unlock();
+   writerLock.writeLock().lock();
+   // Make sure another thread hasn't already done this
+   if (!date.equals(tsDate)) {
+   closeWriter();
+   date = tsDate;
+   openWriter();
+   }
+// Down grade to read-lock. This ensures the writer remains valid
+// until t

DO NOT REPLY [Bug 48577] vulnerability in DefaultServlet

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

--- Comment #3 from Konstantin Kolinko  2010-03-03 
17:25:59 UTC ---
Fixed in 5.5 in r918592, will be in 5.5.29 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: r918592 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java container/webapps/docs/changelog.xml

Author: kkolinko
Date: Wed Mar  3 17:24:52 2010
New Revision: 918592

URL: http://svn.apache.org/viewvc?rev=918592&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48577
Filter URL when displaying missing included page (markt)

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

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918592&r1=918591&r2=918592&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 17:24:52 2010
@@ -146,13 +146,6 @@
   +1: markt, kkolinko, rjung
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48577
-  Filter URL when displaying missing included page
-  Patch by markt
-  http://svn.apache.org/viewvc?rev=905735&view=rev
-  +1: kkolinko, markt, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48179
   Improve processing of TLD cache file
   https://issues.apache.org/bugzilla/attachment.cgi?id=24918

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?rev=918592&r1=918591&r2=918592&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
 Wed Mar  3 17:24:52 2010
@@ -771,9 +771,9 @@
 // to be ignored by the resource that is including us.
 // Therefore, the only way we can let the including resource
 // know is by including warning message in response
-response.getWriter().write(
+response.getWriter().write(RequestUtil.filter(
 sm.getString("defaultServlet.missingResource",
-requestUri));
+requestUri)));
 }
 
 response.sendError(HttpServletResponse.SC_NOT_FOUND,

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=918592&r1=918591&r2=918592&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar  3 
17:24:52 2010
@@ -125,6 +125,10 @@
 exist. Patch provided by Kevin Conaway. (markt)
   
   
+48577: Filter URL when displaying missing included page.
+(markt)
+  
+  
 Add an additional permission required by JULI when running under newer
 JDKs and a security manager. (markt)
   



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

DO NOT REPLY [Bug 47987] Out of memory being caused by notFoundResources in org.apache.catalina.loader.WebappClassLoader

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

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #5 from Konstantin Kolinko  2010-03-03 
17:15:26 UTC ---
Fixed in 5.5, will be in 5.5.29 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: r918581 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java container/webapps/docs/changelog.xml

Author: kkolinko
Date: Wed Mar  3 17:13:04 2010
New Revision: 918581

URL: http://svn.apache.org/viewvc?rev=918581&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47987
Limit size of not found resources cache

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

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918581&r1=918580&r2=918581&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 17:13:04 2010
@@ -140,15 +140,6 @@
   +1: markt, kkolinko, rjung
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47987
-  http://svn.apache.org/viewvc?rev=832200&view=rev
-  Limit size of not found resources cache
-  +1: markt
-  +1: kkolinko, rjung (minus generics)
-  -1: 
-   kkolinko: LinkedHashMap is present in JDK 1.4 (At first I thought it was
-   added in 1.5 only, but I was wrong).
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48581
   Avoid security exception on first access
   http://people.apache.org/~markt/patches/2010-02-02-bug48581.patch

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=918581&r1=918580&r2=918581&view=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
 Wed Mar  3 17:13:04 2010
@@ -44,6 +44,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
@@ -265,7 +266,13 @@
 /**
  * The list of not found resources.
  */
-protected HashMap notFoundResources = new HashMap();
+protected HashMap notFoundResources = new LinkedHashMap() {
+private static final long serialVersionUID = 1L;
+protected boolean removeEldestEntry(
+Map.Entry eldest) {
+return size() > 1000;
+}
+};
 
 
 /**

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=918581&r1=918580&r2=918581&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar  3 
17:13:04 2010
@@ -164,6 +164,9 @@
 Greg Vanore. (markt)
   
   
+47987: Limit size of not found resources cache. (markt)
+  
+  
 48311: APR should not be initialised if the APR life-cycle
 listener is not enabled. (markt)
   



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

DO NOT REPLY [Bug 48516] NullPointerException in JNDIRealm

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

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #4 from Konstantin Kolinko  2010-03-03 
16:51:54 UTC ---
Applied to 5.5, will be in 5.5.29 onwards. Thank you.

-- 
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: r918564 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java container/webapps/docs/changelog.xml

Author: kkolinko
Date: Wed Mar  3 16:50:15 2010
New Revision: 918564

URL: http://svn.apache.org/viewvc?rev=918564&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48516
Fix possible NPE when user does not exist in directory
Patch provided by Kevin Conaway

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

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918564&r1=918563&r2=918564&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 16:50:15 2010
@@ -140,13 +140,6 @@
   +1: markt, kkolinko, rjung
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48516
-  Prevent possible NPE in JNDIRealm when user does not exist
-  Patch provided by Kevin Conaway
-  http://svn.apache.org/viewvc?rev=898558&view=rev
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47987
   http://svn.apache.org/viewvc?rev=832200&view=rev
   Limit size of not found resources cache

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java?rev=918564&r1=918563&r2=918564&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
 Wed Mar  3 16:50:15 2010
@@ -1576,8 +1576,12 @@
 
 User user = getUser(context, username);
 
-return new GenericPrincipal(this, user.username, user.password ,
-getRoles(context, user));
+if (user != null) {
+return new GenericPrincipal(this, user.username, user.password,
+getRoles(context, user));
+}
+
+return null;
 }
 
 /**

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=918564&r1=918563&r2=918564&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar  3 
16:50:15 2010
@@ -121,6 +121,10 @@
 (kkolinko/markt)
   
   
+48516: Prevent NPE in JNDIRealm if requested user does not
+exist. Patch provided by Kevin Conaway. (markt)
+  
+  
 Add an additional permission required by JULI when running under newer
 JDKs and a security manager. (markt)
   



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

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

Author: kkolinko
Date: Wed Mar  3 16:41:36 2010
New Revision: 918559

URL: http://svn.apache.org/viewvc?rev=918559&view=rev
Log:
Update recommended version for native to 1.1.19. (rjung)
There is no need to up this to .20.

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

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918559&r1=918558&r2=918559&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 16:41:36 2010
@@ -134,14 +134,6 @@
   +1: markt, kkolinko, rjung
   -1: 
 
-* Update recommended tcnative version to the forthcoming 1.1.19.
-  No update on the required version (17)
-  http://svn.apache.org/viewvc?rev=895703&view=rev
-  We should not vote before 1.1.19 is officially released.
-  Patch by rjung
-  +1: kkolinko, markt, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48004
   Allow applications to set the Server header
   http://svn.apache.org/viewvc?rev=898527&view=rev

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java?rev=918559&r1=918558&r2=918559&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
 Wed Mar  3 16:41:36 2010
@@ -59,7 +59,7 @@
 protected static final int REQUIRED_MAJOR = 1;
 protected static final int REQUIRED_MINOR = 1;
 protected static final int REQUIRED_PATCH = 17;
-protected static final int RECOMMENDED_PV = 17;
+protected static final int RECOMMENDED_PV = 19;
 
 
 // -- Properties

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=918559&r1=918558&r2=918559&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar  3 
16:41:36 2010
@@ -172,10 +172,13 @@
 it. When asked to install TC-Native it was downloading some very old 
(1.1.4)
 version of it from the HEAnet site. (kkolinko)
   
-  
+  
 Update the native/APR library version bundled with Tomcat to 1.1.20.
 (kkolinko) 
-  
+  
+  
+Update recommended version for native to 1.1.19. (rjung)
+  
   
 Remove unneeded line from the method that normalizes decodedURI.
 (kkolinko)



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

svn commit: r918554 - /tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Author: kkolinko
Date: Wed Mar  3 16:32:54 2010
New Revision: 918554

URL: http://svn.apache.org/viewvc?rev=918554&view=rev
Log:
Move the entry for the tcnavive version fix to the Coyote subsection.

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

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=918554&r1=918553&r2=918554&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar  3 
16:32:54 2010
@@ -49,11 +49,6 @@
   
 Deprecate the jni Buffer and Thread classes. (rjung)
   
-  
-Update the version of Tomcat Native DLL installed by the Windows
-installer to be 1.1.20. It was using some very old (1.1.4) version
-of it. (kkolinko)
-  
   
 Include 32-bit and 64-bit versions of Tomcat Native DLLs into the
 Windows installer, instead of downloading them from a web site during
@@ -173,6 +168,15 @@
 (markt/costin) 
   
   
+Fix Windows installer to bundle an up-to-date version of native/APR 
with
+it. When asked to install TC-Native it was downloading some very old 
(1.1.4)
+version of it from the HEAnet site. (kkolinko)
+  
+  
+Update the native/APR library version bundled with Tomcat to 1.1.20.
+(kkolinko) 
+  
+  
 Remove unneeded line from the method that normalizes decodedURI.
 (kkolinko)
   



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

svn commit: r918545 - in /tomcat/tc5.5.x/trunk: STATUS.txt build/build.properties.default container/webapps/docs/changelog.xml

Author: kkolinko
Date: Wed Mar  3 16:20:59 2010
New Revision: 918545

URL: http://svn.apache.org/viewvc?rev=918545&view=rev
Log:
Update Tomcat-Native included in TC distributives to 1.1.20

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918545&r1=918544&r2=918545&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 16:20:59 2010
@@ -134,13 +134,6 @@
   +1: markt, kkolinko, rjung
   -1: 
 
-* Update Tomcat-Native included in TC distributives to 1.1.19
-  http://people.apache.org/~kkolinko/patches/2010-01-27_tc55_native-x19.patch
-  +1: kkolinko, markt
-  +1: rjung (1.1.20)
-  -1:
-  rjung: guess that means 1.1.20 now.
-
 * Update recommended tcnative version to the forthcoming 1.1.19.
   No update on the required version (17)
   http://svn.apache.org/viewvc?rev=895703&view=rev

Modified: tomcat/tc5.5.x/trunk/build/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=918545&r1=918544&r2=918545&view=diff
==
--- tomcat/tc5.5.x/trunk/build/build.properties.default (original)
+++ tomcat/tc5.5.x/trunk/build/build.properties.default Wed Mar  3 16:20:59 2010
@@ -140,10 +140,10 @@
 
jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
 
 # - Tomcat native library -
-tomcat-native.version=1.1.16
+tomcat-native.version=1.1.20
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
 
tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
 
 

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=918545&r1=918544&r2=918545&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar  3 
16:20:59 2010
@@ -51,7 +51,7 @@
   
   
 Update the version of Tomcat Native DLL installed by the Windows
-installer to be 1.1.16. It was using some very old (1.1.4) version
+installer to be 1.1.20. It was using some very old (1.1.4) version
 of it. (kkolinko)
   
   



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

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

Author: kkolinko
Date: Wed Mar  3 15:53:13 2010
New Revision: 918534

URL: http://svn.apache.org/viewvc?rev=918534&view=rev
Log:
Remove unneeded line from the method that normalizes decodedURI.

The line "uriBC.setBytes(b, start, end);" is wrong, as it should have been 
"uriBC.setBytes(b, start, end - start);". I suppose that it worked because in 
the only place that calls this normalize() method the value of 'start' was 
always equal to zero.

Instead of fixing, I am removing that line, because it actually is not needed 
there at all, thanks to the uriBC.setEnd() calls above it.

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

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918534&r1=918533&r2=918534&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 15:53:13 2010
@@ -134,11 +134,6 @@
   +1: markt, kkolinko, rjung
   -1: 
 
-* Remove unneeded line from the method that normalizes decodedURI.
-  http://svn.apache.org/viewvc?rev=892812&view=rev
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Update Tomcat-Native included in TC distributives to 1.1.19
   http://people.apache.org/~kkolinko/patches/2010-01-27_tc55_native-x19.patch
   +1: kkolinko, markt

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java?rev=918534&r1=918533&r2=918534&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
 Wed Mar  3 15:53:13 2010
@@ -539,8 +539,8 @@
 public static boolean normalize(MessageBytes uriMB) {
 
 ByteChunk uriBC = uriMB.getByteChunk();
-byte[] b = uriBC.getBytes();
-int start = uriBC.getStart();
+final byte[] b = uriBC.getBytes();
+final int start = uriBC.getStart();
 int end = uriBC.getEnd();
 
 // An empty URL is not acceptable
@@ -633,8 +633,6 @@
 index = index2;
 }
 
-uriBC.setBytes(b, start, end);
-
 return true;
 
 }

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=918534&r1=918533&r2=918534&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar  3 
15:53:13 2010
@@ -172,6 +172,10 @@
 CVE-2009-3555. Provide option to disable legacy SSL renegotiation.
 (markt/costin) 
   
+  
+Remove unneeded line from the method that normalizes decodedURI.
+(kkolinko)
+  
 
   
   



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

svn commit: r918513 - in /tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/tagplugin: howto.html notes.html

Author: kkolinko
Date: Wed Mar  3 15:34:10 2010
New Revision: 918513

URL: http://svn.apache.org/viewvc?rev=918513&view=rev
Log:
Properly close  tags
(backport of r893499 from TC6)

Modified:
tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/tagplugin/howto.html
tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/tagplugin/notes.html

Modified: tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/tagplugin/howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/tagplugin/howto.html?rev=918513&r1=918512&r2=918513&view=diff
==
--- tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/tagplugin/howto.html 
(original)
+++ tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/tagplugin/howto.html Wed 
Mar  3 15:34:10 2010
@@ -17,6 +17,8 @@
 
   
 Tag Plugin Implementation
+  
+  
 How to write tag plugins
 
   To write a plugin, you'll need to download the source for Tomcat 5.
@@ -39,5 +41,5 @@
 classes.
   
 
-  
+  
 

Modified: tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/tagplugin/notes.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/tagplugin/notes.html?rev=918513&r1=918512&r2=918513&view=diff
==
--- tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/tagplugin/notes.html 
(original)
+++ tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/tagplugin/notes.html Wed 
Mar  3 15:34:10 2010
@@ -17,6 +17,8 @@
 
   
 Tag Plugin Introduction
+  
+  
 Tag Plugins: Introductory Notes
 
   Tomcat 5 provides a framework for implementing tag plugins.  The
@@ -34,6 +36,6 @@
   They do serve as examples to show plugins in action (just
   examine the generated Java files), and how they can be implemented.
 
-  
+  
 
 



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

DO NOT REPLY [Bug 48849] Tomcat Connector Default Maintenance Page

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

Mark Thomas  changed:

   What|Removed |Added

   Severity|normal  |enhancement

--- Comment #1 from Mark Thomas  2010-03-03 15:13:27 UTC ---
Patches are always welcome.

-- 
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 48849] Tomcat Connector Default Maintenance Page

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

Frank Emrich  changed:

   What|Removed |Added

 CC||f.emr...@mind-link.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

DO NOT REPLY [Bug 48849] New: Tomcat Connector Default Maintenance Page

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

   Summary: Tomcat Connector Default Maintenance Page
   Product: Tomcat Connectors
   Version: unspecified
  Platform: All
OS/Version: Windows Server 2003
Status: NEW
  Severity: normal
  Priority: P2
 Component: isapi
AssignedTo: dev@tomcat.apache.org
ReportedBy: f.emr...@mind-link.com


Hello,

it would be nice to have an option to edit error pages like 503 (which you can
not edit with IIS). This would be a great feature. See also here: 
http://www.mail-archive.com/us...@tomcat.apache.org/msg47533.html

Thanks

Frank Emrich

-- 
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: r918499 - /tomcat/tc5.5.x/trunk/STATUS.txt

Author: kkolinko
Date: Wed Mar  3 15:04:06 2010
New Revision: 918499

URL: http://svn.apache.org/viewvc?rev=918499&view=rev
Log:
propose a backport

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=918499&r1=918498&r2=918499&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar  3 15:04:06 2010
@@ -214,3 +214,11 @@
   Patch by markt
   +1: kkolinko, rjung
   -1: 
+
+* Fix 'Error' part of https://issues.apache.org/bugzilla/show_bug.cgi?id=48584
+  Prevent the APR connector logging an error if the acceptor fails during
+  shutdown since this is expected.
+  Patch by mturk
+  http://svn.apache.org/viewvc?rev=918495&view=rev
+  +1: kkolinko
+  -1:



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

svn commit: r918497 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Author: kkolinko
Date: Wed Mar  3 14:56:17 2010
New Revision: 918497

URL: http://svn.apache.org/viewvc?rev=918497&view=rev
Log:
Add bug number for r918495

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

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=918497&r1=918496&r2=918497&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Mar  3 14:56:17 2010
@@ -42,8 +42,8 @@
   
 
   
-Prevent the APR connector logging an error if the acceptor fails during
-shutdown since this is expected. (mturk) 
+48584: Prevent the APR connector logging an error if the
+acceptor fails during shutdown since this is expected. (mturk) 
   
 
   



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

svn commit: r918495 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml

Author: markt
Date: Wed Mar  3 14:48:40 2010
New Revision: 918495

URL: http://svn.apache.org/viewvc?rev=918495&view=rev
Log:
Prevent the APR connector logging an error if the acceptor fails during 
shutdown since this is expected. (mturk) 

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  3 14:48:40 2010
@@ -1,2 +1,2 @@
 /tomcat:883362
-/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,909875,909887,910266,910370,910442,910471,915226,916141,916170
+/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-

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

Author: markt
Date: Wed Mar  3 14:39:15 2010
New Revision: 918490

URL: http://svn.apache.org/viewvc?rev=918490&view=rev
Log:
Update proposal with feedback

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=918490&r1=918489&r2=918490&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar  3 14:39:15 2010
@@ -113,10 +113,9 @@
   Make JNDIRealm easier to extend
   Based on a patch by Candid Dauth
   http://svn.apache.org/viewvc?rev=910485&view=rev
+  http://svn.apache.org/viewvc?rev=918489&view=rev (review feedback)
   +1: markt
   -1: 
-   kkolinko: mark User constructor as protected, replace ArrayList argument
-with a List, and maybe address sebb's comments to r910485 on dev@
 
 * Do not throw exception on shutdown
   Based on the https://svn.apache.org/viewvc?view=revision&revision=915861



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

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

Author: markt
Date: Wed Mar  3 14:38:01 2010
New Revision: 918489

URL: http://svn.apache.org/viewvc?rev=918489&view=rev
Log:
Implement review feedback

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=918489&r1=918488&r2=918489&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Wed Mar  3 
14:38:01 2010
@@ -1617,7 +1617,7 @@
 containerLog.trace("  getRoles(" + dn + ")");
 
 // Start with roles retrieved from the user entry
-ArrayList list = user.roles;
+List list = user.roles;
 if (list == null) {
 list = new ArrayList();
 }
@@ -2218,21 +2218,21 @@
  // -- Private Classes
 
  /**
-  * A private class representing a User
+  * A protected class representing a User
   */
  protected static class User {
  
- private String username = null;
- private String dn = null;
- private String password = null;
- private ArrayList roles = null;
+ final private String username;
+ final private String dn;
+ final private String password;
+ final private List roles;
 
- User(String username, String dn, String password,
- ArrayList roles) {
+ protected User(String username, String dn, String password,
+ List roles) {
  this.username = username;
  this.dn = dn;
  this.password = password;
- this.roles = roles;
+ this.roles = Collections.unmodifiableList(roles);
  }
 
  public String getUserName() {
@@ -2248,7 +2248,7 @@
  }
  
  public List getRoles() {
- return Collections.unmodifiableList(roles);
+ return roles;
  }
  }
 }



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

DO NOT REPLY [Bug 48498] 6.0.22RC: ArrayIndexOutOfBoundsException from Jasper when compilation error inside a CDATA block

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

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #6 from Mark Thomas  2010-03-03 14:30:55 UTC ---
The workaround has been applied to 6.0.x and will be included in 6.0.26
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: r918487 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/JavacErrorDetail.java java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xml

Author: markt
Date: Wed Mar  3 14:30:39 2010
New Revision: 918487

URL: http://svn.apache.org/viewvc?rev=918487&view=rev
Log:
Workaround https://issues.apache.org/bugzilla/show_bug.cgi?id=48498
Avoid ArrayIndexOutOfBoundsException triggered by Java 6/7 XML parser bug

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  3 14:30:39 2010
@@ -1,2 +1,2 @@
 /tomcat:883362
-/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,909875,909887,910442,910471,915226,916141
+/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,8178

svn commit: r918482 - in /tomcat/trunk/webapps/docs: appdev/ config/ funcspecs/ tribes/

Author: kkolinko
Date: Wed Mar  3 14:21:09 2010
New Revision: 918482

URL: http://svn.apache.org/viewvc?rev=918482&view=rev
Log:
Add generated TOC,
replacing manual TOC if it was present earlier

Modified:
tomcat/trunk/webapps/docs/appdev/deployment.xml
tomcat/trunk/webapps/docs/appdev/processes.xml
tomcat/trunk/webapps/docs/appdev/source.xml
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/cluster-channel.xml
tomcat/trunk/webapps/docs/config/cluster-deployer.xml
tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
tomcat/trunk/webapps/docs/config/cluster-listener.xml
tomcat/trunk/webapps/docs/config/cluster-manager.xml
tomcat/trunk/webapps/docs/config/cluster-membership.xml
tomcat/trunk/webapps/docs/config/cluster-receiver.xml
tomcat/trunk/webapps/docs/config/cluster-sender.xml
tomcat/trunk/webapps/docs/config/cluster-valve.xml
tomcat/trunk/webapps/docs/config/cluster.xml
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/config/engine.xml
tomcat/trunk/webapps/docs/config/executor.xml
tomcat/trunk/webapps/docs/config/filter.xml
tomcat/trunk/webapps/docs/config/globalresources.xml
tomcat/trunk/webapps/docs/config/host.xml
tomcat/trunk/webapps/docs/config/http.xml
tomcat/trunk/webapps/docs/config/jar-scanner.xml
tomcat/trunk/webapps/docs/config/listeners.xml
tomcat/trunk/webapps/docs/config/loader.xml
tomcat/trunk/webapps/docs/config/manager.xml
tomcat/trunk/webapps/docs/config/realm.xml
tomcat/trunk/webapps/docs/config/resources.xml
tomcat/trunk/webapps/docs/config/server.xml
tomcat/trunk/webapps/docs/config/service.xml
tomcat/trunk/webapps/docs/config/systemprops.xml
tomcat/trunk/webapps/docs/config/valve.xml
tomcat/trunk/webapps/docs/funcspecs/fs-admin-apps.xml
tomcat/trunk/webapps/docs/funcspecs/fs-admin-objects.xml
tomcat/trunk/webapps/docs/funcspecs/fs-admin-opers.xml
tomcat/trunk/webapps/docs/funcspecs/fs-default.xml
tomcat/trunk/webapps/docs/funcspecs/fs-jdbc-realm.xml
tomcat/trunk/webapps/docs/funcspecs/fs-jndi-realm.xml
tomcat/trunk/webapps/docs/funcspecs/fs-memory-realm.xml
tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml
tomcat/trunk/webapps/docs/tribes/introduction.xml

Modified: tomcat/trunk/webapps/docs/appdev/deployment.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/deployment.xml?rev=918482&r1=918481&r2=918482&view=diff
==
--- tomcat/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/deployment.xml Wed Mar  3 14:21:09 2010
@@ -29,6 +29,9 @@
 
 
 
+
+
+
 
 
 

Modified: tomcat/trunk/webapps/docs/appdev/processes.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/processes.xml?rev=918482&r1=918481&r2=918482&view=diff
==
--- tomcat/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/processes.xml Wed Mar  3 14:21:09 2010
@@ -29,6 +29,9 @@
 
 
 
+
+
+
 
 
 

Modified: tomcat/trunk/webapps/docs/appdev/source.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/source.xml?rev=918482&r1=918481&r2=918482&view=diff
==
--- tomcat/trunk/webapps/docs/appdev/source.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/source.xml Wed Mar  3 14:21:09 2010
@@ -29,6 +29,9 @@
 
 
 
+
+
+
 
 
 

Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=918482&r1=918481&r2=918482&view=diff
==
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Wed Mar  3 14:21:09 2010
@@ -31,6 +31,9 @@
 
 
 
+
+
+
 
 
 

Modified: tomcat/trunk/webapps/docs/config/cluster-channel.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-channel.xml?rev=918482&r1=918481&r2=918482&view=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-channel.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-channel.xml Wed Mar  3 14:21:09 
2010
@@ -29,6 +29,9 @@
 
 
 
+
+
+
 
 
   The cluster channel is the main component of a small framework we've 
nicknamed Apache Tribes.

Modified: tomcat/trunk/webapps/docs/config/cluster-deployer.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-deployer.xml?rev=918482&r1=918481&r2=918482&view=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-deployer.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-deployer.xml Wed Mar

svn commit: r918479 - in /tomcat/tc6.0.x/trunk/webapps/docs: appdev/ config/ funcspecs/ tribes/

Author: kkolinko
Date: Wed Mar  3 14:08:02 2010
New Revision: 918479

URL: http://svn.apache.org/viewvc?rev=918479&view=rev
Log:
Add generated TOC,
replacing manual TOC if it was present earlier

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml
tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml
tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-channel.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-deployer.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-listener.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-receiver.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-sender.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-valve.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/engine.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/executor.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/loader.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/manager.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/resources.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/server.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/service.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-admin-apps.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-admin-objects.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-admin-opers.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-default.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-invoker.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-jdbc-realm.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-jndi-realm.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-memory-realm.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/mbean-names.xml
tomcat/tc6.0.x/trunk/webapps/docs/tribes/introduction.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml?rev=918479&r1=918478&r2=918479&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml Wed Mar  3 14:08:02 
2010
@@ -29,6 +29,9 @@
 
 
 
+
+
+
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml?rev=918479&r1=918478&r2=918479&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml Wed Mar  3 14:08:02 
2010
@@ -29,6 +29,9 @@
 
 
 
+
+
+
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml?rev=918479&r1=918478&r2=918479&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml Wed Mar  3 14:08:02 2010
@@ -29,6 +29,9 @@
 
 
 
+
+
+
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml?rev=918479&r1=918478&r2=918479&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml Wed Mar  3 14:08:02 2010
@@ -31,6 +31,9 @@
 
 
 
+
+
+
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-channel.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-channel.xml?rev=918479&r1=918478&r2=918479&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-channel.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-channel.xml Wed Mar  3 
14:08:02 2010
@@ -29,6 +29,9 @@
 
 
 
+
+
+
 
 
   The cluster channel is the main component of a small framework we've 
nicknam

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

Author: markt
Date: Wed Mar  3 13:27:27 2010
New Revision: 918466

URL: http://svn.apache.org/viewvc?rev=918466&view=rev
Log:
Respond to veto (I think veto is incorrect in this case)

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=918466&r1=918465&r2=918466&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar  3 13:27:27 2010
@@ -99,7 +99,6 @@
   +1: kkolinko, markt,funkman
   -1:
 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48545
   Truststores don't have to have passwords
   Based on a patch by 'smmwpf54'
@@ -107,6 +106,8 @@
   +1: markt
   -1: jfclere: Doc says it should use keystorePass 
(http://tomcat.apache.org/tomcat-6.0-doc/config/http.html).
so that would break existing configurations.
+  markt: It shouldn't break existing configs. JSSE allows trust stores to 
be
+ read without providing the password
 
 * Workaround https://issues.apache.org/bugzilla/show_bug.cgi?id=48498
   Avoid ArrayIndexOutOfBoundsException triggered by Java 6/7 XML parser bug



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

svn commit: r918461 - /tomcat/trunk/webapps/docs/

Author: kkolinko
Date: Wed Mar  3 13:16:55 2010
New Revision: 918461

URL: http://svn.apache.org/viewvc?rev=918461&view=rev
Log:
Add generated TOC,
replacing manual TOC if it was present earlier

Modified:
tomcat/trunk/webapps/docs/aio.xml
tomcat/trunk/webapps/docs/apr.xml
tomcat/trunk/webapps/docs/balancer-howto.xml
tomcat/trunk/webapps/docs/building.xml
tomcat/trunk/webapps/docs/cgi-howto.xml
tomcat/trunk/webapps/docs/class-loader-howto.xml
tomcat/trunk/webapps/docs/cluster-howto.xml
tomcat/trunk/webapps/docs/connectors.xml
tomcat/trunk/webapps/docs/default-servlet.xml
tomcat/trunk/webapps/docs/extras.xml
tomcat/trunk/webapps/docs/introduction.xml
tomcat/trunk/webapps/docs/jasper-howto.xml
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/trunk/webapps/docs/jndi-resources-howto.xml
tomcat/trunk/webapps/docs/logging.xml
tomcat/trunk/webapps/docs/maven-jars.xml
tomcat/trunk/webapps/docs/mbeans-descriptor-howto.xml
tomcat/trunk/webapps/docs/monitoring.xml
tomcat/trunk/webapps/docs/proxy-howto.xml
tomcat/trunk/webapps/docs/realm-howto.xml
tomcat/trunk/webapps/docs/security-howto.xml
tomcat/trunk/webapps/docs/security-manager-howto.xml
tomcat/trunk/webapps/docs/setup.xml
tomcat/trunk/webapps/docs/ssi-howto.xml
tomcat/trunk/webapps/docs/ssl-howto.xml
tomcat/trunk/webapps/docs/virtual-hosting-howto.xml
tomcat/trunk/webapps/docs/windows-service-howto.xml

Modified: tomcat/trunk/webapps/docs/aio.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/aio.xml?rev=918461&r1=918460&r2=918461&view=diff
==
--- tomcat/trunk/webapps/docs/aio.xml (original)
+++ tomcat/trunk/webapps/docs/aio.xml Wed Mar  3 13:16:55 2010
@@ -29,6 +29,10 @@
 
 
 
+
+
+
+
   
 
   

Modified: tomcat/trunk/webapps/docs/apr.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/apr.xml?rev=918461&r1=918460&r2=918461&view=diff
==
--- tomcat/trunk/webapps/docs/apr.xml (original)
+++ tomcat/trunk/webapps/docs/apr.xml Wed Mar  3 13:16:55 2010
@@ -29,6 +29,10 @@
 
 
 
+
+
+
+
   
 
   

Modified: tomcat/trunk/webapps/docs/balancer-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/balancer-howto.xml?rev=918461&r1=918460&r2=918461&view=diff
==
--- tomcat/trunk/webapps/docs/balancer-howto.xml (original)
+++ tomcat/trunk/webapps/docs/balancer-howto.xml Wed Mar  3 13:16:55 2010
@@ -32,12 +32,7 @@
 
 
 
-
-
-Using the JK native connector
-
-Using Apache HTTP Server 2.x and mod_proxy
-
+
 
 
 

Modified: tomcat/trunk/webapps/docs/building.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=918461&r1=918460&r2=918461&view=diff
==
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Wed Mar  3 13:16:55 2010
@@ -29,6 +29,10 @@
 
 
 
+
+
+
+
 
 
 

Modified: tomcat/trunk/webapps/docs/cgi-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cgi-howto.xml?rev=918461&r1=918460&r2=918461&view=diff
==
--- tomcat/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cgi-howto.xml Wed Mar  3 13:16:55 2010
@@ -29,6 +29,10 @@
 
 
 
+
+
+
+
 
 
 The CGI (Common Gateway Interface) defines a way for a web server to

Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=918461&r1=918460&r2=918461&view=diff
==
--- tomcat/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/trunk/webapps/docs/class-loader-howto.xml Wed Mar  3 13:16:55 2010
@@ -30,6 +30,9 @@
 
 
 
+
+
+
 
 
 

Modified: tomcat/trunk/webapps/docs/cluster-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cluster-howto.xml?rev=918461&r1=918460&r2=918461&view=diff
==
--- tomcat/trunk/webapps/docs/cluster-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cluster-howto.xml Wed Mar  3 13:16:55 2010
@@ -30,12 +30,15 @@
 
 
 
-
 
 You can also check the configuration 
reference documentation.
 
 
 
+
+
+
+
 
   
 Simply add 

Modified: tomcat/trunk/webapps/docs/connectors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/connectors.xml?rev=918461&r1=918460&r2=918461&view=diff
==
--- tomcat/trunk/webapps/docs/connectors.xml (original)
+++ to

Re: svn commit: r918093 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java

2010-03-03 Thread Mark Thomas

On 03/03/2010 11:10, Konstantin Kolinko wrote:
> 2010/3/2  :
>> Author: markt
>> Date: Tue Mar  2 16:02:25 2010
>> New Revision: 918093
>>
>> URL: http://svn.apache.org/viewvc?rev=918093&view=rev
>> Log:
>> Better fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48660
>> As per Konstantin's comments, ensure a single Vary header is used and take 
>> account of * if present
>>
>> Modified:
>>tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
>>tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
>>tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
>>
> 
> 
>> +MessageBytes vary = headers.getValue("Vary");
>> +if (vary == null) {
>> +// Add a new Vary header
>> +headers.setValue("Vary").setString("Accept-Encoding");
>> +} else if (vary.equals("*")) {
> The above is MessageBytes.equals(String). I am sure that it won't work
> as expected.

I know. It was deliberate. I'm equally sure it will work as expected.
Did you look at the implementation of the MessageBytes#equals(String)
method?

Mark



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

svn commit: r918460 - /tomcat/tc6.0.x/trunk/webapps/docs/

Author: kkolinko
Date: Wed Mar  3 13:14:01 2010
New Revision: 918460

URL: http://svn.apache.org/viewvc?rev=918460&view=rev
Log:
Add generated TOC,
replacing manual TOC if it was present earlier

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/aio.xml
tomcat/tc6.0.x/trunk/webapps/docs/apr.xml
tomcat/tc6.0.x/trunk/webapps/docs/balancer-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/building.xml
tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/class-loader-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/cluster-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/connectors.xml
tomcat/tc6.0.x/trunk/webapps/docs/default-servlet.xml
tomcat/tc6.0.x/trunk/webapps/docs/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml
tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/logging.xml
tomcat/tc6.0.x/trunk/webapps/docs/maven-jars.xml
tomcat/tc6.0.x/trunk/webapps/docs/mbeans-descriptor-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/monitoring.xml
tomcat/tc6.0.x/trunk/webapps/docs/proxy-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/setup.xml
tomcat/tc6.0.x/trunk/webapps/docs/ssi-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/virtual-hosting-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/aio.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/aio.xml?rev=918460&r1=918459&r2=918460&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/aio.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/aio.xml Wed Mar  3 13:14:01 2010
@@ -29,6 +29,10 @@
 
 
 
+
+
+
+
   
 
   

Modified: tomcat/tc6.0.x/trunk/webapps/docs/apr.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/apr.xml?rev=918460&r1=918459&r2=918460&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/apr.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/apr.xml Wed Mar  3 13:14:01 2010
@@ -29,6 +29,10 @@
 
 
 
+
+
+
+
   
 
   

Modified: tomcat/tc6.0.x/trunk/webapps/docs/balancer-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/balancer-howto.xml?rev=918460&r1=918459&r2=918460&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/balancer-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/balancer-howto.xml Wed Mar  3 13:14:01 
2010
@@ -32,12 +32,7 @@
 
 
 
-
-
-Using the JK native connector
-
-Using Apache HTTP Server 2.x and mod_proxy
-
+
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/building.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/building.xml?rev=918460&r1=918459&r2=918460&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/building.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/building.xml Wed Mar  3 13:14:01 2010
@@ -29,6 +29,10 @@
 
 
 
+
+
+
+
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml?rev=918460&r1=918459&r2=918460&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml Wed Mar  3 13:14:01 2010
@@ -29,6 +29,10 @@
 
 
 
+
+
+
+
 
 
 The CGI (Common Gateway Interface) defines a way for a web server to

Modified: tomcat/tc6.0.x/trunk/webapps/docs/class-loader-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/class-loader-howto.xml?rev=918460&r1=918459&r2=918460&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/class-loader-howto.xml Wed Mar  3 
13:14:01 2010
@@ -30,6 +30,9 @@
 
 
 
+
+
+
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/cluster-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/cluster-howto.xml?rev=918460&r1=918459&r2=918460&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/cluster-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/cluster-howto.xml Wed Mar  3 13:14:01 2010
@@ -30,12 +30,15 @@
 
 
 
-
 
 You can also check the configuration 
reference documentation.
 
 
 
+
+
+
+
 
   
 Simp

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

2010-03-03 Thread funkman

Author: funkman
Date: Wed Mar  3 13:04:00 2010
New Revision: 918458

URL: http://svn.apache.org/viewvc?rev=918458&view=rev
Log:
votes

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=918458&r1=918457&r2=918458&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar  3 13:04:00 2010
@@ -79,7 +79,7 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48050
   NamingContext.createSubcontext method returns Context with wrong name
   http://people.apache.org/~markt/patches/2010-03-01-bug48050.patch
-  +1: markt
+  +1: markt,funkman
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48660
@@ -96,7 +96,7 @@
   - Allow the encoding used for web.xml files to be configured,
 and allow the addWebXmlMappings option to be specified on the command line 
(r916157)
   http://people.apache.org/~kkolinko/patches/2010-02-25_tc6_bug48371.patch
-  +1: kkolinko, markt
+  +1: kkolinko, markt,funkman
   -1:
 
 
@@ -128,7 +128,7 @@
   Based on the https://svn.apache.org/viewvc?view=revision&revision=915861
   6.0.x patch is at
   http://people.apache.org/~mturk/tomcat/patches/915861.patch
-  +1: mturk, kkolinko, jfclere
+  +1: mturk, kkolinko, jfclere,funkman
   -1: 
 
 * Improve logging behaviour when shutdown occurs via a shutdownhook. If 
present,
@@ -141,7 +141,7 @@
 
 * Add constraint for findleaks manager command
   http://people.apache.org/~kkolinko/patches/2010-02-28_tc6_findLeaks.patch
-  +1: kkolinko, mturk, markt, jfclere
+  +1: kkolinko, mturk, markt, jfclere,funkman
   -1:
 
 * Move sessionDetail.jsp sessionsList.jsp of Manager webapp into WEB-INF
@@ -152,10 +152,10 @@
 svn move sessionDetail.jsp sessionsList.jsp WEB-INF/jsp/
   2)
 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=917598&r1=917597&r2=917598&view=diff
-  +1: kkolinko, markt
+  +1: kkolinko, markt,funkman
   -1:
 
 * Amend the messages displayed by Find Leaks diagnostics in the Manager 
application.
   http://svn.apache.org/viewvc?rev=917633&view=rev
-  +1: kkolinko, markt, jfclere
+  +1: kkolinko, markt, jfclere,funkman
   -1:



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

Re: svn commit: r917921 - in /tomcat/native/branches/1.1.x: java/org/apache/tomcat/jni/SSL.java native/include/ssl_private.h native/src/ssl.c native/src/sslcontext.c xdocs/miscellaneous/changelog.xml

2010-03-03 Thread Mladen Turk


On 03/03/2010 01:19 PM, Mladen Turk wrote:

On 03/02/2010 05:58 PM, jean-frederic clere wrote:

On 03/02/2010 05:47 PM, Mladen Turk wrote:

On 03/02/2010 05:43 PM, jean-frederic clere wrote:

On 03/02/2010 09:51 AM, mt...@apache.org wrote:

Author: mturk
Date: Tue Mar 2 08:51:46 2010
New Revision: 917921

URL: http://svn.apache.org/viewvc?rev=917921&view=rev
Log:
Add unafe legacy renegotiation support


How does that interacts with
http://svn.apache.org/viewvc?rev=881179&view=rev ?



The same way as in mod_ssl


Yes but won't it be possible to allow client initiated renegotiation
with 0.9.8m?


Huh, seems that 0.9.8m behaves exactly like 0.9.8l
If used and s_client enters R, it simply stays there
until socket timeout.
I simply doesn't mater which client is used 0.9.8m or
legacy one, and weather the SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
is set or not. I'll check httpd 2.2.15 to see if it behaves the same.



One update. It works with 0.9.8m s_client in such a way
that client renegotiation is always rejected because of
handshake hook. If hook is removed it works fine.
Other clients just block during 'R'.
Like said I'll check with httpd 2.2.15 and see how it behaves.
If it behaves the same with old client's, it's worse then I thought.

Regards
--
^TM

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

svn commit: r918446 - in /tomcat/tc6.0.x/trunk/webapps/docs: deployer-howto.xml manager-howto.xml

Author: kkolinko
Date: Wed Mar  3 12:38:15 2010
New Revision: 918446

URL: http://svn.apache.org/viewvc?rev=918446&view=rev
Log:
Replaced manual TOC with generated one and corrected tags nesting.

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml?rev=918446&r1=918445&r2=918446&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml Wed Mar  3 12:38:15 
2010
@@ -29,20 +29,10 @@
 
 
 
-
-
-Introduction
-Installation
-A word on Contexts
-Deployment on Tomcat 
startup
-Deploying on a 
running Tomcat server
-Deploying using the 
Tomcat Manager
-Deploying 
using
-the Tomcat Client Deployer
-
-
-
-
+
+
+
+
 
 
 Deployment is the term used for the process of installing a web
@@ -51,15 +41,14 @@
 
 
 Web application deployment may be accomplished in a number of ways
-within the Tomcat server.
-
+within the Tomcat server.
+
 Statically; the web application is setup before Tomcat is 
started
 
 Dynamically; in conjunction with the Tomcat Manager web 
application or 
 manipulating already deployed web applications
 
-
-
+
 
 The Tomcat Manager is a tool that allows URL-based web application
 deployment features. There is also a tool called the Client 
Deployer,
@@ -125,11 +114,13 @@
 these Context Descriptors to perform their roles properly.
 
 
-The locations for Context Descriptors are;
-
+The locations for Context Descriptors are:
+
+
 
$CATALINA_BASE/conf/[enginename]/[hostname]/context.xml
 
$CATALINA_BASE/webapps/[webappname]/META-INF/context.xml
-
+
+
 Files in (1) are named [webappname].xml but files in (2) are named
 context.xml. If a Context Descriptor is not provided for a Context,
 Tomcat configures the Context using default values. 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=918446&r1=918445&r2=918446&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Wed Mar  3 12:38:15 2010
@@ -30,41 +30,7 @@
 
 
 
-
-
-Introduction
-
-Configuring Manager Application Access
-Supported Manager Commands
-
-Deploy A New Application 
Remotely
-Deploy A New Application 
from a Local Path
-
-List Currently Deployed Applications
-Reload An Existing 
Application
-List OS and JVM Properties
-
-List Available Global JNDI Resources
-List Available Security Roles
-Session Statistics
-Start an Existing Application
-Stop an Existing Application
-
-Undeploy an Existing Application
-Server Status
-Finding memory leaks
-
-
-Executing Manager Commands With Ant
-
-Using the JMX Proxy Servlet
-
-What is JMX Proxy Servlet?
-Query command
-Set command
-
-
-
+
 
 
 
@@ -104,18 +70,17 @@
 Manager web application Context to a new host install the
 manager.xml context configuration file in the
 $CATALINA_BASE/conf/[enginename]/[hostname] folder. Here is an
-example:
+example:
 
 
 
 
-
 
 If you have Tomcat configured to support multiple virtual hosts
 (websites) you would need to configure a Manager for each.
 
-There are three ways to use the Manager web application.
+There are three ways to use the Manager web application.
 
 As an application with a user interface you use in your browser.
 Here is an example URL where you can replace localhost with
@@ -130,19 +95,18 @@
 Executing Manager Commands
 With Ant for more information.
 
-
 
 
 
 
 
-
-The description below uses the variable name $CATALINA_BASE to refer the
+
+The description below uses the variable name $CATALINA_BASE to 
refer the
 base directory against which most relative paths are resolved. If you have
 not configured Tomcat 6 for multiple instances by setting a CATALINA_BASE
 directory, then $CATALINA_BASE will be set to the value of $CATALINA_HOME,
-the directory into which you have installed Tomcat 6.
-
+the directory into which you have installed Tomcat 6.
+

svn commit: r918445 - in /tomcat/trunk/webapps/docs: deployer-howto.xml manager-howto.xml

Author: kkolinko
Date: Wed Mar  3 12:37:43 2010
New Revision: 918445

URL: http://svn.apache.org/viewvc?rev=918445&view=rev
Log:
Replaced manual TOC with generated one and corrected tags nesting.

Modified:
tomcat/trunk/webapps/docs/deployer-howto.xml
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/deployer-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/deployer-howto.xml?rev=918445&r1=918444&r2=918445&view=diff
==
--- tomcat/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/trunk/webapps/docs/deployer-howto.xml Wed Mar  3 12:37:43 2010
@@ -29,20 +29,10 @@
 
 
 
-
-
-Introduction
-Installation
-A word on Contexts
-Deployment on Tomcat 
startup
-Deploying on a 
running Tomcat server
-Deploying using the 
Tomcat Manager
-Deploying 
using
-the Tomcat Client Deployer
-
-
-
-
+
+
+
+
 
 
 Deployment is the term used for the process of installing a web
@@ -51,15 +41,14 @@
 
 
 Web application deployment may be accomplished in a number of ways
-within the Tomcat server.
-
+within the Tomcat server.
+
 Statically; the web application is setup before Tomcat is 
started
 
 Dynamically; in conjunction with the Tomcat Manager web 
application or 
 manipulating already deployed web applications
 
-
-
+
 
 The Tomcat Manager is a tool that allows URL-based web application
 deployment features. There is also a tool called the Client 
Deployer,
@@ -125,11 +114,13 @@
 these Context Descriptors to perform their roles properly.
 
 
-The locations for Context Descriptors are;
-
+The locations for Context Descriptors are:
+
+
 
$CATALINA_BASE/conf/[enginename]/[hostname]/context.xml
 
$CATALINA_BASE/webapps/[webappname]/META-INF/context.xml
-
+
+
 Files in (1) are named [webappname].xml but files in (2) are named
 context.xml. If a Context Descriptor is not provided for a Context,
 Tomcat configures the Context using default values. 

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=918445&r1=918444&r2=918445&view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Wed Mar  3 12:37:43 2010
@@ -30,41 +30,7 @@
 
 
 
-
-
-Introduction
-
-Configuring Manager Application Access
-Supported Manager Commands
-
-Deploy A New Application 
Remotely
-Deploy A New Application 
from a Local Path
-
-List Currently Deployed Applications
-Reload An Existing 
Application
-List OS and JVM Properties
-
-List Available Global JNDI Resources
-List Available Security Roles
-Session Statistics
-Start an Existing Application
-Stop an Existing Application
-
-Undeploy an Existing Application
-Server Status
-Finding memory leaks
-
-
-Executing Manager Commands With Ant
-
-Using the JMX Proxy Servlet
-
-What is JMX Proxy Servlet?
-Query command
-Set command
-
-
-
+
 
 
 
@@ -104,18 +70,17 @@
 Manager web application Context to a new host install the
 manager.xml context configuration file in the
 $CATALINA_BASE/conf/[enginename]/[hostname] folder. Here is an
-example:
+example:
 
 
 
 
-
 
 If you have Tomcat configured to support multiple virtual hosts
 (websites) you would need to configure a Manager for each.
 
-There are three ways to use the Manager web application.
+There are three ways to use the Manager web application.
 
 As an application with a user interface you use in your browser.
 Here is an example URL where you can replace localhost with
@@ -130,19 +95,18 @@
 Executing Manager Commands
 With Ant for more information.
 
-
 
 
 
 
 
-
-The description below uses the variable name $CATALINA_BASE to refer the
+
+The description below uses the variable name $CATALINA_BASE to 
refer the
 base directory against which most relative paths are resolved. If you have
 not configured Tomcat for multiple instances by setting a CATALINA_BASE
 directory, then $CATALINA_BASE will be set to the value of $CATALINA_HOME,
-the directory into which you have installed Tomcat.
-
+the directory into which you have installed Tomcat.
+
 
 It would be quite unsafe to ship Tomcat with default settings that allowed
 anyon

Re: svn commit: r917921 - in /tomcat/native/branches/1.1.x: java/org/apache/tomcat/jni/SSL.java native/include/ssl_private.h native/src/ssl.c native/src/sslcontext.c xdocs/miscellaneous/changelog.xml

2010-03-03 Thread Mladen Turk


On 03/02/2010 05:58 PM, jean-frederic clere wrote:

On 03/02/2010 05:47 PM, Mladen Turk wrote:

On 03/02/2010 05:43 PM, jean-frederic clere wrote:

On 03/02/2010 09:51 AM, mt...@apache.org wrote:

Author: mturk
Date: Tue Mar  2 08:51:46 2010
New Revision: 917921

URL: http://svn.apache.org/viewvc?rev=917921&view=rev
Log:
Add unafe legacy renegotiation support


How does that interacts with
http://svn.apache.org/viewvc?rev=881179&view=rev ?



The same way as in mod_ssl


Yes but won't it be possible to allow client initiated renegotiation
with 0.9.8m?


Huh, seems that 0.9.8m behaves exactly like 0.9.8l
If used and s_client enters R, it simply stays there
until socket timeout.
I simply doesn't mater which client is used 0.9.8m or
legacy one, and weather the SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
is set or not. I'll check httpd 2.2.15 to see if it behaves the same.


Regards
--
^TM

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

svn commit: r918436 - /tomcat/tc6.0.x/trunk/webapps/docs/html-manager-howto.xml