cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
billbarker2005/09/24 19:16:42 Modified:webapps/docs changelog.xml Log: Update to 5.5.13, and doc changes Revision ChangesPath 1.380 +36 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- changelog.xml 22 Sep 2005 17:20:21 - 1.379 +++ changelog.xml 25 Sep 2005 02:16:42 - 1.380 @@ -26,6 +26,42 @@ /p /section +section name=Tomcat 5.5.13 (yoavs) + subsection name=General +changelog +/changelog + /subsection + subsection name=Catalina +changelog + fix +bug36802/bug: Fix problem of double-init when JMX-deploying a +Context into a started Host. (billbarker) + /fix +/changelog + /subsection + subsection name=Coyote +changelog + fix +Gracefully handle the case where some Socket options are disabled at +the OS level for the AJP/1.3 Connector. (billbarker) + /fix +/changelog + /subsection + subsection name=Jasper +changelog +/changelog + /subsection + subsection name=Cluster +changelog +/changelog + /subsection + subsection name=Webapps +changelog + fixRemove obsolete TagPlugin file from JSP examples (billbarker)/fix +/changelog + /subsection +/section + section name=Tomcat 5.5.12 (yoavs) subsection name=General changelog - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/09/22 06:34:06 Modified:catalina/src/bin service.bat webapps/docs changelog.xml Log: Bugzilla 35609: http://issues.apache.org/bugzilla/show_bug.cgi?id=35609 Revision ChangesPath 1.13 +3 -3 jakarta-tomcat-catalina/catalina/src/bin/service.bat Index: service.bat === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/service.bat,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- service.bat 5 May 2005 16:24:38 - 1.12 +++ service.bat 22 Sep 2005 13:34:05 - 1.13 @@ -54,7 +54,7 @@ if %1 == uninstall goto doRemove echo Unknown parameter %1 :displayUsage -echo +echo. echo Usage: service.bat install/remove [service_name] goto end @@ -71,7 +71,7 @@ echo Using CATALINA_BASE:%CATALINA_BASE% echo Using JAVA_HOME:%JAVA_HOME% -rem Use the environment variables as an exaple +rem Use the environment variables as an example rem Each command line option is prefixed with PR_ set PR_DESCRIPTION=Apache Tomcat Server - http://jakarta.apache.org/tomcat 1.376 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.375 retrieving revision 1.376 diff -u -r1.375 -r1.376 --- changelog.xml 20 Sep 2005 10:56:48 - 1.375 +++ changelog.xml 22 Sep 2005 13:34:05 - 1.376 @@ -66,6 +66,10 @@ fix bug36541/bug: Full synchronization for session objects attributes collections (remm) /fix + fix +bug35609/bug: service.bat echo command when wrong arguments given [patch by Robert +Longson] (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml cluster-howto.xml
yoavs 2005/09/22 06:39:32 Modified:webapps/docs changelog.xml cluster-howto.xml Log: Bugzilla 35613: http://issues.apache.org/bugzilla/show_bug.cgi?id=35613 Revision ChangesPath 1.377 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.376 retrieving revision 1.377 diff -u -r1.376 -r1.377 --- changelog.xml 22 Sep 2005 13:34:05 - 1.376 +++ changelog.xml 22 Sep 2005 13:39:32 - 1.377 @@ -109,6 +109,9 @@ fix bug36518/bug: Classname typos for senders, submitted by Christoph Bachhuber-Haller (remm) /fix + add +bug35613/bug: Added FAQ question and answer about tcpListenAddress=auto and /etc/hosts (yoavs) + /add /changelog /subsection 1.12 +5 -0 jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml Index: cluster-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cluster-howto.xml 8 Jul 2005 20:52:50 - 1.11 +++ cluster-howto.xml 22 Sep 2005 13:39:32 - 1.12 @@ -1131,6 +1131,11 @@ /ul p/p /li +liQ: I get localhost rather than eth0 or another interface when using tcpListenAddress=auto.p/p +A: Change /etc/hosts so that the localhost domain resolves to the actual IP address of the NIC, eth0. + Please see a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=35613;Bugzilla/a for more. +p/p +/li /ol /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml cluster-howto.xml
yoavs 2005/09/22 07:21:19 Modified:webapps/docs changelog.xml cluster-howto.xml Log: Relocate clustering FAQ from howto to the main FAQ. Revision ChangesPath 1.378 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.377 retrieving revision 1.378 diff -u -r1.377 -r1.378 --- changelog.xml 22 Sep 2005 13:39:32 - 1.377 +++ changelog.xml 22 Sep 2005 14:21:18 - 1.378 @@ -112,6 +112,9 @@ add bug35613/bug: Added FAQ question and answer about tcpListenAddress=auto and /etc/hosts (yoavs) /add + update +Moved FAQ section for Clustering from Clustering HowTo page to its own FAQ page. (yoavs) + /update /changelog /subsection 1.13 +1 -72 jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml Index: cluster-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cluster-howto.xml 22 Sep 2005 13:39:32 - 1.12 +++ cluster-howto.xml 22 Sep 2005 14:21:18 - 1.13 @@ -1066,78 +1066,7 @@ /section section name=FAQ -pTo be completed once we receive questions about session replication:/p -ol -liQ: Can I configure as engine level?p/p - -A: Since Tomcat 5.5.10 you can configure a cluster as engine and host level. -This helps to support clustering at a web hosting szenario. - p/p - /li -liQ: What is the simples cluster config?p/p - -A: Since Tomcat 5.5.10 you can configure a cluster with following: codelt;Cluster className=org.apache.catalina.cluster.tcp.SimpleTcpCluster defaultMode=true /gt;/code - p/p - /li -liQ: How can I activated transparent logging?p/p - -A: Use org.apache.catalina.cluster as logger category and switch to info, debug or trace as log level. -A: Configure the bclusterLog/b attribute (logging category) to get and send and receive message log. - p/p - /li -liQ: How can I used JMX information to monitor the cluster?p/p - -A: Yes, it exists a lot ot usefull information to the cluster as MBeans. With Java 5 you can use the - jconsole to look inside the runnnig cluster (s. JMX section above). - At fastasyncmode replication mode you can got more information with - sender attributes codedoProcessingStats=true/code and codequeueDoStats=true/code. - With the new JMX remote ant task you can access the state and call operations. - p/p - /li -lip/pQ: Can I pause the message sending?p/p - -A: Yes, the async senders buffer the messages, but make sure the membership ping is active. - With fastasyncqueue mode you can limit the max queue size. - p/p - /li -liQ: Can I at more pooled senders?p/p - -A: Yes, with sender attribute codemaxPoolSocketLimit=40/code you can have more than the default - code25/code sockets to transfer more parallel messages. - p/p - /li -liQ: What happens when I pull the network cable?p/p - -A: Well, the other members will remove the instance from the cluster, - but when you insert the cable again, the Tomcat instance might have completely flipped out. - This is because the OS might start going 100% CPU when a multicast message is sent. - There has not yet been a good solution for this, I will let you know when I have come up with one. - (pero: I test this and I works correct with java 5 and exists when you use the cluster with JDK 1.4.x) - p/p - /li -liQ: At my windows laptop without network my cluster doesn't work?p/p - -A: The Membership attribute codemcastBindAddress=127.0.0.1/code must be set! - p/p - /li -liQ: The cluster dosen't work under linux with two nodes at two boxes?p/p - -A: Check the the following topics: -ul -liIs your network interface enabled for multicast? codeifconfig eth0 MULTICAST/code/li -liExists a multicast route to your network interface? coderoute add -host 228.0.0.4 dev eth0/code/li -liIs your firewall active? Then check that multicast port is on your UDP open list - and the receiver TCP port is also for both machines open!/li -/ul - p/p - /li -liQ: I get localhost rather than eth0 or another interface when using tcpListenAddress=auto.p/p -A: Change /etc/hosts so that the localhost domain resolves to the actual IP address of the NIC, eth0. - Please see a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=35613;Bugzilla/a for more. -p/p -/li - -/ol +pPlease see
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/09/19 04:35:50
Modified:catalina/src/share/org/apache/catalina/session
StandardSession.java
webapps/docs changelog.xml
Log:
- 36541: Full syncs using a Hashtable for session attributes, as mandated in
the next specification.
Revision ChangesPath
1.61 +11 -20
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java
Index: StandardSession.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- StandardSession.java 16 Jun 2005 09:50:12 - 1.60
+++ StandardSession.java 19 Sep 2005 11:35:49 - 1.61
@@ -31,7 +31,9 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Iterator;
+import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
@@ -115,7 +117,7 @@
/**
* The collection of user data attributes associated with this Session.
*/
-protected HashMap attributes = new HashMap();
+protected Map attributes = new Hashtable();
/**
@@ -229,7 +231,7 @@
* and event listeners. bIMPLEMENTATION NOTE:/b This object is
* emnot/em saved and restored across session serializations!
*/
-protected transient HashMap notes = new HashMap();
+protected transient Map notes = new Hashtable();
/**
@@ -1266,10 +1268,7 @@
}
// Replace or add this attribute
-Object unbound = null;
-synchronized (attributes) {
-unbound = attributes.put(name, value);
-}
+Object unbound = attributes.put(name, value);
// Call the valueUnbound() method if necessary
if ((unbound != null) (unbound != value)
@@ -1376,7 +1375,7 @@
// Deserialize the attribute count and attribute values
if (attributes == null)
-attributes = new HashMap();
+attributes = new Hashtable();
int n = ((Integer) stream.readObject()).intValue();
boolean isValidSave = isValid;
isValid = true;
@@ -1388,9 +1387,7 @@
if (manager.getContainer().getLogger().isDebugEnabled())
manager.getContainer().getLogger().debug( loading
attribute ' + name +
' with value ' + value + ');
-synchronized (attributes) {
-attributes.put(name, value);
-}
+attributes.put(name, value);
}
isValid = isValidSave;
@@ -1399,7 +1396,7 @@
}
if (notes == null) {
-notes = new HashMap();
+notes = new Hashtable();
}
}
@@ -1442,10 +1439,7 @@
ArrayList saveNames = new ArrayList();
ArrayList saveValues = new ArrayList();
for (int i = 0; i keys.length; i++) {
-Object value = null;
-synchronized (attributes) {
-value = attributes.get(keys[i]);
-}
+Object value = attributes.get(keys[i]);
if (value == null)
continue;
else if ( (value instanceof Serializable)
@@ -1599,10 +1593,7 @@
protected void removeAttributeInternal(String name, boolean notify) {
// Remove this attribute from our collection
-Object value = null;
-synchronized (attributes) {
-value = attributes.remove(name);
-}
+Object value = attributes.remove(name);
// Do we need to do valueUnbound() and attributeRemoved()
notification?
if (!notify || (value == null)) {
1.374 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- changelog.xml 14 Sep 2005 15:05:49 - 1.373
+++ changelog.xml 19 Sep 2005 11:35:50 - 1.374
@@ -63,6 +63,9 @@
bug36113/bug: Session persistence for objects with primitive
types could fail in
some rare cases (remm)
/fix
+ fix
+bug36541/bug: Full synchronization for session objects
attributes collections (remm)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands,
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/09/14 06:25:22 Modified:webapps/docs changelog.xml Log: add: Sync all session attribute access (read and write) at DeltaSession Revision ChangesPath 1.372 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.371 retrieving revision 1.372 diff -u -r1.371 -r1.372 --- changelog.xml 8 Sep 2005 15:41:11 - 1.371 +++ changelog.xml 14 Sep 2005 13:25:22 - 1.372 @@ -90,6 +90,9 @@ subsection name=Cluster changelog fix +bug36541/bug: Sync all session attribute access (read and write) at DeltaSession (pero) + /fix + fix bug36518/bug: Classname typos for senders, submitted by Christoph Bachhuber-Haller (remm) /fix /changelog - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml monitoring.xml
pero2005/09/14 08:05:50
Modified:webapps/docs changelog.xml monitoring.xml
Log:
Add JMX Remote create and unregister ant tasks
Revision ChangesPath
1.373 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- changelog.xml 14 Sep 2005 13:25:22 - 1.372
+++ changelog.xml 14 Sep 2005 15:05:49 - 1.373
@@ -40,6 +40,9 @@
subsection name=Catalina
changelog
+ add
+Add JMX Remote create and unregister ant tasks (pero)
+ /add
fix
bug36343/bug: Only normalize out backslash on Windows platforms.
(billbarker)
/fix
1.5 +126 -0jakarta-tomcat-catalina/webapps/docs/monitoring.xml
Index: monitoring.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/monitoring.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- monitoring.xml21 Jul 2005 08:49:32 - 1.4
+++ monitoring.xml14 Sep 2005 15:05:49 - 1.5
@@ -762,6 +762,132 @@
/section
+!-- Create
#
+--
+
+section name=JMXAccessorCreateTask: remote create mbean ant task
+p
+List of Attributesbr/
+table border=1 cellpadding=5
+
+ tr
+th align=center bgcolor=aquaAttribute/th
+th align=center bgcolor=aquaDescription/th
+th align=center bgcolor=aquaDefault value/th
+ /tr
+
+ tr
+tdname/td
+tdFull qualified JMX ObjectName -- emCatalina:type=MBeanFactory/em
+/td
+td/td
+ /tr
+
+ tr
+tdclassName/td
+tdExisting MBean full qualified classname (see Tomcat mbean
description above)
+/td
+td/td
+ /tr
+
+ tr
+tdclassLoader/td
+tdObjectName of server or web application classloader br/
+( emCatalina:type=ServerClassLoader,name=[server,common,shared]/em
orbr/
+ emCatalina:type=WebappClassLoader,path=/myapps,host=localhost/em)
+/td
+td/td
+ /tr
+
+ tr
+tdref/td
+tdJMX Connection reference
+/td
+tdcodejmx.server/code/td
+ /tr
+
+ tr
+tdecho/td
+tdEcho command usage (access and result)
+/td
+tdcodefalse/code/td
+ /tr
+
+/table
+/p
+p
+Example to create remote mbeanbr/
+source
+lt;jmx:create
+ ref=${jmx.reference}
+ name=Catalina:type=MBeanFactory
+ className=org.apache.commons.modeler.BaseModelMBean
+ classLoader=Catalina:type=ServerClassLoader,name=servergt;
+ lt;Arg value=org.apache.catalina.mbeans.MBeanFactory /gt;
+lt;/jmx:creategt;
+/source
+/p
+p
+bWarning/b: A lot of tomcat mbeans can't be really create and
connect with br/
+the parent. The valve, cluster or realm Mbeans are not autconnect with
there parent.br/
+Use emMBeanFacrory/em create operation instead.
+/p
+
+/section
+
+!-- Unregister
#
+--
+
+section name=JMXAccessorUnregisterTask: remote unregister mbean ant task
+p
+List of Attributesbr/
+table border=1 cellpadding=5
+
+ tr
+th align=center bgcolor=aquaAttribute/th
+th align=center bgcolor=aquaDescription/th
+th align=center bgcolor=aquaDefault value/th
+ /tr
+
+ tr
+tdname/td
+tdFull qualified JMX ObjectName -- emCatalina:type=MBeanFactory/em
+/td
+td/td
+ /tr
+
+ tr
+tdref/td
+tdJMX Connection reference
+/td
+tdcodejmx.server/code/td
+ /tr
+
+ tr
+tdecho/td
+tdEcho command usage (access and result)
+/td
+tdcodefalse/code/td
+ /tr
+
+/table
+/p
+p
+Example to unregister remote mbeanbr/
+source
+lt;jmx:unregister
+name=Catalina:type=MBeanFactory
+/gt;
+/source
+/p
+p
+bWarning/b: A lot of tomcat mbeans can't be really unregister. br/
+The Mbeans are not deregister from parent. Use emMBeanFacrory/em
br/
+remove operation instead.
+/p
+
+/section
+
!-- condition
#
--
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
We heartily thank you for your support interest in our offerings. We appreciate value your mails. We will soon contact you to take this further, as appropriate. Thank you, mie consultants inc. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/09/08 03:45:14
Modified:catalina/src/share/org/apache/naming/resources
DirContextURLStreamHandler.java
catalina/src/share/org/apache/catalina/core
ApplicationContext.java
webapps/docs changelog.xml
Log:
- 36534: Context relative URLs returned by ServletContext.getResource() for
the same path are not equal.
- Jan's patch.
Revision ChangesPath
1.4 +36 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/DirContextURLStreamHandler.java
Index: DirContextURLStreamHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/DirContextURLStreamHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirContextURLStreamHandler.java 27 Feb 2004 14:58:54 - 1.3
+++ DirContextURLStreamHandler.java 8 Sep 2005 10:45:13 - 1.4
@@ -89,6 +89,41 @@
}
+// URL
Methods
+
+
+/**
+ * Override as part of the fix for 36534, to ensure toString is correct.
+ */
+protected String toExternalForm(URL u) {
+// pre-compute length of StringBuffer
+int len = u.getProtocol().length() + 1;
+if (u.getPath() != null) {
+len += u.getPath().length();
+}
+if (u.getQuery() != null) {
+len += 1 + u.getQuery().length();
+}
+if (u.getRef() != null)
+len += 1 + u.getRef().length();
+StringBuffer result = new StringBuffer(len);
+result.append(u.getProtocol());
+result.append(:);
+if (u.getPath() != null) {
+result.append(u.getPath());
+}
+if (u.getQuery() != null) {
+result.append('?');
+result.append(u.getQuery());
+}
+if (u.getRef() != null) {
+result.append(#);
+result.append(u.getRef());
+}
+return result.toString();
+}
+
+
// - Public
Methods
1.30 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Index: ApplicationContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ApplicationContext.java 29 Aug 2005 10:38:38 - 1.29
+++ ApplicationContext.java 8 Sep 2005 10:45:14 - 1.30
@@ -497,7 +497,7 @@
try {
resources.lookup(path);
return new URL
-(jndi, null, 0, getJNDIUri(hostName, fullPath),
+(jndi, , 0, getJNDIUri(hostName, fullPath),
new DirContextURLStreamHandler(resources));
} catch (Exception e) {
// Ignore
1.369 +4 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- changelog.xml 6 Sep 2005 12:50:55 - 1.368
+++ changelog.xml 8 Sep 2005 10:45:14 - 1.369
@@ -33,7 +33,7 @@
Remove uneeded files in conf. (remm)
/fix
update
-Change distribution file names from jakarta-* to apache-*.
+Change distribution file names from jakarta-* to apache-*. (remm)
/update
/changelog
/subsection
@@ -49,6 +49,9 @@
add
bug36088/bug: Add RUNNING.txt and RELEASE-NOTES.txt to fulldocs
distro. (yoavs)
/add
+ fix
+bug36534/bug: fix equals for URLs returned by
ServletContext.getResource() (luehe)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/09/08 08:41:11
Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
ReplicationStream.java
catalina/src/share/org/apache/catalina/util
CustomObjectInputStream.java
webapps/docs changelog.xml
Log:
- 36113: Session persistence for objects with primitive types.
- The best fix would be to be able to reuse the JDK code (or similar) here.
Revision ChangesPath
1.5 +14 -10
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicationStream.java
Index: ReplicationStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicationStream.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ReplicationStream.java27 Jul 2005 15:11:40 - 1.4
+++ ReplicationStream.java8 Sep 2005 15:41:11 - 1.5
@@ -69,15 +69,19 @@
throws ClassNotFoundException, IOException {
String name = classDesc.getName();
boolean tryRepFirst = name.startsWith(org.apache.catalina.cluster);
-try
-{
-if ( tryRepFirst ) return findReplicationClass(name);
-else return findWebappClass(name);
-}
-catch ( Exception x )
-{
-if ( tryRepFirst ) return findWebappClass(name);
-else return findReplicationClass(name);
+try {
+try
+{
+if ( tryRepFirst ) return findReplicationClass(name);
+else return findWebappClass(name);
+}
+catch ( Exception x )
+{
+if ( tryRepFirst ) return findWebappClass(name);
+else return findReplicationClass(name);
+}
+} catch (ClassNotFoundException e) {
+return super.resolveClass(classDesc);
}
}
1.5 +7 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java
Index: CustomObjectInputStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CustomObjectInputStream.java 10 Mar 2005 23:54:45 - 1.4
+++ CustomObjectInputStream.java 8 Sep 2005 15:41:11 - 1.5
@@ -70,7 +70,12 @@
*/
public Class resolveClass(ObjectStreamClass classDesc)
throws ClassNotFoundException, IOException {
-return Class.forName(classDesc.getName(), false, classLoader);
+try {
+return Class.forName(classDesc.getName(), false, classLoader);
+} catch (ClassNotFoundException e) {
+// Try also the superclass because of primitive types
+return super.resolveClass(classDesc);
+}
}
1.371 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- changelog.xml 8 Sep 2005 15:00:54 - 1.370
+++ changelog.xml 8 Sep 2005 15:41:11 - 1.371
@@ -56,6 +56,10 @@
bug36558/bug: Clear IntrospectionUtils cache when stopping a
webapp, as it
could leak to keeping a reference to the classloader (remm)
/fix
+ fix
+bug36113/bug: Session persistence for objects with primitive
types could fail in
+some rare cases (remm)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/09/06 05:50:55 Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp DataSenders.properties webapps/docs changelog.xml Log: - 36518: Classname typos for senders. - Submitted by Christoph Bachhuber-Haller. Revision ChangesPath 1.2 +2 -2 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSenders.properties Index: DataSenders.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSenders.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DataSenders.properties16 Jul 2005 21:02:17 - 1.1 +++ DataSenders.properties6 Sep 2005 12:50:55 - 1.2 @@ -1,4 +1,4 @@ fastasyncqueue=org.apache.catalina.cluster.tcp.FastAsyncSocketSender -asynchronous=org.apache.catalina..cluster.tcp.AsyncSocketSender -synchronous=org.apache.catalina..cluster.tcp.SocketSender +asynchronous=org.apache.catalina.cluster.tcp.AsyncSocketSender +synchronous=org.apache.catalina.cluster.tcp.SocketSender pooled=org.apache.catalina.cluster.tcp.PooledSocketSender 1.368 +4 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.367 retrieving revision 1.368 diff -u -r1.367 -r1.368 --- changelog.xml 1 Sep 2005 18:28:24 - 1.367 +++ changelog.xml 6 Sep 2005 12:50:55 - 1.368 @@ -77,7 +77,10 @@ /subsection subsection name=Cluster -changelog +changelog + fix +bug36518/bug: Classname typos for senders, submitted by Christoph Bachhuber-Haller (remm) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/09/01 11:28:25
Modified:.build.xml
webapps/docs changelog.xml
Log:
Bugzilla 36088: http://issues.apache.org/bugzilla/show_bug.cgi?id=36088
Revision ChangesPath
1.237 +1 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- build.xml 31 Aug 2005 16:30:48 - 1.236
+++ build.xml 1 Sep 2005 18:28:24 - 1.237
@@ -1748,6 +1748,7 @@
include name=LICENSE /
include name=NOTICE /
include name=README.txt /
+include name=RUNNING.txt /
/tarfileset
tarfileset dir=${tomcat.dist}/webapps/tomcat-docs
prefix=tomcat-5.5-doc
include name=** /
1.367 +8 -2 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- changelog.xml 31 Aug 2005 14:06:40 - 1.366
+++ changelog.xml 1 Sep 2005 18:28:24 - 1.367
@@ -30,8 +30,11 @@
subsection name=General
changelog
fix
-Remove uneeded files in conf (remm)
+Remove uneeded files in conf. (remm)
/fix
+ update
+Change distribution file names from jakarta-* to apache-*.
+ /update
/changelog
/subsection
@@ -41,8 +44,11 @@
bug36343/bug: Only normalize out backslash on Windows platforms.
(billbarker)
/fix
fix
-Allow configuring standard stream redirection (remm)
+Allow configuring standard stream redirection. (remm)
/fix
+ add
+bug36088/bug: Add RUNNING.txt and RELEASE-NOTES.txt to fulldocs
distro. (yoavs)
+ /add
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/08/30 15:39:36
Modified:jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java Parser.java
JspDocumentParser.java
jasper2/src/share/org/apache/jasper
EmbeddedServletOptions.java Options.java JspC.java
webapps/docs changelog.xml
Log:
- JSP compilation speed improvement using tag library information caching.
- Submitted by Xingbo Gao.
Revision ChangesPath
1.60 +1 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- TagLibraryInfoImpl.java 23 Mar 2005 15:48:37 - 1.59
+++ TagLibraryInfoImpl.java 30 Aug 2005 22:39:34 - 1.60
@@ -86,7 +86,7 @@
print(urn, urn, out);
print(info, info, out);
print(uri, uri, out);
-print(tagLibraryValidator, tagLibraryValidator.toString(), out);
+print(tagLibraryValidator, + tagLibraryValidator, out);
for(int i = 0; i tags.length; i++)
out.println(tags[i].toString());
1.91 +17 -8
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- Parser.java 9 Mar 2005 19:13:20 - 1.90
+++ Parser.java 30 Aug 2005 22:39:34 - 1.91
@@ -414,14 +414,23 @@
prefix, uri, uriPrev);
}
if (pageInfo.getTaglib(uri) == null) {
- String[] location = ctxt.getTldLocation(uri);
- pageInfo.addTaglib(uri,
-new TagLibraryInfoImpl(ctxt,
- parserController,
- prefix,
- uri,
- location,
- err));
+TagLibraryInfoImpl impl = null;
+if (ctxt.getOptions().isCaching()) {
+impl = (TagLibraryInfoImpl)
ctxt.getOptions().getCache().get(uri);
+}
+if (impl == null) {
+String[] location = ctxt.getTldLocation(uri);
+impl = new TagLibraryInfoImpl(ctxt,
+parserController,
+prefix,
+uri,
+location,
+err);
+if (ctxt.getOptions().isCaching()) {
+ctxt.getOptions().getCache().put(uri, impl);
+}
+}
+ pageInfo.addTaglib(uri, impl);
}
pageInfo.addPrefixMapping(prefix, uri);
} else {
1.86 +22 -14
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- JspDocumentParser.java11 Aug 2005 12:00:32 - 1.85
+++ JspDocumentParser.java30 Aug 2005 22:39:35 - 1.86
@@ -1233,20 +1233,28 @@
String[] location = ctxt.getTldLocation(uri);
if (location != null || !isPlainUri) {
-/*
- * If the uri value is a plain uri, a translation error must
- * not be generated if the uri is not found in the taglib
map.
- * Instead, any actions in the namespace defined by the uri
- * value must be treated as uninterpreted.
- */
-result =
-new TagLibraryInfoImpl(
-ctxt,
-parserController,
-prefix,
-uri,
-location,
-err);
+if (ctxt.getOptions().isCaching()) {
+result = (TagLibraryInfoImpl)
ctxt.getOptions().getCache().get(uri);
+}
+
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
billbarker2005/08/28 18:14:45 Modified:webapps/docs changelog.xml Log: Doc changes Revision ChangesPath 1.364 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.363 retrieving revision 1.364 diff -u -r1.363 -r1.364 --- changelog.xml 26 Aug 2005 12:31:05 - 1.363 +++ changelog.xml 29 Aug 2005 01:14:45 - 1.364 @@ -37,6 +37,9 @@ subsection name=Catalina changelog + fix +bug36343/bug: Only normalize out backslash on Windows platforms. (billbarker) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/08/26 05:31:05
Modified:jk/java/org/apache/coyote/ajp AjpAprProcessor.java
AjpAprProtocol.java
webapps/docs changelog.xml
Log:
- Now I know what secret is used for.
Revision ChangesPath
1.18 +26 -0
jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Index: AjpAprProcessor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AjpAprProcessor.java 4 Aug 2005 07:07:57 - 1.17
+++ AjpAprProcessor.java 26 Aug 2005 12:31:05 - 1.18
@@ -32,6 +32,7 @@
import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
+import org.apache.jk.common.AjpConstants;
import org.apache.tomcat.jni.Socket;
import org.apache.tomcat.jni.Status;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -311,6 +312,13 @@
public void setTomcatAuthentication(boolean tomcatAuthentication) {
this.tomcatAuthentication = tomcatAuthentication; }
+/**
+ * Required secret.
+ */
+protected String requiredSecret = null;
+public void setRequiredSecret(String requiredSecret) {
this.requiredSecret = requiredSecret; }
+
+
// - Public
Methods
@@ -677,6 +685,7 @@
}
// Decode extra attributes
+boolean secret = false;
byte attributeCode;
while ((attributeCode = requestHeaderMessage.getByte())
!= Constants.SC_A_ARE_DONE) {
@@ -756,6 +765,17 @@
requestHeaderMessage.getBytes(request.method());
break;
+case AjpConstants.SC_A_SECRET:
+requestHeaderMessage.getBytes(tmpMB);
+if (requiredSecret != null) {
+secret = true;
+if (!tmpMB.equals(requiredSecret)) {
+response.setStatus(403);
+error = true;
+}
+}
+break;
+
default:
// Ignore unknown attribute for backward compatibility
break;
@@ -764,6 +784,12 @@
}
+// Check if secret was submitted if required
+if ((requiredSecret != null) !secret) {
+response.setStatus(403);
+error = true;
+}
+
// Check for a full URI (including protocol://host:port/)
ByteChunk uriBC = request.requestURI().getByteChunk();
if (uriBC.startsWithIgnoreCase(http, 0)) {
1.8 +12 -0
jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProtocol.java
Index: AjpAprProtocol.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProtocol.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AjpAprProtocol.java 1 Aug 2005 10:00:59 - 1.7
+++ AjpAprProtocol.java 26 Aug 2005 12:31:05 - 1.8
@@ -100,6 +100,12 @@
/**
+ * Required secret.
+ */
+protected String requiredSecret = null;
+
+
+/**
* Adapter which will process the requests recieved by this endpoint.
*/
private Adapter adapter;
@@ -394,6 +400,11 @@
}
+public void setRequiredSecret(String requiredSecret) {
+this.requiredSecret = requiredSecret;
+}
+
+
// -- AjpConnectionHandler Inner
Class
@@ -415,6 +426,7 @@
processor = new AjpAprProcessor(proto.ep);
processor.setAdapter(proto.adapter);
processor.setTomcatAuthentication(proto.tomcatAuthentication);
+processor.setRequiredSecret(proto.requiredSecret);
localProcessor.set(processor);
if (proto.getDomain() != null) {
synchronized (this) {
1.363 +6 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- changelog.xml 25 Aug 2005 12:30:14 - 1.362
+++ changelog.xml 26 Aug 2005 12:31:05 - 1.363
@@ -42,6 +42,9 @@
subsection
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/08/22 02:14:58 Modified:webapps/docs changelog.xml Log: doc my cluster and coyote changes Revision ChangesPath 1.361 +10 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.360 retrieving revision 1.361 diff -u -r1.360 -r1.361 --- changelog.xml 19 Aug 2005 08:00:37 - 1.360 +++ changelog.xml 22 Aug 2005 09:14:58 - 1.361 @@ -132,6 +132,9 @@ fix Disable HTTP compression when sendfile is used for a resource (remm) /fix + fix +AJP secret attribute report only at trace level. (pero) + /fix /changelog /subsection @@ -146,6 +149,13 @@ subsection name=Cluster changelog + fix +Fix NPE when cluster stops (pero) + /fix + fix +bug36218/bug: MemoryRealm now support also GenericPrincipal, but +JAASRealm with cluster replication still has a problem, detected by Dirk Dekok (pero) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/08/19 01:00:37
Modified:http11/src/java/org/apache/coyote/http11
Http11AprProcessor.java
webapps/docs changelog.xml
Log:
- Disable the built-in HTTP compression when sendfile is used for a resource.
Revision ChangesPath
1.32 +1 -2
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Index: Http11AprProcessor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Http11AprProcessor.java 4 Aug 2005 07:07:57 - 1.31
+++ Http11AprProcessor.java 19 Aug 2005 08:00:37 - 1.32
@@ -1583,9 +1583,8 @@
// Check for compression
boolean useCompression = false;
-if (entityBody (compressionLevel 0)) {
+if (entityBody (compressionLevel 0) (sendfileData == null)) {
useCompression = isCompressable();
-
// Change content-length to -1 to force chunking
if (useCompression) {
response.setContentLength(-1);
1.360 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- changelog.xml 18 Aug 2005 13:25:18 - 1.359
+++ changelog.xml 19 Aug 2005 08:00:37 - 1.360
@@ -129,6 +129,9 @@
bug36173/bug: Add missing sync in FastHttpDateFormat.formatDate,
submitted
by Alexei Krainiouk (remm)
/fix
+ fix
+Disable HTTP compression when sendfile is used for a resource (remm)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/08/18 06:25:18
Modified:catalina/src/share/org/apache/catalina/connector
ClientAbortException.java
catalina/src/share/org/apache/catalina/core
StandardHostValve.java
webapps/docs changelog.xml
Log:
- 35984: Use getCause.
Revision ChangesPath
1.3 +6 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/ClientAbortException.java
Index: ClientAbortException.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/ClientAbortException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClientAbortException.java 27 Feb 2004 14:58:41 - 1.2
+++ ClientAbortException.java 18 Aug 2005 13:25:18 - 1.3
@@ -112,15 +112,15 @@
/**
- * Returns the throwable that caused this exception, if any.
+ * Returns the cause that caused this exception, if any.
*/
-public Throwable getThrowable() {
-
+public Throwable getCause() {
+
return (throwable);
-
+
}
-
+
/**
* Return a formatted string that describes this exception.
*/
1.25 +7 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
Index: StandardHostValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- StandardHostValve.java27 Sep 2004 16:04:05 - 1.24
+++ StandardHostValve.java18 Aug 2005 13:25:18 - 1.25
@@ -174,10 +174,12 @@
// If this is an aborted request from a client just log it and return
if (realError instanceof ClientAbortException ) {
-log.debug
-(sm.getString(standardHost.clientAbort,
- ((ClientAbortException)
realError).getThrowable()
- .getMessage()));
+if (log.isDebugEnabled()) {
+log.debug
+(sm.getString(standardHost.clientAbort,
+((ClientAbortException) realError).getCause()
+.getMessage()));
+}
return;
}
1.359 +6 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- changelog.xml 17 Aug 2005 15:07:19 - 1.358
+++ changelog.xml 18 Aug 2005 13:25:18 - 1.359
@@ -86,6 +86,12 @@
bug35978/bug: Bad handling of single range requests greater than
2GB in the DefaultServlet
(remm)
/fix
+ fix
+bug35984/bug: Client abort exceptions will now use getCause
(remm)
+ /fix
+ fix
+Fix handling of non-file based includes with SSI, submitted by David
Becker (markt)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/08/17 08:07:19
Modified:catalina/src/share/org/apache/catalina/connector
Request.java
util/java/org/apache/tomcat/util/buf StringCache.java
webapps/docs changelog.xml
Log:
- 36228: Some more CNFE.
Revision ChangesPath
1.25 +8 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java
Index: Request.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Request.java 10 May 2005 20:51:43 - 1.24
+++ Request.java 17 Aug 2005 15:07:19 - 1.25
@@ -46,6 +46,7 @@
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.buf.StringCache;
import org.apache.tomcat.util.http.Cookies;
import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.Parameters;
@@ -85,6 +86,12 @@
// ---
Constructors
+static {
+// Ensure that classes are loaded for SM
+new StringCache.ByteEntry();
+new StringCache.CharEntry();
+}
+
public Request() {
formats[0].setTimeZone(GMT_ZONE);
1.6 +2 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/StringCache.java
Index: StringCache.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/StringCache.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringCache.java 27 Jul 2005 15:12:02 - 1.5
+++ StringCache.java 17 Aug 2005 15:07:19 - 1.6
@@ -620,7 +620,7 @@
// -- ByteEntry Inner
Class
-protected static class ByteEntry {
+public static class ByteEntry {
public byte[] name = null;
public String enc = null;
@@ -645,7 +645,7 @@
// -- CharEntry Inner
Class
-protected static class CharEntry {
+public static class CharEntry {
public char[] name = null;
public String value = null;
1.358 +2 -2 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- changelog.xml 16 Aug 2005 16:52:42 - 1.357
+++ changelog.xml 17 Aug 2005 15:07:19 - 1.358
@@ -73,7 +73,7 @@
bug34794/bug: Update connector documentation to include
clientAuth attribute. (yoavs)
/update
fix
-bug35894/bug: Fix CNFE when starting in a sandbox. (billbarker)
+bug35894/bug, bug36228/bug: Fix CNFE when starting in a
sandbox. (billbarker, remm)
/fix
fix
Add version check for Tomcat native so that incompatible API changes
are detected early (remm)
@@ -121,7 +121,7 @@
/fix
fix
bug36173/bug: Add missing sync in FastHttpDateFormat.formatDate,
submitted
-by Alexei (remm)
+by Alexei Krainiouk (remm)
/fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/08/16 09:20:17 Modified:catalina/src/share/org/apache/catalina/ant catalina.tasks webapps/docs changelog.xml Log: - Add back jspc Ant task (needed for the deployer). Revision ChangesPath 1.4 +3 -0 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/catalina.tasks Index: catalina.tasks === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/catalina.tasks,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- catalina.tasks24 Jun 2005 11:52:51 - 1.3 +++ catalina.tasks16 Aug 2005 16:20:17 - 1.4 @@ -9,6 +9,7 @@ stop=org.apache.catalina.ant.StopTask undeploy=org.apache.catalina.ant.UndeployTask validator=org.apache.catalina.ant.ValidatorTask + #Jk Task jkstatus=org.apache.catalina.ant.JKStatusUpdateTask @@ -17,3 +18,5 @@ jmxManagerGet=org.apache.catalina.ant.JMXGetTask jmxManagerQuery=org.apache.catalina.ant.JMXQueryTask +# Jasper tasks +jasper2=org.apache.jasper.JspC 1.356 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.355 retrieving revision 1.356 diff -u -r1.355 -r1.356 --- changelog.xml 11 Aug 2005 12:00:32 - 1.355 +++ changelog.xml 16 Aug 2005 16:20:17 - 1.356 @@ -45,6 +45,9 @@ The Windows installer will now optionally download a (32bit) Windows .dll for Tomcat native from HEAnet (remm) /update + fix +Declaration of jspc Ant task to fix the deployer package (remm) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/08/11 05:00:32 Modified:jasper2/src/share/org/apache/jasper/compiler JspDocumentParser.java webapps/docs changelog.xml Log: - 36127: Compatibility with Xerces 2.7. - Submitted by Florent Benoit. Revision ChangesPath 1.85 +5 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java Index: JspDocumentParser.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- JspDocumentParser.java30 Mar 2005 20:27:22 - 1.84 +++ JspDocumentParser.java11 Aug 2005 12:00:32 - 1.85 @@ -1370,10 +1370,11 @@ factory.setFeature( http://xml.org/sax/features/namespace-prefixes;, true); -factory.setFeature( -http://xml.org/sax/features/validation;, -validating); - +factory.setValidating(validating); +//factory.setFeature( +//http://xml.org/sax/features/validation;, +//validating); + // Configure the parser SAXParser saxParser = factory.newSAXParser(); XMLReader xmlReader = saxParser.getXMLReader(); 1.355 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.354 retrieving revision 1.355 diff -u -r1.354 -r1.355 --- changelog.xml 4 Aug 2005 15:05:31 - 1.354 +++ changelog.xml 11 Aug 2005 12:00:32 - 1.355 @@ -121,6 +121,10 @@ subsection name=Jasper changelog + fix +bug36127/bug: Validation compatibility with Xerces 2.7.1, submitted +by Florent Benoit (remm) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
billbarker2005/08/03 23:17:07 Modified:webapps/docs changelog.xml Log: doc changes Revision ChangesPath 1.351 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.350 retrieving revision 1.351 diff -u -r1.350 -r1.351 --- changelog.xml 2 Aug 2005 18:12:05 - 1.350 +++ changelog.xml 4 Aug 2005 06:17:07 - 1.351 @@ -65,6 +65,9 @@ update bug34794/bug: Update connector documentation to include clientAuth attribute. (yoavs) /update + fix +bug35894/bug: Fix CNFE when starting in a sandbox. (billbarker) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/08/04 04:54:20 Modified:webapps/docs changelog.xml Log: - Changelog update. Revision ChangesPath 1.352 +11 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.351 retrieving revision 1.352 diff -u -r1.351 -r1.352 --- changelog.xml 4 Aug 2005 06:17:07 - 1.351 +++ changelog.xml 4 Aug 2005 11:54:20 - 1.352 @@ -41,6 +41,10 @@ add bug33261/bug: Windows installer now checks the user type and warns non-admins as needed. (yoavs) /add + update +The Windows installer will now optionally download a (32bit) Windows .dll for Tomcat native +from HEAnet (remm) + /update /changelog /subsection @@ -68,6 +72,9 @@ fix bug35894/bug: Fix CNFE when starting in a sandbox. (billbarker) /fix + fix +Add version check for Tomcat native so that incompatible API changes are detected early (remm) + /fix /changelog /subsection @@ -97,6 +104,10 @@ fix Internationalization and code cleanups for APR AJP implementation. (remm) /fix + fix +Security exception in APR AJP implementation when running with the security +manager enabled. (remm) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/08/04 06:06:56
Modified:catalina/src/share/org/apache/catalina/users
MemoryUserDatabase.java mbeans-descriptors.xml
MemoryUserDatabaseFactory.java
LocalStrings.properties
webapps/docs changelog.xml
Log:
- 36020: MemoryUserDatabase in read only situations.
- Submitted by Rainer Jung.
Revision ChangesPath
1.8 +59 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java
Index: MemoryUserDatabase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUserDatabase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MemoryUserDatabase.java 26 Jun 2004 17:41:33 - 1.7
+++ MemoryUserDatabase.java 4 Aug 2005 13:06:56 - 1.8
@@ -31,6 +31,8 @@
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
import org.apache.catalina.util.StringManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.ObjectCreationFactory;
import org.xml.sax.Attributes;
@@ -49,6 +51,8 @@
public class MemoryUserDatabase implements UserDatabase {
+private static Log log = LogFactory.getLog(MemoryUserDatabase.class);
+
// ---
Constructors
@@ -113,6 +117,11 @@
/**
+ * A flag, indicating if the user database is read only.
+ */
+protected boolean readonly = false;
+
+/**
* The set of [EMAIL PROTECTED] Role}s defined in this database, keyed by
* role name.
*/
@@ -183,6 +192,28 @@
/**
+ * Returning the readonly status of the user database
+ */
+public boolean getReadonly() {
+
+return (this.readonly);
+
+}
+
+
+/**
+ * Setting the readonly status of the user database
+ *
+ * @param pathname The new pathname
+ */
+public void setReadonly(boolean readonly) {
+
+this.readonly = readonly;
+
+}
+
+
+/**
* Return the set of [EMAIL PROTECTED] Role}s defined in this user
database.
*/
public Iterator getRoles() {
@@ -442,6 +473,24 @@
/**
+ * Check for permissions to save this user database
+ * to persistent storage location
+ *
+ */
+public boolean isPersistable() {
+
+File file = new File(pathname);
+if (!file.isAbsolute()) {
+file = new File(System.getProperty(catalina.base),
+pathname);
+}
+File dir = file.getParentFile();
+return dir.exists() dir.isDirectory() dir.canWrite();
+
+}
+
+
+/**
* Save any updated information to the persistent storage location for
* this user database.
*
@@ -449,6 +498,15 @@
*/
public void save() throws Exception {
+if ( getReadonly() ) {
+return;
+}
+
+if ( ! isPersistable() ) {
+log.warn(sm.getString(memoryUserDatabase.notPersistable));
+return;
+}
+
// Write out contents to a temporary file
File fileNew = new File(pathnameNew);
if (!fileNew.isAbsolute()) {
1.2 +11 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/mbeans-descriptors.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbeans-descriptors.xml25 Apr 2003 21:14:36 - 1.1
+++ mbeans-descriptors.xml4 Aug 2005 13:06:56 - 1.2
@@ -252,6 +252,17 @@
type=java.lang.String/
/operation
+attribute name=readonly
+ description=No persistant save of the user database
+ type=boolean
+writeable=false/
+
+operation name=isPersistable
+ description=Check if user database is writable
+ impact=INFO
+ returnType=boolean
+/operation
+
operation name=save
description=Save current users and groups to persistent storage
impact=ACTION
1.4 +6 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUserDatabaseFactory.java
Index: MemoryUserDatabaseFactory.java
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/08/04 08:05:31
Modified:catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
webapps/docs changelog.xml
Log:
- 35978: Bad handling of single range requests greater than 2GB in the
DefaultServlet.
Revision ChangesPath
1.39 +14 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- DefaultServlet.java 5 May 2005 07:00:09 - 1.38
+++ DefaultServlet.java 4 Aug 2005 15:05:31 - 1.39
@@ -809,7 +809,12 @@
if (debug 0)
log(DefaultServlet.serveFile: contentLength= +
contentLength);
-response.setContentLength((int) contentLength);
+if (contentLength Integer.MAX_VALUE) {
+response.setContentLength((int) contentLength);
+} else {
+// Set the content-length as String to be able to use a
long
+response.setHeader(content-length, + contentLength);
+}
}
InputStream renderResult = null;
@@ -854,7 +859,13 @@
+ range.start
+ - + range.end + /
+ range.length);
-response.setContentLength((int) (range.end - range.start +
1));
+long length = range.end - range.start + 1;
+if (length Integer.MAX_VALUE) {
+response.setContentLength((int) length);
+} else {
+// Set the content-length as String to be able to use a
long
+response.setHeader(content-length, + length);
+}
if (contentType != null) {
if (debug 0)
1.354 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- changelog.xml 4 Aug 2005 13:06:56 - 1.353
+++ changelog.xml 4 Aug 2005 15:05:31 - 1.354
@@ -79,6 +79,10 @@
bug36020/bug: Allow MemoryUserDatabase to work better on write
protected mediums,
submitted by Rainer Jung (remm)
/fix
+ fix
+bug35978/bug: Bad handling of single range requests greater than
2GB in the DefaultServlet
+(remm)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/08/02 11:12:06
Modified:.tomcat.nsi
webapps/docs changelog.xml
Log:
Bugzilla 33261: http://issues.apache.org/bugzilla/show_bug.cgi?id=33261
Revision ChangesPath
1.78 +683 -651 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- tomcat.nsi29 Jul 2005 15:35:48 - 1.77
+++ tomcat.nsi2 Aug 2005 18:12:05 - 1.78
@@ -1,651 +1,683 @@
-
-; Tomcat script for Nullsoft Installer
-; $Id$
-
- ;Compression options
- CRCCheck on
- SetCompress force
- SetCompressor lzma
- SetDatablockOptimize on
-
- Name Apache Tomcat
-
- ;Product information
- VIAddVersionKey ProductName Apache Tomcat
- VIAddVersionKey CompanyName Apache Software Foundation
- VIAddVersionKey LegalCopyright Copyright (c) 1999-2004 The Apache
Software Foundation
- VIAddVersionKey FileDescription Apache Tomcat Installer
- VIAddVersionKey FileVersion 2.0
- VIAddVersionKey ProductVersion @VERSION@
- VIAddVersionKey Comments jakarta.apache.org/tomcat
- VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe
- VIProductVersion @VERSION_NUMBER@
-
-!include MUI.nsh
-!include StrFunc.nsh
-${StrRep}
- Var JavaHome
-
-
-
-;
-;Configuration
-
- !define MUI_HEADERIMAGE
- !define MUI_HEADERIMAGE_RIGHT
- !define MUI_HEADERIMAGE_BITMAP header.bmp
- !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp
- !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\webapps\ROOT\RELEASE-NOTES.txt
- !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat5w.exe
- !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//Tomcat5
- !define MUI_FINISHPAGE_NOREBOOTSUPPORT
-
- !define MUI_ABORTWARNING
-
- !define TEMP1 $R0
- !define TEMP2 $R1
-
- !define MUI_ICON tomcat.ico
- !define MUI_UNICON tomcat.ico
-
- ;General
- OutFile tomcat-installer.exe
-
- ;Install Options pages
- LangString TEXT_JVM_TITLE ${LANG_ENGLISH} Java Virtual Machine
- LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} Java Virtual Machine path
selection.
- LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} : Java Virtual Machine path
selection
-
- LangString TEXT_CONF_TITLE ${LANG_ENGLISH} Configuration
- LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} Tomcat basic configuration.
- LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} : Configuration Options
-
- ;Install Page order
- !insertmacro MUI_PAGE_WELCOME
- !insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
- !insertmacro MUI_PAGE_COMPONENTS
- !insertmacro MUI_PAGE_DIRECTORY
- Page custom SetConfiguration Void $(TEXT_CONF_PAGETITLE)
- Page custom SetChooseJVM Void $(TEXT_JVM_PAGETITLE)
- !insertmacro MUI_PAGE_INSTFILES
- !insertmacro MUI_PAGE_FINISH
-
- ;Uninstall Page order
- !insertmacro MUI_UNPAGE_CONFIRM
- !insertmacro MUI_UNPAGE_INSTFILES
-
- ;License dialog
- LicenseData License.rtf
-
- ;Component-selection page
-;Descriptions
-LangString DESC_SecTomcat ${LANG_ENGLISH} Install the Tomcat Servlet
container.
-LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the Tomcat
Servlet container core.
-LangString DESC_SecTomcatService ${LANG_ENGLISH} Automatically start
Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000
or Windows XP.
-;LangString DESC_SecTomcatSource ${LANG_ENGLISH} Install the Tomcat
source code.
-LangString DESC_SecMenu ${LANG_ENGLISH} Create a Start Menu program
group for Tomcat.
-LangString DESC_SecDocs ${LANG_ENGLISH} Install the Tomcat
documentation bundle. This include documentation on the servlet container and
its configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors.
-LangString DESC_SecExamples ${LANG_ENGLISH} Installs some examples web
applications.
-LangString DESC_SecAdmin ${LANG_ENGLISH} Installs the administration
web application.;
-;LangString DESC_SecWebapps ${LANG_ENGLISH} Installs other utility web
applications (WebDAV, balancer, etc).
-;LangString DESC_SecCompat ${LANG_ENGLISH} Installs Java2™
compatibility package. This release of Apache Tomcat was packaged to run on
J2SE 5.0 or later. It can be run on earlier JVMs by installng this package.
-
- ;Language
- !insertmacro MUI_LANGUAGE English
-
- ;Folder-select dialog
- InstallDir $PROGRAMFILES\Apache Software Foundation\Tomcat 5.5
-
- ;Install types
- InstType Normal
- InstType Minimum
- InstType Full
-
- ; Main registry key
- InstallDirRegKey HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.5
-
- !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
- ReserveFile jvm.ini
- ReserveFile
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
[EMAIL PROTECTED] wrote: yoavs 2005/08/02 11:12:06 Modified:.tomcat.nsi webapps/docs changelog.xml Log: Bugzilla 33261: http://issues.apache.org/bugzilla/show_bug.cgi?id=33261 Can you fix the EOLs ? Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Hey, Done. Thanks for catching that, Yoav PS -- Is the 1.1.0 native coming any time soon? The build is broken since build.xml and build.properties.default were updated, but archive.apache.org/dist/[jtc]/native does not exist... -Original Message- From: Remy Maucherat [mailto:[EMAIL PROTECTED] Sent: Tuesday, August 02, 2005 2:26 PM To: Tomcat Developers List Subject: Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml [EMAIL PROTECTED] wrote: yoavs 2005/08/02 11:12:06 Modified:.tomcat.nsi webapps/docs changelog.xml Log: Bugzilla 33261: http://issues.apache.org/bugzilla/show_bug.cgi?id=33261 Can you fix the EOLs ? Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Yoav Shapira wrote: Hey, Done. Thanks for catching that, Yoav PS -- Is the 1.1.0 native coming any time soon? The build is broken since build.xml and build.properties.default were updated, but archive.apache.org/dist/[jtc]/native does not exist... Syncing takes a lot of time with the new architecture, sorry. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/08/01 02:40:14
Modified:jk/java/org/apache/coyote/ajp LocalStrings.properties
AjpMessage.java
webapps/docs changelog.xml
Log:
- Internationalization and code cleanups.
- No functional change.
Revision ChangesPath
1.4 +7 -1
jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/LocalStrings.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalStrings.properties 29 Jul 2005 10:23:55 - 1.3
+++ LocalStrings.properties 1 Aug 2005 09:40:14 - 1.4
@@ -28,3 +28,9 @@
ajpprocessor.request.process=Error processing request
ajpprocessor.certs.fail=Certificate convertion failed
ajpprocessor.socket.info=Exception getting socket information
+
+ajpmessage.null=Cannot append null value
+ajpmessage.overflow=Overflow error for buffer adding {0} bytes at position
{1}
+ajpmessage.read=Requested {0} bytes exceeds message available data
+ajpmessage.invalid=Invalid message recieved with signature {0}
+
1.4 +102 -63
jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpMessage.java
Index: AjpMessage.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpMessage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AjpMessage.java 29 Jul 2005 10:23:55 - 1.3
+++ AjpMessage.java 1 Aug 2005 09:40:14 - 1.4
@@ -21,6 +21,7 @@
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.res.StringManager;
/**
* A single packet for communication between the web server and the
@@ -36,29 +37,45 @@
* @author Costin Manolache
*/
public class AjpMessage {
-
-private static org.apache.commons.logging.Log log=
-org.apache.commons.logging.LogFactory.getLog( AjpMessage.class );
-
+
+protected static org.apache.commons.logging.Log log =
+org.apache.commons.logging.LogFactory.getLog(AjpMessage.class);
+
+/**
+ * The string manager for this package.
+ */
+protected static StringManager sm =
+StringManager.getManager(Constants.Package);
+
+
+// - Instance
Variables
+
+
/**
* Fixed size buffer.
*/
-private byte buf[] = new byte[8*1024];
-
+protected byte buf[] = new byte[8 * 1024];
+
+
/**
* The current read or write position in the buffer.
*/
-private int pos;
-
+protected int pos;
+
+
/**
* This actually means different things depending on whether the
* packet is read or write. For read, it's the length of the
* payload (excluding the header). For write, it's the length of
* the packet as a whole (counting the header). Oh, well.
*/
-private int len;
+protected int len;
+
+// - Public
Methods
+
+
/**
* Prepare this packet for accumulating a message from the container to
* the web server. Set the write position to just after the header
@@ -68,7 +85,8 @@
len = 4;
pos = 4;
}
-
+
+
/**
* For a packet to be sent to the web server, finish the process of
* accumulating data and write the length of the data payload into
@@ -84,15 +102,16 @@
buf[3] = (byte) (dLen 0xFF);
}
+
public byte[] getBuffer() {
return buf;
}
+
public int getLen() {
return len;
}
-// Data Writing Methods ===
/**
* Add an int.
@@ -104,10 +123,12 @@
buf[pos++] = (byte) (val 0xFF);
}
+
public void appendByte(int val) {
buf[pos++] = (byte) val;
}
+
public void appendLongInt(int val) {
buf[pos++] = (byte) ((val 24) 0xFF);
buf[pos++] = (byte) ((val 16) 0xFF);
@@ -115,6 +136,7 @@
buf[pos++] = (byte) (val 0xFF);
}
+
/**
* Write a String out at the current write position. Strings are
* encoded with the length in two bytes first, then the string, and
@@ -142,26 +164,25 @@
}
}
+
public void appendByteChunk(ByteChunk bc)
throws IOException {
if (bc == null) {
-
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/07/30 14:22:25
Modified:.build.xml build.properties.default
webapps/docs changelog.xml
Log:
- Add ready to build tomcat-native.tar.gz in bin that Mladen built.
Revision ChangesPath
1.232 +8 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- build.xml 27 Jul 2005 15:11:09 - 1.231
+++ build.xml 30 Jul 2005 21:22:24 - 1.232
@@ -158,6 +158,8 @@
copy todir=${tomcat.build}/bin file=${commons-daemon.jsvc.tar.gz}
failonerror=false /
+copy todir=${tomcat.build}/bin file=${tomcat-native.tar.gz} /
+
!-- copy todir=${tomcat.build}/common/lib file=${ant.jar}/
copy todir=${tomcat.build}/common/lib file=${ant-launcher.jar}/ --
copy todir=${tomcat.build}/common/lib
file=${jasper-compiler-jdt.jar}/
@@ -1891,6 +1893,12 @@
param name=destfile value=${saxpath.jar}/
/antcall
+antcall target=downloadfile
+ param name=sourcefile value=${tomcat-native.loc}/
+ param name=destfile value=${tomcat-native.tar.gz}/
+ param name=destdir value=${tomcat-native.home}/
+/antcall
+
!-- Build the dependencies that are not yet released --
antcall target=build-depends/
1.152 +8 -1 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- build.properties.default 27 Jul 2005 22:16:25 - 1.151
+++ build.properties.default 30 Jul 2005 21:22:24 - 1.152
@@ -145,6 +145,13 @@
jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.1.0.jar
jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1-200506271435/eclipse-JDT-3.1.zip
+
+# - Tomcat native library -
+tomcat-native.home=${base.path}/tomcat-native-1.0
+tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
+tomcat-native.loc=${base-jakarta.loc}/tomcat-connectors/jni/tomcat-native.tar.gz
+
+
# --
# CORE OPTIONAL LIBRARIES
# --
1.347 +13 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- changelog.xml 28 Jul 2005 14:01:49 - 1.346
+++ changelog.xml 30 Jul 2005 21:22:25 - 1.347
@@ -32,6 +32,12 @@
update
Update to Xerces 2.7.1 (remm)
/update
+ add
+Add ready to build bin/tomcat-native.tar.gz for the APR JNI wrapper
library (remm)
+ /add
+ fix
+bug35930/bug: Bad logging config used by the Tomcat Windows
service (remm)
+ /fix
/changelog
/subsection
@@ -72,6 +78,13 @@
fix
Fix output buffering for APR AJP implementation. (remm)
/fix
+ fix
+bug35941/bug: Fix getRemoteAddr for APR AJP implementation.
(remm)
+ /fix
+ fix
+bug35942/bug: Fix NPE retriving cipher suite attribute when no
certificate
+was submitted (for example with no SSL). (remm)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/28 07:01:50 Modified:.tomcat.nsi webapps/docs changelog.xml Log: Bugzilla 33267: http://issues.apache.org/bugzilla/show_bug.cgi?id=33267 Revision ChangesPath 1.75 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- tomcat.nsi28 Apr 2005 12:32:05 - 1.74 +++ tomcat.nsi28 Jul 2005 14:01:49 - 1.75 @@ -162,7 +162,7 @@ InstallRetry: ClearErrors - nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //IS//Tomcat5 --DisplayName Apache Tomcat --Description Apache Tomcat @VERSION@ Server - http://jakarta.apache.org/tomcat/; --LogPath $INSTDIR\logs --Install $INSTDIR\bin\tomcat5.exe --Jvm $2' + nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //IS//Tomcat5 --DisplayName Apache Tomcat --Description Apache Tomcat @VERSION@ Server - http://jakarta.apache.org/tomcat/; --LogPath $INSTDIR\logs --Install $INSTDIR\bin\tomcat5.exe --Jvm $2--StartPath $INSTDIR --StopPath $INSTDIR' Pop $0 StrCmp $0 0 InstallOk MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \ 1.346 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.345 retrieving revision 1.346 diff -u -r1.345 -r1.346 --- changelog.xml 27 Jul 2005 19:39:17 - 1.345 +++ changelog.xml 28 Jul 2005 14:01:49 - 1.346 @@ -49,6 +49,10 @@ fix bug35865/bug: setclasspath.sh cannot be excutive under cygwin (funkman) /fix + fix +bug33267/bug: Set working path in service installer, as suggested by Dominik + Drzewiecki. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/07/27 04:26:32 Modified:webapps/docs changelog.xml Log: - Fix version number. Revision ChangesPath 1.344 +1 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.343 retrieving revision 1.344 diff -u -r1.343 -r1.344 --- changelog.xml 27 Jul 2005 11:06:19 - 1.343 +++ changelog.xml 27 Jul 2005 11:26:32 - 1.344 @@ -30,7 +30,7 @@ subsection name=General changelog update -Update to Xerces 1.7.1 (remm) +Update to Xerces 2.7.1 (remm) /update /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/07/27 12:39:18 Modified:webapps/docs changelog.xml Log: - Update changelog. Revision ChangesPath 1.345 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.344 retrieving revision 1.345 diff -u -r1.344 -r1.345 --- changelog.xml 27 Jul 2005 11:26:32 - 1.344 +++ changelog.xml 27 Jul 2005 19:39:17 - 1.345 @@ -65,6 +65,9 @@ fix Check filename sendfile attribute only if sendfile is enabled. (remm) /fix + fix +Fix output buffering for APR AJP implementation. (remm) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/07/26 05:45:22
Modified:catalina/src/share/org/apache/catalina/valves ValveBase.java
ErrorReportValve.java mbeans-descriptors.xml
catalina build.xml
webapps/docs changelog.xml
Added: catalina/src/share/org/apache/catalina/valves
SemaphoreValve.java
Log:
- Add a simple valve for concurrency control, with a conditional compilation
flag.
- At the moment, this will not be shipped in the release (needs Java 5).
- Update changelog.
Revision ChangesPath
1.19 +15 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java
Index: ValveBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ValveBase.java2 Mar 2005 20:19:58 - 1.18
+++ ValveBase.java26 Jul 2005 12:45:22 - 1.19
@@ -178,6 +178,20 @@
public abstract void invoke(Request request, Response response)
throws IOException, ServletException;
+
+/**
+ * Return a String rendering of this object.
+ */
+public String toString() {
+StringBuffer sb = new StringBuffer(this.getClass().getName());
+sb.append([);
+if (container != null)
+sb.append(container.getName());
+sb.append(]);
+return (sb.toString());
+}
+
+
// JMX and Registration
protected String domain;
protected ObjectName oname;
1.26 +1 -14
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ErrorReportValve.java 21 Jan 2005 13:11:02 - 1.25
+++ ErrorReportValve.java 26 Jul 2005 12:45:22 - 1.26
@@ -141,19 +141,6 @@
}
-/**
- * Return a String rendering of this object.
- */
-public String toString() {
-
-StringBuffer sb = new StringBuffer(ErrorReportValve[);
-sb.append(container.getName());
-sb.append(]);
-return (sb.toString());
-
-}
-
-
// -- Protected
Methods
1.10 +25 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mbeans-descriptors.xml19 Nov 2004 20:06:07 - 1.9
+++ mbeans-descriptors.xml26 Jul 2005 12:45:22 - 1.10
@@ -234,6 +234,31 @@
type=java.lang.String/
/mbean
+ mbean name=SemaphoreValve
+ description=Valve that does concurrency control
+ domain=Catalina
+ group=Valve
+ type=org.apache.catalina.valves.SemaphoreValve
+
+attribute name=className
+ description=Fully qualified class name of the managed object
+ type=java.lang.String
+ writeable=false/
+
+attribute name=containerName
+ description=Object name of the container
+ type=javax.management.ObjectName/
+
+attribute name=concurrency
+ description=Desired concurrency level
+ type=int/
+
+attribute name=fairness
+ description=Use a fair semaphore
+ type=boolean/
+
+ /mbean
+
mbean name=RemoteAddrValve
description=Concrete implementation of RequestFilterValve that
filters based on the string representation of the remote client's IP address
domain=Catalina
1.1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/SemaphoreValve.java
Index: SemaphoreValve.java
===
/*
* Copyright 1999-2001,2005 The Apache Software Foundation.
*
* Licensed 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
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/07/26 09:13:33
Modified:jk/java/org/apache/coyote/ajp AjpAprProcessor.java
AjpAprProtocol.java
webapps/docs changelog.xml
Log:
- Add tomcatAuthentication to the protocol handler, so that it can actually
be configured.
- Remove all other useless attributes (which came along from the HTTP
cut paste).
Revision ChangesPath
1.10 +7 -53
jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Index: AjpAprProcessor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AjpAprProcessor.java 23 Jun 2005 17:22:13 - 1.9
+++ AjpAprProcessor.java 26 Jul 2005 16:13:33 - 1.10
@@ -79,7 +79,7 @@
// ---
Constructors
-public AjpAprProcessor(int headerBufferSize, AprEndpoint endpoint) {
+public AjpAprProcessor(AprEndpoint endpoint) {
this.endpoint = endpoint;
@@ -180,12 +180,6 @@
/**
- * Use Tomcat authentication ?
- */
-protected boolean tomcatAuthentication = true;
-
-
-/**
* Socket associated with the current connection.
*/
protected long socket;
@@ -228,12 +222,6 @@
/**
- * Max post size.
- */
-protected int maxPostSize = 2 * 1024 * 1024;
-
-
-/**
* Host name (used to avoid useless B2C conversion on the host name).
*/
protected char[] hostNameC = new char[0];
@@ -246,12 +234,6 @@
/**
- * Allow a customized the server header for the tin-foil hat folks.
- */
-protected String server = null;
-
-
-/**
* The socket timeout used when reading the first block of the request
* header.
*/
@@ -371,43 +353,15 @@
// -
Properties
-// - Public
Methods
-
-
-/**
- * Set the maximum size of a POST which will be buffered in SSL mode.
- */
-public void setMaxPostSize(int mps) {
-maxPostSize = mps;
-}
-
-
-/**
- * Return the maximum size of a POST which will be buffered in SSL mode.
- */
-public int getMaxPostSize() {
-return maxPostSize;
-}
-
-
/**
- * Set the server header name.
+ * Use Tomcat authentication ?
*/
-public void setServer( String server ) {
-if (server==null || server.equals()) {
-this.server = null;
-} else {
-this.server = server;
-}
-}
-
+protected boolean tomcatAuthentication = true;
+public boolean getTomcatAuthentication() { return tomcatAuthentication; }
+public void setTomcatAuthentication(boolean tomcatAuthentication) {
this.tomcatAuthentication = tomcatAuthentication; }
-/**
- * Get the server header name.
- */
-public String getServer() {
-return server;
-}
+
+// - Public
Methods
/** Get the request associated with this processor.
1.6 +9 -215
jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProtocol.java
Index: AjpAprProtocol.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProtocol.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AjpAprProtocol.java 27 Jun 2005 13:44:04 - 1.5
+++ AjpAprProtocol.java 26 Jul 2005 16:13:33 - 1.6
@@ -33,7 +33,6 @@
import org.apache.coyote.RequestGroupInfo;
import org.apache.coyote.RequestInfo;
import org.apache.tomcat.util.net.AprEndpoint;
-import org.apache.tomcat.util.net.ServerSocketFactory;
import org.apache.tomcat.util.net.AprEndpoint.Handler;
import org.apache.tomcat.util.res.StringManager;
@@ -195,26 +194,11 @@
protected Hashtable attributes = new Hashtable();
private int timeout = 30; // 5 minutes as in Apache HTTPD server
-private int maxPostSize = 2 * 1024 * 1024;
-private int maxHttpHeaderSize = 4 * 1024;
-private String reportedname;
-private int socketCloseDelay=-1;
-private boolean disableUploadTimeout = true;
-private int socketBuffer = 9000;
+protected boolean tomcatAuthentication = true;
+
private Adapter adapter;
private AjpConnectionHandler cHandler;
-/**
- * Compression value.
- */
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/07/26 09:39:14
Modified:http11/src/java/org/apache/coyote/http11
Http11AprProcessor.java
webapps/docs changelog.xml
Log:
- Small tweak: don't check the attribute if sendfile is disabled.
Revision ChangesPath
1.27 +14 -12
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Index: Http11AprProcessor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Http11AprProcessor.java 25 Jul 2005 15:32:48 - 1.26
+++ Http11AprProcessor.java 26 Jul 2005 16:39:14 - 1.27
@@ -1553,18 +1553,20 @@
}
// Sendfile support
-String fileName = (String)
request.getAttribute(org.apache.tomcat.sendfile.filename);
-if (fileName != null) {
-// No entity body sent here
-outputBuffer.addActiveFilter
-(outputFilters[Constants.VOID_FILTER]);
-contentDelimitation = true;
-sendfileData = new AprEndpoint.SendfileData();
-sendfileData.fileName = fileName;
-sendfileData.start =
-((Long)
request.getAttribute(org.apache.tomcat.sendfile.start)).longValue();
-sendfileData.end =
-((Long)
request.getAttribute(org.apache.tomcat.sendfile.end)).longValue();
+if (endpoint.getUseSendfile()) {
+String fileName = (String)
request.getAttribute(org.apache.tomcat.sendfile.filename);
+if (fileName != null) {
+// No entity body sent here
+outputBuffer.addActiveFilter
+(outputFilters[Constants.VOID_FILTER]);
+contentDelimitation = true;
+sendfileData = new AprEndpoint.SendfileData();
+sendfileData.fileName = fileName;
+sendfileData.start =
+((Long)
request.getAttribute(org.apache.tomcat.sendfile.start)).longValue();
+sendfileData.end =
+((Long)
request.getAttribute(org.apache.tomcat.sendfile.end)).longValue();
+}
}
// Check for compression
1.340 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- changelog.xml 26 Jul 2005 16:13:33 - 1.339
+++ changelog.xml 26 Jul 2005 16:39:14 - 1.340
@@ -55,6 +55,9 @@
fix
Add missing tomcatAuthentication attribute to the AJP APR
implementation. (remm)
/fix
+ fix
+Check filename sendfile attribute only if sendfile is enabled. (remm)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Tuesday, July 26, 2005 5:45 AM
Subject: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/07/26 05:45:22
Modified:catalina/src/share/org/apache/catalina/valves
ValveBase.java
ErrorReportValve.java mbeans-descriptors.xml
catalina build.xml
webapps/docs changelog.xml
Added: catalina/src/share/org/apache/catalina/valves
SemaphoreValve.java
Log:
- Add a simple valve for concurrency control, with a conditional
compilation
flag.
- At the moment, this will not be shipped in the release (needs Java 5).
- Update changelog.
snip/
/**
* Create a new StandardHost component with the default basic Valve.
*/
public SemaphoreValve() {
semaphore = new Semaphore(concurrency, fairness);
}
This happens before the setters get called (so only the default values are
possible). You probably want to implement Lifecycle and create the
Semaphore in a Lifecycle method.
This message is intended only for the use of the person(s) listed above as the
intended recipient(s), and may contain information that is PRIVILEGED and
CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or
distribute this message or any attachment. If you received this communication
in error, please notify us immediately by e-mail and then delete all copies of
this message and any attachments.
In addition you should be aware that ordinary (unencrypted) e-mail sent through
the Internet is not secure. Do not send confidential or sensitive information,
such as social security numbers, account numbers, personal identification
numbers and passwords, to us via ordinary (unencrypted) e-mail.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/26 17:04:13
Modified:catalina build.xml
webapps/docs changelog.xml
Log:
Minimal, quick, ugly fix for Bugzilla 35880:
http://issues.apache.org/bugzilla/show_bug.cgi?id=35880
Revision ChangesPath
1.84 +16 -0 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- build.xml 26 Jul 2005 12:45:22 - 1.83
+++ build.xml 27 Jul 2005 00:04:12 - 1.84
@@ -741,6 +741,18 @@
target name=javadoc unless=docs.uptodate
delete dir=${catalina.build}/javadoc/
mkdir dir=${catalina.build}/javadoc/
+
+!-- To fix Bugzilla 35880, we need to ensure files that use J2SE 5.0
+ syntax are not JavaDoc'ed. Even though no other target uses
+ javadoc.sourcepath and I could rewrite the javadoc target below,
+ that might impact users who use javadoc.sourcepath in their own
+ build scripts. Accordingly, let's try this ugly temporary
+ fix. When we start building Tomcat with J2SE 5.0, we can remove
+ this ugliness.
+--
+move
file=${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java
+
tofile=${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.temp
/
+
javadoc packagenames=org.apache.*
classpathref=catalina.classpath
sourcepathref=javadoc.sourcepath
@@ -755,7 +767,11 @@
excludepackage name=org.apache.coyote.tomcat3 /
excludepackage name=org.apache.coyote.tomcat4 /
excludepackage name=org.apache.jk.apr /
+
/javadoc
+
+move
file=${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.temp
+
tofile=${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java
/
/target
1.341 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- changelog.xml 26 Jul 2005 16:39:14 - 1.340
+++ changelog.xml 27 Jul 2005 00:04:13 - 1.341
@@ -42,6 +42,10 @@
is not built for Java 5, the valve will have to be compiled from the
sources
using Java 5 (remm)
/add
+ fix
+bug35880/bug: Ignore JSSE15SocketFactory when generating
JavaDoc, as it breaks
+ the JDK 1.4 JavaDoc tool. (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/22 05:52:32
Modified:webapps/ROOT index.jsp
webapps/docs changelog.xml
Log:
Bugzilla 34931: http://issues.apache.org/bugzilla/show_bug.cgi?id=34931
Revision ChangesPath
1.18 +218 -192 jakarta-tomcat-catalina/webapps/ROOT/index.jsp
Index: index.jsp
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/ROOT/index.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- index.jsp 15 Jan 2005 18:18:31 - 1.17
+++ index.jsp 22 Jul 2005 12:52:31 - 1.18
@@ -1,192 +1,218 @@
-!doctype html public -//w3c//dtd html 4.0 transitional//en
http://www.w3.org/TR/REC-html40/strict.dtd;
-%@ page session=false %
-html
-head
-meta http-equiv=Content-Type content=text/html; charset=iso-8859-1
-title%= application.getServerInfo() %/title
-style type=text/css
- !--
-body {
-color: #00;
-background-color: #FF;
-font-family: Arial, Times New Roman, Times;
-font-size: 16px;
-}
-
-A:link {
-color: blue
-}
-
-A:visited {
-color: blue
-}
-
-td {
-color: #00;
-font-family: Arial, Times New Roman, Times;
-font-size: 16px;
-}
-
-.code {
-color: #00;
-font-family: Courier New, Courier;
-font-size: 16px;
-}
- --
-/style
-/head
-
-body
-
-!-- Header --
-table width=100%
-tr
-td align=left width=130a
href=http://jakarta.apache.org/tomcat/index.html;img src=tomcat.gif
height=92 width=130 border=0 alt=The Mighty Tomcat - MEOW!/td
-td align=left valign=top
-table
-trtd align=left valign=topb%=
application.getServerInfo() %/b/td/tr
-/table
-/td
-td align=righta href=http://jakarta.apache.org/;img
src=jakarta-banner.gif height=48 width=505 border=0 alt=The Jakarta
Project/a/td
-/tr
-/table
-
-br
-
-table
-tr
-
-!-- Table of Contents --
-td valign=top
-table width=100% border=1 cellspacing=0 cellpadding=3
bordercolor=#00
-tr
-td bgcolor=#D2A41C bordercolor=#00 align=left
nowrap
-font face=Verdana
size=+1iAdministration/inbsp;nbsp;nbsp;nbsp;nbsp;nbsp;/font
-/td
-/tr
-tr
-td bgcolor=#FFDC75 bordercolor=#00 nowrap
-a href=manager/statusStatus/abr
-a href=adminTomcat Administration/abr
-a href=manager/htmlTomcat Manager/abr
-nbsp;
-/td
-/tr
-/table
-br
-table width=100% border=1 cellspacing=0 cellpadding=3
bordercolor=#00
-tr
-td bgcolor=#D2A41C bordercolor=#00 align=left
nowrap
-font face=Verdana
size=+1iDocumentation/inbsp;nbsp;nbsp;nbsp;nbsp;nbsp;/font
-/td
-/tr
-tr
-td bgcolor=#FFDC75 bordercolor=#00 nowrap
-a href=RELEASE-NOTES.txtRelease Notes/abr
-a href=tomcat-docs/changelog.htmlChange
Log/abr
-a href=tomcat-docsTomcat Documentation/abr
-nbsp;
-/td
-/tr
-/table
-br
-table width=100% border=1 cellspacing=0 cellpadding=3
bordercolor=#00
-tr
-td bgcolor=#D2A41C bordercolor=#00 align=left
nowrap
-font face=Verdana size=+1iTomcat
Online/inbsp;nbsp;nbsp;nbsp;nbsp;nbsp;/font
-/td
-/tr
-tr
-td bgcolor=#FFDC75 bordercolor=#00 nowrap
-a href=http://jakarta.apache.org/tomcat/;Home
Page/abr
-a
href=http://jakarta.apache.org/tomcat/bugreport.html;Bug Database/abr
-a
href=http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMEDamp;bug_status=NEWamp;bug_status=ASSIGNEDamp;bug_status=REOPENEDamp;bug_status=RESOLVEDamp;resolution=LATERamp;resolution=REMINDamp;resolution=---amp;bugidtype=includeamp;product=Tomcat+5amp;cmdtype=doitamp;order=Importance;Open
Bugs/abr
-a
href=http://nagoya.apache.org/eyebrowse/SummarizeList?listId=88;Users Mailing
List/abr
-a
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/22 06:47:53
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
SaveJDBCRealmAction.java
webapps/docs changelog.xml
Log:
Bugzilla 35758: http://issues.apache.org/bugzilla/show_bug.cgi?id=35758
Revision ChangesPath
1.13 +47 -21
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
Index: SaveJDBCRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SaveJDBCRealmAction.java 18 Oct 2004 06:37:54 - 1.12
+++ SaveJDBCRealmAction.java 22 Jul 2005 13:47:53 - 1.13
@@ -228,49 +228,51 @@
// Perform attribute updates as requested
String attribute = null;
+String value = null;
+
try {
ObjectName roname = new ObjectName(rObjectName);
attribute = digest;
-mBServer.setAttribute(roname,
- new Attribute(digest,
rform.getDigest()));
+value = rform.getDigest();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = driverName;
-mBServer.setAttribute(roname,
- new Attribute(driverName,
rform.getDriver()));
+value = rform.getDriver();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = roleNameCol;
-mBServer.setAttribute(roname,
- new Attribute(roleNameCol,
rform.getRoleNameCol()));
+value = rform.getRoleNameCol();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = userNameCol;
-mBServer.setAttribute(roname,
- new Attribute(userNameCol,
rform.getUserNameCol()));
+value = rform.getUserNameCol();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = userCredCol;
-mBServer.setAttribute(roname,
- new Attribute(userCredCol,
rform.getPasswordCol()));
+value = rform.getPasswordCol();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = userTable;
-mBServer.setAttribute(roname,
- new Attribute(userTable,
rform.getUserTable()));
+value = rform.getUserTable();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = userRoleTable;
-mBServer.setAttribute(roname,
- new Attribute(userRoleTable,
rform.getRoleTable()));
+value = rform.getRoleTable();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = connectionName;
-mBServer.setAttribute(roname,
- new Attribute(connectionName,
rform.getConnectionName()));
+value = rform.getConnectionName();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = connectionURL;
-mBServer.setAttribute(roname,
- new Attribute(connectionURL,
rform.getConnectionURL()));
+value = rform.getConnectionURL();
+setAttributeIfPresent(mBServer, roname, attribute, value);
attribute = connectionPassword;
-mBServer.setAttribute(roname,
- new Attribute(connectionPassword,
rform.getConnectionPassword()));
+value = rform.getConnectionPassword();
+setAttributeIfPresent(mBServer, roname, attribute, value);
} catch (Exception e) {
@@ -289,5 +291,29 @@
return (mapping.findForward(Save Successful));
}
+
+/**
+ * Sets the given attribute to the given value
+ * in the given server's object name, if the value
+ * is not null or empty.
+ *
+ * @param theServer The server
+ * @param roname The object name
+ * @param attribute The attribute name
+ * @param value The attribute value
+ * @throws JMException If a JMX error occurs
+ */
+protected void setAttributeIfPresent(MBeanServer mBServer, ObjectName
roname, String attribute, String value)
+throws JMException {
+
+if((mBServer == null) || (roname == null) || (attribute == null)) {
+throw new
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/22 08:40:31
Modified:webapps/admin banner.jsp
webapps/docs changelog.xml
Log:
Bugzilla 34250: http://issues.apache.org/bugzilla/show_bug.cgi?id=34250
Revision ChangesPath
1.6 +1 -1 jakarta-tomcat-catalina/webapps/admin/banner.jsp
Index: banner.jsp
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/banner.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- banner.jsp4 Mar 2005 05:42:42 - 1.5
+++ banner.jsp22 Jul 2005 15:40:30 - 1.6
@@ -22,7 +22,7 @@
/td
form method='post'
action='%=request.getContextPath()%/commitChanges.do' target='_self'
td align=right valign=middle
-html:submit
+html:submit onclick=if(confirm('Are you sure? Committing changes
will restart modified web applications.')) { return true; } else { return
false; }
bean:message key=button.commit/
/html:submit
/td
1.335 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- changelog.xml 22 Jul 2005 14:46:24 - 1.334
+++ changelog.xml 22 Jul 2005 15:40:30 - 1.335
@@ -418,6 +418,9 @@
fix
bug35758/bug: Admin webapp mishandling digest attribute of
JDBCDataSourceRealm. (yoavs)
/fix
+ add
+bug34250/bug: Admin webapp Commit Changes button now asks for
confirmation. (yoavs)
+ /add
/changelog
/subsection
/section
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/21 12:57:17
Modified:catalina/src/conf catalina.properties
catalina/src/share/org/apache/catalina/startup
catalina.properties
webapps/docs changelog.xml
Log:
Bugzilla 34746.
Revision ChangesPath
1.13 +2 -0
jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
Index: catalina.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- catalina.properties 20 Oct 2004 12:28:58 - 1.12
+++ catalina.properties 21 Jul 2005 19:57:17 - 1.13
@@ -54,6 +54,8 @@
# foo/*.jar: Add all the JARs of the specified folder as class
# repositories
# foo/bar.jar: Add bar.jar as a class repository
+# Please note that foe individual jar files, e.g. bar.jar, you need the URL
form
+# starting with file:.
shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
#
1.8 +2 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/catalina.properties
Index: catalina.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/catalina.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- catalina.properties 20 Oct 2004 12:28:57 - 1.7
+++ catalina.properties 21 Jul 2005 19:57:17 - 1.8
@@ -54,6 +54,8 @@
# foo/*.jar: Add all the JARs of the specified folder as class
# repositories
# foo/bar.jar: Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
#
1.325 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- changelog.xml 21 Jul 2005 04:12:33 - 1.324
+++ changelog.xml 21 Jul 2005 19:57:17 - 1.325
@@ -78,6 +78,9 @@
Update JULI to provide support for taking over java.util.logging
bootstrap configuration,
and move the default properties file to
${catalina.base}/conf/logging.properties (remm)
/update
+ fix
+ bug34746/bug: Updated catalina.properties instructions per Bill
Edwards' suggestion. (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/21 13:14:57
Modified:catalina/src/share/org/apache/catalina/deploy
SecurityCollection.java
webapps/docs changelog.xml
Log:
Bugzilla 34805: http://issues.apache.org/bugzilla/show_bug.cgi?id=34805
Revision ChangesPath
1.5 +21 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/SecurityCollection.java
Index: SecurityCollection.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/SecurityCollection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SecurityCollection.java 13 May 2004 20:40:49 - 1.4
+++ SecurityCollection.java 21 Jul 2005 20:14:57 - 1.5
@@ -19,6 +19,10 @@
import org.apache.catalina.util.RequestUtil;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.Serializable;
@@ -39,6 +43,8 @@
public class SecurityCollection implements Serializable {
+private static Log log = LogFactory.getLog(SecurityCollection.class);
+
// ---
Constructors
@@ -180,10 +186,23 @@
if (pattern == null)
return;
+
+// Bugzilla 34805: add friendly warning.
+if(pattern.endsWith(*)) {
+ if (pattern.charAt(pattern.length()-1) != '/') {
+if (log.isDebugEnabled()) {
+ log.warn(Suspicious url pattern: \ + pattern + \ +
+- see
http://java.sun.com/aboutJava/communityprocess/first/jsr053/servlet23_PFD.pdf; +
+ section 11.2 );
+}
+ }
+}
+
pattern = RequestUtil.URLDecode(pattern);
String results[] = new String[patterns.length + 1];
-for (int i = 0; i patterns.length; i++)
+for (int i = 0; i patterns.length; i++) {
results[i] = patterns[i];
+}
results[patterns.length] = pattern;
patterns = results;
1.326 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- changelog.xml 21 Jul 2005 19:57:17 - 1.325
+++ changelog.xml 21 Jul 2005 20:14:57 - 1.326
@@ -179,6 +179,9 @@
bug35769/bug: Correct implementation of
javax.naming.Context.composeName( Name, Name)
in multiple places. Patch provided by Laurent Simon. (markt)
/fix
+ add
+bug34805/bug: Add warning for suspicious security patterns, as
suggested by Ralf Hauser. (yoavs)
+ /add
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/07/21 14:40:56 Modified:catalina/src/share/org/apache/catalina/startup ContextConfig.java webapps/docs changelog.xml Log: Bugzilla 35819: http://issues.apache.org/bugzilla/show_bug.cgi?id=35819 Revision ChangesPath 1.65 +4 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java Index: ContextConfig.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- ContextConfig.java16 Mar 2005 11:37:43 - 1.64 +++ ContextConfig.java21 Jul 2005 21:40:56 - 1.65 @@ -1240,7 +1240,9 @@ // Called from StandardContext.destroy() if (log.isDebugEnabled()) log.debug(sm.getString(contextConfig.destroy)); -String workDir = ((StandardContext) context).getWorkDir(); + +// Changed to getWorkPath per Bugzilla 35819. +String workDir = ((StandardContext) context).getWorkPath(); if (workDir != null) ExpandWar.delete(new File(workDir)); } 1.330 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- changelog.xml 21 Jul 2005 21:23:47 - 1.329 +++ changelog.xml 21 Jul 2005 21:40:56 - 1.330 @@ -182,6 +182,10 @@ add bug34805/bug: Add warning for suspicious security patterns, as suggested by Ralf Hauser. (yoavs) /add + fix +bug35819/bug: Use getWorkPath for deleting work directory on context destroy, as suggested + by Rob Steele. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/07/20 02:45:14 Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java webapps/docs changelog.xml Log: - Remove useless import. - Add SSL to the changelog. Revision ChangesPath 1.68 +0 -1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java Index: AprEndpoint.java === RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- AprEndpoint.java 16 Jul 2005 12:22:42 - 1.67 +++ AprEndpoint.java 20 Jul 2005 09:45:14 - 1.68 @@ -16,7 +16,6 @@ package org.apache.tomcat.util.net; -import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; import java.util.HashMap; 1.322 +1 -4 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.321 retrieving revision 1.322 diff -u -r1.321 -r1.322 --- changelog.xml 3 Jul 2005 16:41:23 - 1.321 +++ changelog.xml 20 Jul 2005 09:45:14 - 1.322 @@ -147,9 +147,6 @@ fix bug34578/bug: Updated JNDIRealm comment. (yoavs) /fix - add -[Placeholder for HttpAprConnector] - /add fix bug34273/bug: Better Bootstrap warning message. [Path from Ralf Hauser] (yoavs) /fix @@ -187,7 +184,7 @@ Add some Mbean attributes and operations to ChannelSocket (pero) /update add -Apache Portable Runtime based HTTP/1.1 protocol handler (remm) +Apache Portable Runtime based HTTP/1.1 protocol handler, with SSL support (remm) /add add Add support for simple file-based CRLs under JDK 1.5 (billbarker) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
markt 2005/07/20 14:28:31 Modified:webapps/docs changelog.xml Log: Update changelog for bug 35769 fix. Revision ChangesPath 1.323 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.322 retrieving revision 1.323 diff -u -r1.322 -r1.323 --- changelog.xml 20 Jul 2005 09:45:14 - 1.322 +++ changelog.xml 20 Jul 2005 21:28:31 - 1.323 @@ -172,6 +172,10 @@ Fix handling of symbolic links when the DefaultServlet is generating directory listings. (markt) /fix + fix +bug35769/bug: Correct implementation of javax.naming.Context.composeName( Name, Name) +in multiple places. Patch provided by Laurent Simon. (markt) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
billbarker2005/07/20 21:12:33 Modified:webapps/docs changelog.xml Log: Doc changes Revision ChangesPath 1.324 +7 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.323 retrieving revision 1.324 diff -u -r1.323 -r1.324 --- changelog.xml 20 Jul 2005 21:28:31 - 1.323 +++ changelog.xml 21 Jul 2005 04:12:33 - 1.324 @@ -211,6 +211,9 @@ add Apache Portable Runtime based AJP/1.3 protocol handler (remm) /add + fix +Delay reading the inital request body packet by default for the AJP/1.3 Java connector. (billbarker) + /fix /changelog /subsection @@ -236,6 +239,10 @@ fix bug34465/bug: Jspc failure if there is no web.xml (remm) /fix + fix +bug35696/bug: Make certain that release is called for custom tags + when tag-pooling is disabled. (billbarker) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/06/30 06:08:14 Modified:webapps/docs changelog.xml Log: Support Cluster as Engine Element Revision ChangesPath 1.319 +5 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.318 retrieving revision 1.319 diff -u -r1.318 -r1.319 --- changelog.xml 27 Jun 2005 21:54:35 - 1.318 +++ changelog.xml 30 Jun 2005 13:08:14 - 1.319 @@ -59,6 +59,7 @@ /update update Refactoring, redesign and extend the cluster module + - Cluster can be configured as subelement from Engine and Host. - Optimized performance and reduce memory usage - Better JMX support - add a lot of JMX stats attribute for better monitoring @@ -235,7 +236,10 @@ subsection name=Cluster changelog add -Add single cluster default configuration element - discussed at JAX 2005 conference Cluster Workshop (pero) +Add that cluster can configure as Engine and Host element. (pero) + /add + add +Add single cluster default configuration element - discussed at JAX 2005 conference Cluster Workshop. (pero) /add fix Fix resend GET_ALL_SESSIONS when wait ACK failed at receiver side (pero) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
markt 2005/06/27 14:54:35
Modified:catalina/src/share/org/apache/naming/resources
FileDirContext.java
webapps/docs changelog.xml
Log:
DefaultServlet was showing symbolic links in directory listings with
- no last modified date for files or dirs
- no size for files
- files were displayed as directories.
Revision ChangesPath
1.9 +5 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/FileDirContext.java
Index: FileDirContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileDirContext.java 20 Apr 2005 16:13:23 - 1.8
+++ FileDirContext.java 27 Jun 2005 21:54:35 - 1.9
@@ -216,6 +216,8 @@
if (file.isDirectory()) {
FileDirContext tempContext = new FileDirContext(env);
tempContext.setDocBase(file.getPath());
+tempContext.setAllowLinking(getAllowLinking());
+tempContext.setCaseSensitive(isCaseSensitive());
result = tempContext;
} else {
result = new FileResource(file);
@@ -903,6 +905,8 @@
if (currentFile.isDirectory()) {
FileDirContext tempContext = new FileDirContext(env);
tempContext.setDocBase(file.getPath());
+tempContext.setAllowLinking(getAllowLinking());
+tempContext.setCaseSensitive(isCaseSensitive());
object = tempContext;
} else {
object = new FileResource(currentFile);
1.318 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- changelog.xml 26 Jun 2005 21:23:35 - 1.317
+++ changelog.xml 27 Jun 2005 21:54:35 - 1.318
@@ -170,6 +170,10 @@
bug34840/bug: Better handling of external WARs redeployment, and
ignore docBase specified
in context file if within the Host appBase (remm)
/fix
+ fix
+Fix handling of symbolic links when the DefaultServlet is generating
directory
+listings.
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml cluster-howto.xml
pero2005/06/26 14:23:36 Modified:webapps/docs changelog.xml cluster-howto.xml Log: add standalone cluster config support better GET_ALLSESSION support config resend and compress from message creator update cluster howto Revision ChangesPath 1.317 +25 -4 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- changelog.xml 24 Jun 2005 11:55:02 - 1.316 +++ changelog.xml 26 Jun 2005 21:23:35 - 1.317 @@ -62,12 +62,13 @@ - Optimized performance and reduce memory usage - Better JMX support - add a lot of JMX stats attribute for better monitoring + - add a single element default cluster configuration - more config options LifecycleListener ClusterListener - more than one Cluster Valves + more than one cluster valves - better subclass support - - change a lot of existing Cluster API's (pero) + - change a lot of existing cluster API's (pero) /update add Add Apache Portable Runtime JNI wrapper and helper API (mturk) @@ -230,6 +231,26 @@ subsection name=Cluster changelog add +Add single cluster default configuration element - discussed at JAX 2005 conference Cluster Workshop (pero) + /add + fix +Fix resend GET_ALL_SESSIONS when wait ACK failed at receiver side (pero) + /fix + fix +ClusterValve now remove from container element when cluster stops and added with next start again. (pero) + /fix + add +Set timestamp only at first time inside SessionMessageImpl (pero) + /add + add + Set timestamp from findsessions method call, when handling GET_ALL_SESSION + to all SEND_SESSION_DATA and TRANSFER complete messages. (pero + /add + add + Drop all received message inside GET_ALL_SESSION message queue before state + transfer message timestamp. (pero) + /add + add Cluster ping now transfer cluster domain information and DeltaManager only send and receive message from same domain members (pero) /add @@ -321,7 +342,7 @@ Also extract ClusterReceiverBase superclass for SocketReplicationListener and ReplicationListener (pero) /add update -Add and update some API documentation (pero) +Add and update some API and the a href=cluster-howto.htmlcluster howto documentation/a (pero) /update update Refactor ReplicationValve for better understanding and small optimization (pero) @@ -333,7 +354,7 @@ Fix ant build.xml to direct compile at cluster module directory (pero) /fix fix -Fix some I18N messages (pero) +Fix some I18N messages, but a lot of work is waiting for fix (pero) /fix add Add ReplicationValve Mbeans stats attribute getter and resetStatistics operation (pero) 1.9 +210 -26 jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml Index: cluster-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cluster-howto.xml 9 Jun 2005 20:42:55 - 1.8 +++ cluster-howto.xml 26 Jun 2005 21:23:36 - 1.9 @@ -17,7 +17,7 @@ section name=Quick Start -pTo run session replication in your Tomcat 5 container, the following steps +pTo run session replication in your Tomcat 5.5 container, the following steps should be completed:/p ul liAll your session attributes must implement codejava.io.Serializable/code/li @@ -28,6 +28,7 @@ liMake sure your codeweb.xml/code has the codelt;distributable/gt;/code element or set at your codelt;Context distributable=true /gt;/code/li liMake sure that jvmRoute attribute is set at your Engine codelt;Engine name=Catalina jvmRoute=node1 gt;/code/li +liMake sure that all nodes have the same time and sync with NTP service!/li /ul pLoad balancing can be achieved through many techniques, as seen in the a href=balancer-howto.htmlLoad Balancing/a chapter./p @@ -51,7 +52,7 @@ This is an algorithm that is only efficient when the clusters are small. For large clusters, the next release will support a primary-secondary session replication where the session will only be stored at one or maybe two backup servers.
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml developers.xml monitoring.xml
pero2005/06/24 04:55:02 Modified:webapps/docs changelog.xml developers.xml monitoring.xml Log: Add new jmx remote ant support - documentation Revision ChangesPath 1.316 +10 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.315 retrieving revision 1.316 diff -u -r1.315 -r1.316 --- changelog.xml 9 Jun 2005 20:38:30 - 1.315 +++ changelog.xml 24 Jun 2005 11:55:02 - 1.316 @@ -29,6 +29,15 @@ section name=Tomcat 5.5.10 (yoavs) subsection name=General changelog + add + Add JMX remote ant task to control tomcat MBeanserver via ant scripts. + Ant lib is included at server/lib/catalina-ant-jmx.jar and documentation + is added to a href=monitoring.htmlMonitoring and Managing Tomcat How-To/a (pero) + /add + fix +bug34361/bug: Integrate better antlib and import support for +catalina manager tasks [Modified patch from Daniel Santos] (pero) + /fix fix StoreConfig save now the Connector.sslProtocol attribute. (pero) /fix @@ -58,7 +67,7 @@ ClusterListener more than one Cluster Valves - better subclass support - - change a lot of existing API's (pero) + - change a lot of existing Cluster API's (pero) /update add Add Apache Portable Runtime JNI wrapper and helper API (mturk) 1.8 +1 -1 jakarta-tomcat-catalina/webapps/docs/developers.xml Index: developers.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/developers.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- developers.xml22 Nov 2004 15:50:57 - 1.7 +++ developers.xml24 Jun 2005 11:55:02 - 1.8 @@ -40,7 +40,7 @@ liJean-Frederic Clere (jfclere): Connectors/li liKin-Man Chung (kinman): Jasper/li liMladen Turk (mturk): Connectors/li - liPeter Rossbach (pero): Catalina, Clustering/li + liPeter Rossbach (pero): Catalina, Clustering, JMX/li liRemy Maucherat (remm): Catalina, Connectors, Docs/li liTim Funk (funkman): Catalina, Docs/li liYoav Shapira (yoavs): Docs, JMX, Catalina, balancer, Release Manager/li 1.2 +779 -10 jakarta-tomcat-catalina/webapps/docs/monitoring.xml Index: monitoring.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/monitoring.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- monitoring.xml7 Oct 2004 18:16:05 - 1.1 +++ monitoring.xml24 Jun 2005 11:55:02 - 1.2 @@ -7,6 +7,7 @@ project; properties +author email=[EMAIL PROTECTED]Peter Rossbach/author author email=[EMAIL PROTECTED]Remy Maucherat/author titleMonitoring and Managing Tomcat/title /properties @@ -15,30 +16,798 @@ section name=Introduction - - + pMonitoring is a very important question today. Looking inside the running +server, grab some statistic data or reconfigure some aspects are +daliy adminstration tasks./p + /section section name=Enabling JMX Remote - pThe Sun website includes the list of options and how to configure JMX Remote on Java 5: +pThe Sun website includes the list of options and how to configure JMX Remote on Java 5: a href=http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html; http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html/a. - /p +/p +pFor quick installation you find here a short installation guide:/p +pAdd the following parameters to your tomcat startup script: +source +set CATALINA_OPTS=-Dcom.sun.management.jmxremote \ +-Dcom.sun.management.jmxremote.port=%my.jmx.port% \ +-Dcom.sun.management.jmxremote.ssl=false \ +-Dcom.sun.management.jmxremote.authenticate=false +/source +/p +p +ol +liWhen you think authorisation is a good, add and change this : +source +-Dcom.sun.management.jmxremote.authenticate=true +-Dcom.sun.management.jmxremote.password.file=..\conf\jmxremote.password +-Dcom.sun.management.jmxremote.access.file=..\conf\jmxremote.access +/source +/li +liedit the access allow file em$CATALINA_BASE/conf/jmxremote.access/em : +source +monitorRole readonly +controlRole readwrite +/source +/li +liedit the password file
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml cluster-howto.xml
pero2005/06/09 13:38:30 Modified:webapps/docs changelog.xml cluster-howto.xml Log: - Cluster ping now transfer cluster domain information and DeltaManager only send and receive message from same domain members - JMX Support for McastService (Membership) Revision ChangesPath 1.315 +7 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.314 retrieving revision 1.315 diff -u -r1.314 -r1.315 --- changelog.xml 6 Jun 2005 21:31:19 - 1.314 +++ changelog.xml 9 Jun 2005 20:38:30 - 1.315 @@ -221,6 +221,13 @@ subsection name=Cluster changelog add +Cluster ping now transfer cluster domain information and DeltaManager only +send and receive message from same domain members (pero) + /add + add +JMX Support for McastService (Membership) (pero) + /add + add Redesign SimpleTcpCluster message receiving to ClusterReceiverBase (pero) /add add 1.7 +149 -15 jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml Index: cluster-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/cluster-howto.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cluster-howto.xml 29 Apr 2005 20:14:58 - 1.6 +++ cluster-howto.xml 9 Jun 2005 20:38:30 - 1.7 @@ -212,17 +212,42 @@ pComponent Levels: source -Server - | -Service - | -Engine - / \ - Cluster ReplicationValve - | - Manager - | - Session + Server + | + Service + | + Engine + | + Host + | + -- +/ \ + ClusterContext(1-N) +| \ +| -- Manager +| \ +| -- DeltaManager +| + --- + || | \ + Sender Receiver Membership \ + -- Valve + | \ + | -- ReplicationValve + | -- JvmRouteBinderValve + | + -- LifecycleListener + | + -- ClusterListener + | \ + | -- ClusterSessionListener + | -- JvmRouteSessionIDBinderListener + | + -- Deployer +\ + -- FarmWarDeployer + + /source/p @@ -287,7 +312,9 @@ tr tdprocessSenderFrequency/td -td/td +tdControl the sender keepalive status and drop sender socket connection after timeout is reached. +Check every processSenderFrequency value engine background ticks. +/td tdcode2/code/td /tr @@ -573,8 +600,95 @@ /p /section +section name=Cluster Configuration for ReplicationTransmitter ( DeltaManager Attribute) +p +List of Attributesbr/ +table border=1 cellpadding=5 + + tr +th align=center bgcolor=aquaAttribute/th +th align=center bgcolor=aquaDescription/th +th align=center bgcolor=aquaDefault value/th + /tr + + tr +tdexpireSessionsOnShutdown/td +tdWhen server stopped, expire all sessions also at backup nodes (only for testing)/td +tdcodefalse/code/td + /tr + + tr +tdmaxActiveSessions/td +tdNumber of active sessions. (Default is no limit)/td +tdcode-1/code/td + /tr + + tr +tdnotifyListenersOnReplication/td +tdNotify application session listener to session creation +and expiring events at backup nodes/td +tdcodetrue/code/td + /tr + + tr +tdnotifySessionListenersOnReplication/td +tdNotify application session listener to attribute changes at backup nodes/td +tdcodetrue/code/td + /tr + + tr +tdstateTransferTimeout/td +tdTimeout that session state transfer is complete/td +tdcode60/code/td + /tr + + tr +tdsendAllSessions/td +tdFlag to send sessions as splited blocks/td +tdcodetrue/code/td + /tr + + tr +tdsendAllSessionsSize/td +tdNumber
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
markt 2005/06/06 14:31:20
Modified:catalina/src/share/org/apache/catalina/connector
Connector.java
webapps/docs changelog.xml
Log:
Fix connector initialisation so sslProtocol is not required for SSL
Revision ChangesPath
1.24 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java
Index: Connector.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Connector.java4 Jun 2005 17:34:23 - 1.23
+++ Connector.java6 Jun 2005 21:31:19 - 1.24
@@ -813,7 +813,7 @@
public void setSecure(boolean secure) {
this.secure = secure;
-
+setProperty(secure, Boolean.toString(secure));
}
/**
1.314 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- changelog.xml 4 Jun 2005 17:34:23 - 1.313
+++ changelog.xml 6 Jun 2005 21:31:19 - 1.314
@@ -187,6 +187,9 @@
update
Refactor the AJP/1.3 Connector to be able to handle more advanced
Actions. (billbarker)
/update
+ fix
+Fix connector initialisation so sslProtocol is not required for SSL.
(markt)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Bill Barker wrote: Gump has been nagging about this for, like, almost a week now. You're a week late to be b*tching about this. I didn't build clean, so I didn't see it until yesterday. I never pay attention to gump messages BTW. I want to allow the committers that don't check email over the weekend a chance to review my Jk-Coyote patch for this particular issue, and then if Mark doesn't patch it first, I promise that Gump will get a clean build. At this point, all it takes is anybody with half a brain and Karma to finish the patch. I'm busy with other things at the moment ... Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/05/16 11:34:51 Modified:webapps/docs changelog.xml Log: Fix Https sslProtocol Bug ( find by Ankit Shah) Revision ChangesPath 1.311 +4 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.310 retrieving revision 1.311 diff -u -r1.310 -r1.311 --- changelog.xml 15 May 2005 22:21:55 - 1.310 +++ changelog.xml 16 May 2005 18:34:51 - 1.311 @@ -29,8 +29,11 @@ section name=Tomcat 5.5.10 (yoavs) subsection name=General changelog + fix +StoreConfig save now the Connector.sslProtocol attribute. (pero) + /fix update -change log dir at service.bat to $CATALINA_BASE/logs for better multi instance support (pero) +Change log dir at service.bat to $CATALINA_BASE/logs for better multi instance support. (pero) /update update bug33522/bug: Update jasper-howto to reflect use of javac switch. (yoavs) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
billbarker2005/05/15 15:21:56 Modified:webapps/docs changelog.xml Log: doc changes to AJP/1.3 Connector Revision ChangesPath 1.310 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.309 retrieving revision 1.310 diff -u -r1.309 -r1.310 --- changelog.xml 13 May 2005 07:12:24 - 1.309 +++ changelog.xml 15 May 2005 22:21:55 - 1.310 @@ -181,6 +181,9 @@ add bug34648/bug: Add configuration option to enable IP-based Virtual Hosts. (billbarker) /add + update +Refactor the AJP/1.3 Connector to be able to handle more advanced Actions. (billbarker) + /update /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
[EMAIL PROTECTED] wrote: markt 2005/05/11 14:39:41 Modified:catalina/src/share/org/apache/catalina/authenticator FormAuthenticator.java SavedRequest.java webapps/docs changelog.xml Log: Include request body in saved request when using FORM authentication. - Fixes problem with saved request assuming platform default encoding for POSTed parameters. - Improves restoration of request by using CoyoteRequest Can you revert this commit ? I see no other solution right now, as: - it will not work with AJP - it depends on HTTP/1.1 connector internal classes, so it breaks a clean build Thanks, Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
- Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List tomcat-dev@jakarta.apache.org Sent: Sunday, May 15, 2005 6:57 PM Subject: Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml [EMAIL PROTECTED] wrote: markt 2005/05/11 14:39:41 Modified:catalina/src/share/org/apache/catalina/authenticator FormAuthenticator.java SavedRequest.java webapps/docs changelog.xml Log: Include request body in saved request when using FORM authentication. - Fixes problem with saved request assuming platform default encoding for POSTed parameters. - Improves restoration of request by using CoyoteRequest Can you revert this commit ? I see no other solution right now, as: - it will not work with AJP - it depends on HTTP/1.1 connector internal classes, so it breaks a clean build Urm, we are nowhere close to doing another release (and Mark has already promised to revert it before then, if not fixed). Also, it doesn't really take much more to fix it from here. If you can't see any other solution right now, then you are truely brain-dead. Thanks, Rémy This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Bill Barker wrote: Urm, we are nowhere close to doing another release (and Mark has already promised to revert it before then, if not fixed). Also, it doesn't really take much more to fix it from here. If you can't see any other solution right now, then you are truely brain-dead. I missed the part about reverting, all I saw about this was adding limits. Besides, I am mostly complaining because it seems to break the build, which is never acceptable (even if no release is planned immediately). Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
- Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List tomcat-dev@jakarta.apache.org Sent: Sunday, May 15, 2005 8:20 PM Subject: Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml Bill Barker wrote: Urm, we are nowhere close to doing another release (and Mark has already promised to revert it before then, if not fixed). Also, it doesn't really take much more to fix it from here. If you can't see any other solution right now, then you are truely brain-dead. I missed the part about reverting, all I saw about this was adding limits. Besides, I am mostly complaining because it seems to break the build, which is never acceptable (even if no release is planned immediately). Gump has been nagging about this for, like, almost a week now. You're a week late to be b*tching about this. I want to allow the committers that don't check email over the weekend a chance to review my Jk-Coyote patch for this particular issue, and then if Mark doesn't patch it first, I promise that Gump will get a clean build. At this point, all it takes is anybody with half a brain and Karma to finish the patch. Rémy This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Jan Luehe wrote:
[EMAIL PROTECTED] wrote:
remm2005/05/12 06:01:05
Modified:jasper2/src/share/org/apache/jasper/servlet
JspCServletContext.java
webapps/docs changelog.xml
Log:
- 34465: jspc without web.xml.
- Submitted by Yoichi Hirose.
Revision ChangesPath
1.4 +7 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java
Index: JspCServletContext.java
===
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspCServletContext.java 17 Mar 2004 19:23:05 - 1.3
+++ JspCServletContext.java 12 May 2005 13:01:04 - 1.4
@@ -235,7 +235,13 @@
if (!path.startsWith(/))
throw new MalformedURLException(Path ' + path +
' does not start with '/');
-return (new URL(myResourceBaseURL, path.substring(1)));
+URL url = new URL(myResourceBaseURL, path.substring(1));
+if (file.equals(url.getProtocol())) {
+if (!(new File(url.getFile())).exists()) {
+return null;
+}
+}
+return url;
}
I don't think this is very efficient. Normally, the resource
with the given path will exist. It is just in the case
of web.xml that it may not exist.
Why not check specifically for existence of web.xml, as follows:
No, the JspCServletContext is supposed to work as a regular servlet
context, so we should really return null if the file does not exist
rather than add hacks elsewhere to work around it.
Rémy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/05/13 00:12:24
Modified:jasper2/src/share/org/apache/jasper/servlet
JspCServletContext.java
webapps/docs changelog.xml
Log:
- Second attempt with my own patch. (note: we don't care about efficiency
here, since this is not used often at all)
Revision ChangesPath
1.5 +12 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java
Index: JspCServletContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JspCServletContext.java 12 May 2005 13:01:04 - 1.4
+++ JspCServletContext.java 13 May 2005 07:12:24 - 1.5
@@ -236,9 +236,18 @@
throw new MalformedURLException(Path ' + path +
' does not start with '/');
URL url = new URL(myResourceBaseURL, path.substring(1));
-if (file.equals(url.getProtocol())) {
-if (!(new File(url.getFile())).exists()) {
-return null;
+InputStream is = null;
+try {
+is = url.openStream();
+} catch (Throwable t) {
+url = null;
+} finally {
+if (is != null) {
+try {
+is.close();
+} catch (Throwable t2) {
+// Ignore
+}
}
}
return url;
1.309 +1 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- changelog.xml 12 May 2005 13:01:04 - 1.308
+++ changelog.xml 13 May 2005 07:12:24 - 1.309
@@ -204,7 +204,7 @@
Daryl Robbins (remm)
/update
fix
-bug34465/bug: Jspc failure if there is no web.xml, submitted by
Yoichi Hirose (remm)
+bug34465/bug: Jspc failure if there is no web.xml (remm)
/fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
[EMAIL PROTECTED] wrote: markt 2005/05/11 14:39:41 Modified:catalina/src/share/org/apache/catalina/authenticator FormAuthenticator.java SavedRequest.java webapps/docs changelog.xml Log: Include request body in saved request when using FORM authentication. - Fixes problem with saved request assuming platform default encoding for POSTed parameters. - Improves restoration of request by using CoyoteRequest This is way too risky to do it for any POST (which could be a file upload), and I think it could lead to easy DoSes, so I share Bill's concerns. Saving parameters in general is risky as well, obviously ... IMO, webapps need to be better designed, and auth should happen before sending forms. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Olen työmatkalla ja takaisin toimistolla 16.5.2005. Back at the office May 16th. Kristiina Markkula GSM +358 50 560132 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Would it be worthwhile to use a new property? maxSavePostSize - The max size of a post to save. 0 for unlimited, -1 to disable saving post. Of course this doesn't mitigate a malicious person issuing many POSTS under the configured threshold. -Tim Remy Maucherat wrote: [EMAIL PROTECTED] wrote: markt 2005/05/11 14:39:41 Modified:catalina/src/share/org/apache/catalina/authenticator FormAuthenticator.java SavedRequest.java webapps/docs changelog.xml Log: Include request body in saved request when using FORM authentication. - Fixes problem with saved request assuming platform default encoding for POSTed parameters. - Improves restoration of request by using CoyoteRequest This is way too risky to do it for any POST (which could be a file upload), and I think it could lead to easy DoSes, so I share Bill's concerns. Saving parameters in general is risky as well, obviously ... IMO, webapps need to be better designed, and auth should happen before sending forms. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Tim Funk wrote: Would it be worthwhile to use a new property? maxSavePostSize - The max size of a post to save. 0 for unlimited, -1 to disable saving post. Of course this doesn't mitigate a malicious person issuing many POSTS under the configured threshold. I think I disagree. Even if you are not trying to do a DoS, it is very easy to do it non intentionally if you save any post data (file upload). We'd need to restrict saved POST size severely, as well as restrict more by default any form POST data. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/05/12 06:01:05
Modified:jasper2/src/share/org/apache/jasper/servlet
JspCServletContext.java
webapps/docs changelog.xml
Log:
- 34465: jspc without web.xml.
- Submitted by Yoichi Hirose.
Revision ChangesPath
1.4 +7 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java
Index: JspCServletContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspCServletContext.java 17 Mar 2004 19:23:05 - 1.3
+++ JspCServletContext.java 12 May 2005 13:01:04 - 1.4
@@ -235,7 +235,13 @@
if (!path.startsWith(/))
throw new MalformedURLException(Path ' + path +
' does not start with '/');
-return (new URL(myResourceBaseURL, path.substring(1)));
+URL url = new URL(myResourceBaseURL, path.substring(1));
+if (file.equals(url.getProtocol())) {
+if (!(new File(url.getFile())).exists()) {
+return null;
+}
+}
+return url;
}
1.308 +7 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- changelog.xml 11 May 2005 21:39:41 - 1.307
+++ changelog.xml 12 May 2005 13:01:04 - 1.308
@@ -153,6 +153,10 @@
default encoding. A side effect of this fix is that the bodies of
POST requests that
require FORM authentication are now buffered and made available
after a sucessful login. (markt)
/fix
+ fix
+bug34840/bug: Better handling of external WARs redeployment, and
ignore docBase specified
+in context file if within the Host appBase (remm)
+ /fix
/changelog
/subsection
@@ -199,6 +203,9 @@
bug34652/bug: Add the ability to get SMAPs when precompiling,
submitted by
Daryl Robbins (remm)
/update
+ fix
+bug34465/bug: Jspc failure if there is no web.xml, submitted by
Yoichi Hirose (remm)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Thursday, May 12, 2005 6:01 AM
Subject: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/05/12 06:01:05
Modified:jasper2/src/share/org/apache/jasper/servlet
JspCServletContext.java
webapps/docs changelog.xml
Log:
- 34465: jspc without web.xml.
- Submitted by Yoichi Hirose.
-return (new URL(myResourceBaseURL, path.substring(1)));
+URL url = new URL(myResourceBaseURL, path.substring(1));
+if (file.equals(url.getProtocol())) {
+if (!(new File(url.getFile())).exists()) {
+return null;
+}
+}
A huge -1 to this. I can't believe that a Windows user would even think
commit junk like this. ;-)
This message is intended only for the use of the person(s) listed above as the
intended recipient(s), and may contain information that is PRIVILEGED and
CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or
distribute this message or any attachment. If you received this communication
in error, please notify us immediately by e-mail and then delete all copies of
this message and any attachments.
In addition you should be aware that ordinary (unencrypted) e-mail sent through
the Internet is not secure. Do not send confidential or sensitive information,
such as social security numbers, account numbers, personal identification
numbers and passwords, to us via ordinary (unencrypted) e-mail.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
- Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List tomcat-dev@jakarta.apache.org Sent: Thursday, May 12, 2005 5:28 AM Subject: Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml Tim Funk wrote: Would it be worthwhile to use a new property? maxSavePostSize - The max size of a post to save. 0 for unlimited, -1 to disable saving post. Of course this doesn't mitigate a malicious person issuing many POSTS under the configured threshold. I think I disagree. Even if you are not trying to do a DoS, it is very easy to do it non intentionally if you save any post data (file upload). We'd need to restrict saved POST size severely, as well as restrict more by default any form POST data. I agree. I'd even be +1 to further restricting the saved body size for CLIENT-CERT auth, and that one is only saved for the time of one request. Since the body in a FORM auth is going to be saved for much longer, it's even more important to restrict it. And this is even more important for mod_jk users, since they will never get a chance to recover the data that they have posted :(. Rémy This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
So the issues are: 1. AJP/1.3 compatibility 2. Potential DoS As far as DoS goes, with the previous behaviour any parameters POSTed would be persisted in the session until the authentication was completed or the session timed out. Therefore, the same issue exists with both the old and new implementation. (a) The size of the the POST is already limited by maxPostSize for both FORM and CLIENT-CERT auth. Is the proposal to add another parameter to the connector to optionally further limit the saved POST size when authenticating? (b) Given (a), I don't see a significant difference in risk between the old and new behaviour. I am happy to mitigate this risk by implementing (b). As maxPostSize applies to any POST, including during CLIENT-CERT auth my own view is that the new parameter should apply only to the FormAuthenticator valve and should default to 0 (ie no data saved). -1 would mean use whatever value is specified for maxPostSize and any value 0 would be the limit unless maxPostSize was smaller in which case maxPostSize would override the new parameter. The docs for this parameter would include a health warning about the risks of permitting the saving of POSTed data during FORM authentication. I obviously also need to look at AJP/1.3 compatibility. Any hints/tips gratefully received. If these issues aren't resolved by the time of the next release, I'll revert the saving the raw data part of the patch. Mark Bill Barker wrote: - Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List tomcat-dev@jakarta.apache.org Sent: Thursday, May 12, 2005 5:28 AM Subject: Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml Tim Funk wrote: Would it be worthwhile to use a new property? maxSavePostSize - The max size of a post to save. 0 for unlimited, -1 to disable saving post. Of course this doesn't mitigate a malicious person issuing many POSTS under the configured threshold. I think I disagree. Even if you are not trying to do a DoS, it is very easy to do it non intentionally if you save any post data (file upload). We'd need to restrict saved POST size severely, as well as restrict more by default any form POST data. I agree. I'd even be +1 to further restricting the saved body size for CLIENT-CERT auth, and that one is only saved for the time of one request. Since the body in a FORM auth is going to be saved for much longer, it's even more important to restrict it. And this is even more important for mod_jk users, since they will never get a chance to recover the data that they have posted :(. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
So the issues are: 1. AJP/1.3 compatibility 2. Potential DoS As far as DoS goes, with the previous behaviour any parameters POSTed would be persisted in the session until the authentication was completed or the session timed out. Therefore, the same issue exists with both the old and new implementation. (a) The size of the the POST is already limited by maxPostSize for both FORM and CLIENT-CERT auth. Is the proposal to add another parameter to the connector to optionally further limit the saved POST size when authenticating? (b) Given (a), I don't see a significant difference in risk between the old and new behaviour. I am happy to mitigate this risk by implementing (b). As maxPostSize applies to any POST, including during CLIENT-CERT auth my own view is that the new parameter should apply only to the FormAuthenticator valve and should default to 0 (ie no data saved). -1 would mean use whatever value is specified for maxPostSize and any value 0 would be the limit unless maxPostSize was smaller in which case maxPostSize would override the new parameter. The docs for this parameter would include a health warning about the risks of permitting the saving of POSTed data during FORM authentication. I obviously also need to look at AJP/1.3 compatibility. Any hints/tips gratefully received. If these issues aren't resolved by the time of the next release, I'll revert the saving the raw data part of the patch. Mark Bill Barker wrote: Tim Funk wrote: Would it be worthwhile to use a new property? maxSavePostSize - The max size of a post to save. 0 for unlimited, -1 to disable saving post. Of course this doesn't mitigate a malicious person issuing many POSTS under the configured threshold. I think I disagree. Even if you are not trying to do a DoS, it is very easy to do it non intentionally if you save any post data (file upload). We'd need to restrict saved POST size severely, as well as restrict more by default any form POST data. I agree. I'd even be +1 to further restricting the saved body size for CLIENT-CERT auth, and that one is only saved for the time of one request. Since the body in a FORM auth is going to be saved for much longer, it's even more important to restrict it. And this is even more important for mod_jk users, since they will never get a chance to recover the data that they have posted :(. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
- Original Message - From: Mark Thomas [EMAIL PROTECTED] To: Tomcat Developers List tomcat-dev@jakarta.apache.org Sent: Monday, May 12, 2003 10:34 AM Subject: Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml So the issues are: 1. AJP/1.3 compatibility 2. Potential DoS As far as DoS goes, with the previous behaviour any parameters POSTed would be persisted in the session until the authentication was completed or the session timed out. Therefore, the same issue exists with both the old and new implementation. (a) The size of the the POST is already limited by maxPostSize for both FORM and CLIENT-CERT auth. Is the proposal to add another parameter to the connector to optionally further limit the saved POST size when authenticating? (b) The check on maxPostSize in the Request isn't applied to any 'chunked' POST body, and also not to any 'multipart/form-data'. I don't see any place else that checks it except when CLIENT-CERT auth saves the request body. Given (a), I don't see a significant difference in risk between the old and new behaviour. I am happy to mitigate this risk by implementing (b). As maxPostSize applies to any POST, including during CLIENT-CERT auth my own view is that the new parameter should apply only to the FormAuthenticator valve and should default to 0 (ie no data saved). -1 would mean use whatever value is specified for maxPostSize and any value 0 would be the limit unless maxPostSize was smaller in which case maxPostSize would override the new parameter. The docs for this parameter would include a health warning about the risks of permitting the saving of POSTed data during FORM authentication. No. Previously only the Parameters were saved, and limited by maxPostSize. Now you are saving off file-upload posts as well, and these aren't limited anywhere. I obviously also need to look at AJP/1.3 compatibility. Any hints/tips gratefully received. It should be something like: request.getCoyoteRequest().action(ActionCode.ACTION_SET_BODY_REPLAY, body); but that won't work either unless Jk-Coyote gets cleaned up a bit (the ActionHook implementation is one of those it's ugly but it works things at the moment :). I could do the cleanup if the consensus is that this is the way to go. If these issues aren't resolved by the time of the next release, I'll revert the saving the raw data part of the patch. Mark This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Bill Barker wrote: From: Mark Thomas [EMAIL PROTECTED] So the issues are: 1. AJP/1.3 compatibility 2. Potential DoS As far as DoS goes, with the previous behaviour any parameters POSTed would be persisted in the session until the authentication was completed or the session timed out. Therefore, the same issue exists with both the old and new implementation. (a) The size of the the POST is already limited by maxPostSize for both FORM and CLIENT-CERT auth. Is the proposal to add another parameter to the connector to optionally further limit the saved POST size when authenticating? (b) The check on maxPostSize in the Request isn't applied to any 'chunked' POST body, and also not to any 'multipart/form-data'. I don't see any place else that checks it except when CLIENT-CERT auth saves the request body. I stand corrected. This is easy to fix if it is agreed that this, or something similar to it, is the way forward. Given (a), I don't see a significant difference in risk between the old and new behaviour. I am happy to mitigate this risk by implementing (b). As maxPostSize applies to any POST, including during CLIENT-CERT auth my own view is that the new parameter should apply only to the FormAuthenticator valve and should default to 0 (ie no data saved). -1 would mean use whatever value is specified for maxPostSize and any value 0 would be the limit unless maxPostSize was smaller in which case maxPostSize would override the new parameter. The docs for this parameter would include a health warning about the risks of permitting the saving of POSTed data during FORM authentication. No. Previously only the Parameters were saved, and limited by maxPostSize. Now you are saving off file-upload posts as well, and these aren't limited anywhere. As above, putting the limit in is easy. I obviously also need to look at AJP/1.3 compatibility. Any hints/tips gratefully received. It should be something like: request.getCoyoteRequest().action(ActionCode.ACTION_SET_BODY_REPLAY, body); but that won't work either unless Jk-Coyote gets cleaned up a bit (the ActionHook implementation is one of those it's ugly but it works things at the moment :). I could do the cleanup if the consensus is that this is the way to go. Any help would be great. It took me a while to figure out how to get this far. If these issues aren't resolved by the time of the next release, I'll revert the saving the raw data part of the patch. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
[EMAIL PROTECTED] wrote:
remm2005/05/12 06:01:05
Modified:jasper2/src/share/org/apache/jasper/servlet
JspCServletContext.java
webapps/docs changelog.xml
Log:
- 34465: jspc without web.xml.
- Submitted by Yoichi Hirose.
Revision ChangesPath
1.4 +7 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java
Index: JspCServletContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspCServletContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspCServletContext.java 17 Mar 2004 19:23:05 - 1.3
+++ JspCServletContext.java 12 May 2005 13:01:04 - 1.4
@@ -235,7 +235,13 @@
if (!path.startsWith(/))
throw new MalformedURLException(Path ' + path +
' does not start with '/');
-return (new URL(myResourceBaseURL, path.substring(1)));
+URL url = new URL(myResourceBaseURL, path.substring(1));
+if (file.equals(url.getProtocol())) {
+if (!(new File(url.getFile())).exists()) {
+return null;
+}
+}
+return url;
}
I don't think this is very efficient. Normally, the resource
with the given path will exist. It is just in the case
of web.xml that it may not exist.
Why not check specifically for existence of web.xml, as follows:
Index: JspConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java,v
retrieving revision 1.18
diff -u -r1.18 JspConfig.java
--- JspConfig.java 24 Mar 2005 04:08:01 - 1.18
+++ JspConfig.java 13 May 2005 00:09:22 -
@@ -16,6 +16,7 @@
package org.apache.jasper.compiler;
+import java.io.File;
import java.io.InputStream;
import java.util.Iterator;
import java.util.Vector;
@@ -63,10 +64,12 @@
try {
URL uri = ctxt.getResource(WEB_XML);
-if (uri == null) {
+if (uri == null
+|| (file.equals(uri.getProtocol())
+ !(new File(uri.getFile())).exists())) {
// no web.xml
return;
- }
+}
is = uri.openStream();
InputSource ip = new InputSource(is);
Jan
Jan
1.308 +7 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- changelog.xml 11 May 2005 21:39:41 - 1.307
+++ changelog.xml 12 May 2005 13:01:04 - 1.308
@@ -153,6 +153,10 @@
default encoding. A side effect of this fix is that the bodies of
POST requests that
require FORM authentication are now buffered and made available
after a sucessful login. (markt)
/fix
+ fix
+bug34840/bug: Better handling of external WARs redeployment,
and ignore docBase specified
+in context file if within the Host appBase (remm)
+ /fix
/changelog
/subsection
@@ -199,6 +203,9 @@
bug34652/bug: Add the ability to get SMAPs when precompiling,
submitted by
Daryl Robbins (remm)
/update
+ fix
+bug34465/bug: Jspc failure if there is no web.xml, submitted
by Yoichi Hirose (remm)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
markt 2005/05/11 14:22:14 Modified:webapps/docs changelog.xml Log: Update for recent fix Revision ChangesPath 1.306 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- changelog.xml 8 May 2005 22:31:33 - 1.305 +++ changelog.xml 11 May 2005 21:22:14 - 1.306 @@ -145,6 +145,9 @@ fix bug34546/bug: Fix problem where the first Valve couldn't be removed from a Pipeline. (billbarker) /fix + fix +Fix NPE when POST size exceeds limit defined by maxPostSize. (markt) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
markt 2005/05/11 14:39:41
Modified:catalina/src/share/org/apache/catalina/authenticator
FormAuthenticator.java SavedRequest.java
webapps/docs changelog.xml
Log:
Include request body in saved request when using FORM authentication.
- Fixes problem with saved request assuming platform default encoding for
POSTed
parameters.
- Improves restoration of request by using CoyoteRequest
Revision ChangesPath
1.20 +89 -25
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java
Index: FormAuthenticator.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FormAuthenticator.java31 Mar 2005 10:31:54 - 1.19
+++ FormAuthenticator.java11 May 2005 21:39:41 - 1.20
@@ -19,11 +19,11 @@
import java.io.IOException;
+import java.io.InputStream;
import java.security.Principal;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Locale;
-import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.Cookie;
@@ -36,11 +36,14 @@
import org.apache.catalina.deploy.LoginConfig;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.coyote.InputBuffer;
+import org.apache.coyote.http11.InputFilter;
+import org.apache.coyote.http11.InternalInputBuffer;
+import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
-
/**
* An bAuthenticator/b and bValve/b implementation of FORM BASED
* Authentication, as described in the Servlet API Specification, Version
2.2.
@@ -187,7 +190,8 @@
if (matchRequest(request)) {
session = request.getSessionInternal(true);
if (log.isDebugEnabled())
-log.debug(Restore request from session ' +
session.getIdInternal()
+log.debug(Restore request from session '
+ + session.getIdInternal()
+ ');
principal = (Principal)
session.getNote(Constants.FORM_PRINCIPAL_NOTE);
@@ -273,7 +277,8 @@
session = request.getSessionInternal(false);
if (session == null) {
if (containerLog.isDebugEnabled())
-containerLog.debug(User took so long to log on the session
expired);
+containerLog.debug
+(User took so long to log on the session expired);
response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT,
sm.getString(authenticator.sessionExpired));
return (false);
@@ -345,7 +350,8 @@
* @param request The request to be restored
* @param session The session containing the saved information
*/
-protected boolean restoreRequest(Request request, Session session) {
+protected boolean restoreRequest(Request request, Session session)
+throws IOException {
// Retrieve and remove the SavedRequest object from our session
SavedRequest saved = (SavedRequest)
@@ -361,7 +367,8 @@
while (cookies.hasNext()) {
request.addCookie((Cookie) cookies.next());
}
-request.clearHeaders();
+
+request.getCoyoteRequest().getMimeHeaders().recycle();
Iterator names = saved.getHeaderNames();
while (names.hasNext()) {
String name = (String) names.next();
@@ -370,24 +377,39 @@
request.addHeader(name, (String) values.next());
}
}
+
request.clearLocales();
Iterator locales = saved.getLocales();
while (locales.hasNext()) {
request.addLocale((Locale) locales.next());
}
-request.clearParameters();
+
+request.getCoyoteRequest().getParameters().recycle();
+
if (POST.equalsIgnoreCase(saved.getMethod())) {
-Iterator paramNames = saved.getParameterNames();
-while (paramNames.hasNext()) {
-String paramName = (String) paramNames.next();
-String paramValues[] =
-saved.getParameterValues(paramName);
-request.addParameter(paramName, paramValues);
-}
+ByteChunk body = saved.getBody();
+
+// Set content length
+request.getCoyoteRequest().setContentLength(body.getLength());
+
+// Restore body
+
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Wednesday, May 11, 2005 2:39 PM
Subject: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
markt 2005/05/11 14:39:41
+// Restore body
+InputFilter savedBody = new SavedRequestInputFilter(body);
+InternalInputBuffer internalBuffer = (InternalInputBuffer)
+request.getCoyoteRequest().getInputBuffer();
+internalBuffer.addActiveFilter(savedBody);
This is going to crash-and-burn spectacularly for anybody using the AJP/1.3
Connector.
+
+byte[] buffer = new byte[4096];
+int bytesRead;
+InputStream is = request.getInputStream();
+ByteChunk body = new ByteChunk();
+
+while ( (bytesRead = is.read(buffer) ) = 0) {
+body.append(buffer, 0, bytesRead);
+}
+saved.setBody(body);
}
It's generally not a good idea to allow unlimited saving of POST data, since
I can bring down your server by simply POSTing a 4GB file to a protected
page.
This message is intended only for the use of the person(s) listed above as the
intended recipient(s), and may contain information that is PRIVILEGED and
CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or
distribute this message or any attachment. If you received this communication
in error, please notify us immediately by e-mail and then delete all copies of
this message and any attachments.
In addition you should be aware that ordinary (unencrypted) e-mail sent through
the Internet is not secure. Do not send confidential or sensitive information,
such as social security numbers, account numbers, personal identification
numbers and passwords, to us via ordinary (unencrypted) e-mail.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
billbarker2005/05/08 15:31:33 Modified:webapps/docs changelog.xml Log: document change Revision ChangesPath 1.305 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.304 retrieving revision 1.305 diff -u -r1.304 -r1.305 --- changelog.xml 5 May 2005 16:27:30 - 1.304 +++ changelog.xml 8 May 2005 22:31:33 - 1.305 @@ -142,6 +142,9 @@ update bug34675/bug: Updated Proxy-HowTo page with Servlet API calls. (yoavs) /update + fix +bug34546/bug: Fix problem where the first Valve couldn't be removed from a Pipeline. (billbarker) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/05/05 09:27:30 Modified:webapps/docs changelog.xml Log: Doc service.bat change log dir to $CATALINA_BASE/logs Revision ChangesPath 1.304 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- changelog.xml 3 May 2005 14:29:25 - 1.303 +++ changelog.xml 5 May 2005 16:27:30 - 1.304 @@ -30,6 +30,9 @@ subsection name=General changelog update +change log dir at service.bat to $CATALINA_BASE/logs for better multi instance support (pero) + /update + update bug33522/bug: Update jasper-howto to reflect use of javac switch. (yoavs) /update update - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/05/03 07:00:07 Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java webapps/docs changelog.xml Log: Bugzilla 34578. Revision ChangesPath 1.24 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java Index: JNDIRealm.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- JNDIRealm.java25 Mar 2005 08:29:32 - 1.23 +++ JNDIRealm.java3 May 2005 14:00:07 - 1.24 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2002,2004 The Apache Software Foundation. + * Copyright 1999-2002,2004-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. @@ -1075,7 +1075,7 @@ Name contextName = parser.parse(context.getNameInNamespace()); Name baseName = parser.parse(userBase); -// Bugzilla 32267 +// Bugzilla 32269 Name entryName = parser.parse(new CompositeName(result.getName()).get(0)); Name name = contextName.addAll(baseName); 1.300 +18 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.299 retrieving revision 1.300 diff -u -r1.299 -r1.300 --- changelog.xml 2 May 2005 00:05:02 - 1.299 +++ changelog.xml 3 May 2005 14:00:07 - 1.300 @@ -26,6 +26,24 @@ /p /section +section name=Tomcat 5.5.11 (yoavs) + subsection name=General +changelog +/changelog + /subsection + + subsection name=Catalina +changelog + fix +bug34578/bug: Updated JNDIRealm comment. (yoavs) + /fix + add +[Placeholder for HttpAprConnector] + /add +/changelog + /subsection +/section + section name=Tomcat 5.5.10 (yoavs) subsection name=General changelog - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/05/03 07:05:44 Modified:webapps/docs changelog.xml Log: Oops, jumped the gun a bit with 5.5.11 in the changelog ;) Revision ChangesPath 1.301 +6 -18 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.300 retrieving revision 1.301 diff -u -r1.300 -r1.301 --- changelog.xml 3 May 2005 14:00:07 - 1.300 +++ changelog.xml 3 May 2005 14:05:44 - 1.301 @@ -26,24 +26,6 @@ /p /section -section name=Tomcat 5.5.11 (yoavs) - subsection name=General -changelog -/changelog - /subsection - - subsection name=Catalina -changelog - fix -bug34578/bug: Updated JNDIRealm comment. (yoavs) - /fix - add -[Placeholder for HttpAprConnector] - /add -/changelog - /subsection -/section - section name=Tomcat 5.5.10 (yoavs) subsection name=General changelog @@ -145,6 +127,12 @@ update Add missing CGI variables to SSI servlet. Patch submitted by Fritz Schneider. (markt) /update + fix +bug34578/bug: Updated JNDIRealm comment. (yoavs) + /fix + add +[Placeholder for HttpAprConnector] + /add /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2005/05/03 07:12:52
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
webapps/docs changelog.xml
Log:
Bugzilla 34273.
Revision ChangesPath
1.22 +3 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Bootstrap.java21 Aug 2004 19:34:59 - 1.21
+++ Bootstrap.java3 May 2005 14:12:52 - 1.22
@@ -409,6 +409,8 @@
daemon.start();
} else if (command.equals(stop)) {
daemon.stopServer(args);
+} else {
+log.warn(Bootsrap: command \ + command + \ does not
exist.);
}
} catch (Throwable t) {
t.printStackTrace();
1.302 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- changelog.xml 3 May 2005 14:05:44 - 1.301
+++ changelog.xml 3 May 2005 14:12:52 - 1.302
@@ -133,6 +133,9 @@
add
[Placeholder for HttpAprConnector]
/add
+ fix
+bug34273/bug: Better Bootstrap warning message. [Path from Ralf
Hauser] (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml proxy-howto.xml
yoavs 2005/05/03 07:29:26 Modified:webapps/docs changelog.xml proxy-howto.xml Log: Bugzilla 34675. Revision ChangesPath 1.303 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- changelog.xml 3 May 2005 14:12:52 - 1.302 +++ changelog.xml 3 May 2005 14:29:25 - 1.303 @@ -136,6 +136,9 @@ fix bug34273/bug: Better Bootstrap warning message. [Path from Ralf Hauser] (yoavs) /fix + update +bug34675/bug: Updated Proxy-HowTo page with Servlet API calls. (yoavs) + /update /changelog /subsection 1.7 +5 -3 jakarta-tomcat-catalina/webapps/docs/proxy-howto.xml Index: proxy-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/proxy-howto.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- proxy-howto.xml 8 Jan 2004 14:55:57 - 1.6 +++ proxy-howto.xml 3 May 2005 14:29:25 - 1.7 @@ -21,11 +21,13 @@ processing. When Tomcat is running standalone with the a href=config/coyote.htmlCoyote HTTP/1.1 Connector/a, it will generally report the server name specified in the request, and the port number on -which the strongConnector/strong is listening. The two servlet API +which the strongConnector/strong is listening. The servlet API calls of interest, for this purpose, are:/p ul -licodeServletRequest.getServerName()/code/li -licodeServletRequest.getServerPort()/code/li +licodeServletRequest.getServerName()/code: Returns the host name of the server to which the request was sent./li +licodeServletRequest.getServerPort()/code: Returns the host name of the server to which the request was sent./li +licodeServletRequest.getLocalName()/code: Returns the host name of the Internet Protocol (IP) interface on which the request was received./li +licodeServletRequest.getLocalPort()/code: Returns the Internet Protocol (IP) port number of the interface on which the request was received./li /ul pWhen you are running behind a proxy server (or a web server that is - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
billbarker2005/05/01 17:05:03 Modified:webapps/docs changelog.xml Log: Catching up on my changes, before I forget all of them. Revision ChangesPath 1.299 +6 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.298 retrieving revision 1.299 diff -u -r1.298 -r1.299 --- changelog.xml 30 Apr 2005 17:20:50 - 1.298 +++ changelog.xml 2 May 2005 00:05:02 - 1.299 @@ -143,6 +143,12 @@ provides efficient worker thread usage (remm) /add add +Add support for simple file-based CRLs under JDK 1.5 (billbarker) + /add + add +Add experimental NIO-Socket channel for the AJP/1.3 Connector (billbarker) + /add + add bug34648/bug: Add configuration option to enable IP-based Virtual Hosts. (billbarker) /add /changelog - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/04/30 02:07:12 Modified:webapps/docs changelog.xml Log: - Update changelog. Revision ChangesPath 1.297 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- changelog.xml 30 Apr 2005 04:35:37 - 1.296 +++ changelog.xml 30 Apr 2005 09:07:12 - 1.297 @@ -121,6 +121,9 @@ users as the unauthenticated user without giving them a chance to supply a username and password. (markt) /fix + fix +Prevent facade objects cloning (remm) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml ssi-howto.xml
markt 2005/04/30 10:20:51
Modified:catalina/src/share/org/apache/catalina/ssi
SSIServletExternalResolver.java
webapps/docs changelog.xml ssi-howto.xml
Log:
Add missing CGI variables to SSi servlet.
- Patch submitted by Fritz Schneider.
Revision ChangesPath
1.7 +182 -75
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java
Index: SSIServletExternalResolver.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SSIServletExternalResolver.java 23 Apr 2005 10:22:37 - 1.6
+++ SSIServletExternalResolver.java 30 Apr 2005 17:20:50 - 1.7
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.Request;
+import org.apache.coyote.Constants;
/**
* An implementation of SSIExternalResolver that is used with servlets.
@@ -36,10 +37,14 @@
public class SSIServletExternalResolver implements SSIExternalResolver {
protected final String VARIABLE_NAMES[] = {AUTH_TYPE, CONTENT_LENGTH,
CONTENT_TYPE, DOCUMENT_NAME, DOCUMENT_URI,
-GATEWAY_INTERFACE, PATH_INFO, PATH_TRANSLATED,
+GATEWAY_INTERFACE, HTTP_ACCEPT, HTTP_ACCEPT_ENCODING,
+HTTP_ACCEPT_LANGUAGE, HTTP_CONNECTION, HTTP_HOST,
+HTTP_REFERER, HTTP_USER_AGENT, PATH_INFO,
PATH_TRANSLATED,
QUERY_STRING, QUERY_STRING_UNESCAPED, REMOTE_ADDR,
-REMOTE_HOST, REMOTE_USER, REQUEST_METHOD, SCRIPT_NAME,
-SERVER_NAME, SERVER_PORT, SERVER_PROTOCOL,
SERVER_SOFTWARE};
+REMOTE_HOST, REMOTE_PORT, REMOTE_USER, REQUEST_METHOD,
+REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME, SERVER_ADDR,
+SERVER_NAME, SERVER_PORT, SERVER_PROTOCOL,
SERVER_SOFTWARE,
+UNIQUE_ID};
protected ServletContext context;
protected HttpServletRequest req;
protected HttpServletResponse res;
@@ -138,85 +143,185 @@
protected String getCGIVariable(String name) {
String retVal = null;
-if (name.equalsIgnoreCase(AUTH_TYPE)) {
-retVal = req.getAuthType();
-} else if (name.equalsIgnoreCase(CONTENT_LENGTH)) {
-int contentLength = req.getContentLength();
-if (contentLength = 0) {
-retVal = Integer.toString(contentLength);
-}
-} else if (name.equalsIgnoreCase(CONTENT_TYPE)) {
-retVal = req.getContentType();
-} else if (name.equalsIgnoreCase(DOCUMENT_NAME)) {
-String requestURI = req.getRequestURI();
-retVal = requestURI.substring(requestURI.lastIndexOf('/') + 1);
-} else if (name.equalsIgnoreCase(DOCUMENT_URI)) {
-retVal = req.getRequestURI();
+String[] nameParts = name.toUpperCase().split(_);
+int requiredParts = 2;
+if (nameParts.length == 1) {
+if (nameParts[0].equals(PATH)) {
+requiredParts = 1;
+retVal = null; // Not implemented
+}
+}
+else if (nameParts[0].equals(AUTH)) {
+if (nameParts[1].equals(TYPE)) {
+retVal = req.getAuthType();
+}
+} else if(nameParts[0].equals(CONTENT)) {
+if (nameParts[1].equals(LENGTH)) {
+int contentLength = req.getContentLength();
+if (contentLength = 0) {
+retVal = Integer.toString(contentLength);
+}
+} else if (nameParts[1].equals(TYPE)) {
+retVal = req.getContentType();
+}
+} else if (nameParts[0].equals(DOCUMENT)) {
+if (nameParts[1].equals(NAME)) {
+String requestURI = req.getRequestURI();
+retVal = requestURI.substring(requestURI.lastIndexOf('/') +
1);
+} else if (nameParts[1].equals(URI)) {
+retVal = req.getRequestURI();
+}
} else if (name.equalsIgnoreCase(GATEWAY_INTERFACE)) {
retVal = CGI/1.1;
-} else if (name.equalsIgnoreCase(PATH_INFO)) {
-retVal = req.getPathInfo();
-} else if (name.equalsIgnoreCase(PATH_TRANSLATED)) {
-retVal = req.getPathTranslated();
-} else if (name.equalsIgnoreCase(QUERY_STRING)) {
-//apache displays this as an empty string rather than (none)
-retVal = nullToEmptyString(req.getQueryString());
-} else if (name.equalsIgnoreCase(QUERY_STRING_UNESCAPED)) {
-
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
markt 2005/04/28 11:55:57
Modified:catalina/src/share/org/apache/catalina/authenticator
BasicAuthenticator.java
webapps/docs changelog.xml
Log:
Fix bug 22617. When used with an EJB container and a realm that supports the
concept
of an unauthenticated user (J2EE.3.4.3) BASIC authentication was always
authenticating users as the unauthenticated user without giving them a
chance to
supply a username and password.
- Ported from TC4.
Revision ChangesPath
1.12 +8 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java
Index: BasicAuthenticator.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BasicAuthenticator.java 18 Jan 2005 22:11:57 - 1.11
+++ BasicAuthenticator.java 28 Apr 2005 18:55:57 - 1.12
@@ -176,14 +176,15 @@
authorizationBC.setOffset(authorizationBC.getOffset() - 6);
}
+
+principal = context.getRealm().authenticate(username, password);
+if (principal != null) {
+register(request, response, principal,
Constants.BASIC_METHOD,
+ username, password);
+return (true);
+}
}
-principal = context.getRealm().authenticate(username, password);
-if (principal != null) {
-register(request, response, principal, Constants.BASIC_METHOD,
- username, password);
-return (true);
-}
// Send an unauthorized response and an appropriate challenge
MessageBytes authenticate =
1.294 +6 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- changelog.xml 28 Apr 2005 12:32:05 - 1.293
+++ changelog.xml 28 Apr 2005 18:55:57 - 1.294
@@ -115,6 +115,12 @@
If APR as well as Tomcat's JNI wrapper for APR are present, use
APRized protocol handlers
instead of the regular ones (remm)
/update
+ fix
+bug22617/bug: When used with an EJB container and a realm that
supports the concept
+of an unauthenticated user (J2EE.3.4.3) BASIC authentication was
always authenticating
+users as the unauthenticated user without giving them a chance to
supply a username and
+password. (markt)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Peter, One of your related changes (http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-catalina/modules/cluster/build.xml?r1=1.14r2=1.15diff_format=h) has broken the 5.5 build on 1.4 JDKs :( Can you roll it back or commit an alternative please? Cheers, Mark [EMAIL PROTECTED] wrote: pero2005/04/22 13:38:38 Modified:webapps/docs changelog.xml Log: redesign DeltaManager restart under load Revision ChangesPath 1.291 +3 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- changelog.xml 15 Apr 2005 20:15:17 - 1.290 +++ changelog.xml 22 Apr 2005 20:38:38 - 1.291 @@ -146,7 +146,9 @@ update Refactor DeltaManager: - createSession call now ManagerBase super class method - - extract some long methods (pero) + - extract some long methods + - send GET_ALL_SESSION with session blocks + - don't sync sessions map when send all sessions (pero) /update update Add developer actions at to-do.txt (Proposal of changes) (pero) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml ssi-howto.xml
markt 2005/04/23 03:22:37 Modified:catalina/src/conf web.xml catalina/src/share/org/apache/catalina/ssi ResponseIncludeWrapper.java SSICommand.java SSIConditional.java SSIConfig.java SSIEcho.java SSIExec.java SSIFlastmod.java SSIFsize.java SSIInclude.java SSIMediator.java SSIPrintenv.java SSIProcessor.java SSIServlet.java SSIServletExternalResolver.java SSISet.java webapps/docs changelog.xml ssi-howto.xml Log: Provide an ServletFilter implementation of Server Side Includes (SSI). This was submitted by David Becker under bug 33106. Revision ChangesPath 1.57 +79 -0 jakarta-tomcat-catalina/catalina/src/conf/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- web.xml 4 Apr 2005 20:57:02 - 1.56 +++ web.xml 23 Apr 2005 10:22:37 - 1.57 @@ -206,6 +206,9 @@ /servlet + !-- NOTE: An SSI Filter is also available as an alternative SSI -- + !-- implementation. Use either the Servlet or the Filter but NOT both. -- + !-- -- !-- Server Side Includes processing servlet, which processes SSI -- !-- directives in HTML pages consistent with similar support in web -- !-- servers like Apache. Traditionally, this servlet is mapped to the -- @@ -362,6 +365,78 @@ -- + !-- == Built In Filter Definitions = -- + + !-- NOTE: An SSI Servlet is also available as an alternative SSI -- + !-- implementation. Use either the Servlet or the Filter but NOT both. -- + !-- -- + !-- Server Side Includes processing filter, which processes SSI -- + !-- directives in HTML pages consistent with similar support in web -- + !-- servers like Apache. Traditionally, this filter is mapped to the -- + !-- URL pattern *.shtml, though it can be mapped to * as it will -- + !-- selectively enable/disable SSI processing based on mime types. The -- + !-- contentType init param allows you to apply SSI processing to JSP -- + !-- pages, javascript, or any other content you wish. This filter -- + !-- supports the following initialization parameters (default values are -- + !-- in square brackets): -- + !-- -- + !-- contentType A regex pattern that must be matched before -- + !-- SSI processing is applied. -- + !-- [text/x-server-parsed-html(;.*)?] -- + !-- -- + !-- debug Debugging detail level for messages logged -- + !-- by this servlet. [0] -- + !-- -- + !-- expires The number of seconds before a page with SSI -- + !-- directives will expire. [No default] -- + !-- -- + !-- isVirtualWebappRelative -- + !-- Should virtual paths be interpreted as -- + !-- relative to the context root, instead of -- + !-- the server root? (0=false, 1=true) [0] -- + !-- -- + !-- -- + !-- IMPORTANT: To use the SSI filter, you also need to rename the -- + !--$CATALINA_HOME/server/lib/servlets-ssi.renametojar file -- + !--to $CATALINA_HOME/server/lib/servlets-ssi.jar -- + +!-- +filter +filter-namessi/filter-name +filter-class + org.apache.catalina.ssi.SSIFilter +/filter-class +init-param + param-namecontentType/param-name + param-valuetext/x-server-parsed-html(;.*)?/param-value +/init-param +init-param + param-namedebug/param-name + param-value0/param-value +/init-param +init-param + param-nameexpires/param-name +
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Hey Mark, I roll it back. Thanks Peter Mark Thomas schrieb: Peter, One of your related changes (http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-catalina/modules/cluster/build.xml?r1=1.14r2=1.15diff_format=h) has broken the 5.5 build on 1.4 JDKs :( Can you roll it back or commit an alternative please? Cheers, Mark [EMAIL PROTECTED] wrote: pero2005/04/22 13:38:38 Modified:webapps/docs changelog.xml Log: redesign DeltaManager restart under load Revision ChangesPath 1.291 +3 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- changelog.xml15 Apr 2005 20:15:17 -1.290 +++ changelog.xml22 Apr 2005 20:38:38 -1.291 @@ -146,7 +146,9 @@ update Refactor DeltaManager: - createSession call now ManagerBase super class method - - extract some long methods (pero)+ - extract some long methods + - send GET_ALL_SESSION with session blocks + - don't sync sessions map when send all sessions (pero) /update update Add developer actions at to-do.txt (Proposal of changes) (pero) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Thanks, Mark Peter Rossbach wrote: Hey Mark, I roll it back. Thanks Peter Mark Thomas schrieb: Peter, One of your related changes (http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-catalina/modules/cluster/build.xml?r1=1.14r2=1.15diff_format=h) has broken the 5.5 build on 1.4 JDKs :( Can you roll it back or commit an alternative please? Cheers, Mark [EMAIL PROTECTED] wrote: pero2005/04/22 13:38:38 Modified:webapps/docs changelog.xml Log: redesign DeltaManager restart under load Revision ChangesPath 1.291 +3 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- changelog.xml15 Apr 2005 20:15:17 -1.290 +++ changelog.xml22 Apr 2005 20:38:38 -1.291 @@ -146,7 +146,9 @@ update Refactor DeltaManager: - createSession call now ManagerBase super class method - - extract some long methods (pero)+ - extract some long methods + - send GET_ALL_SESSION with session blocks + - don't sync sessions map when send all sessions (pero) /update update Add developer actions at to-do.txt (Proposal of changes) (pero) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/04/22 13:38:38 Modified:webapps/docs changelog.xml Log: redesign DeltaManager restart under load Revision ChangesPath 1.291 +3 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- changelog.xml 15 Apr 2005 20:15:17 - 1.290 +++ changelog.xml 22 Apr 2005 20:38:38 - 1.291 @@ -146,7 +146,9 @@ update Refactor DeltaManager: - createSession call now ManagerBase super class method - - extract some long methods (pero) + - extract some long methods + - send GET_ALL_SESSION with session blocks + - don't sync sessions map when send all sessions (pero) /update update Add developer actions at to-do.txt (Proposal of changes) (pero) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/04/15 01:58:46
Modified:catalina/src/share/org/apache/catalina/startup
ContextRuleSet.java
webapps/docs changelog.xml
Log:
- Update changelog.
- I don't see the purpose of the copy CL rule, as
ContainerBase.getParentClassLoader will return the parent class loader anyway.
If a custom parent
is set, the rule will dumbly override it, thus it seems it never serves a
useful purpose. Maybe it used to be useful.
Revision ChangesPath
1.16 +2 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
Index: ContextRuleSet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ContextRuleSet.java 23 Sep 2004 06:58:52 - 1.15
+++ ContextRuleSet.java 15 Apr 2005 08:58:46 - 1.16
@@ -123,8 +123,7 @@
} else {
digester.addRule(prefix + Context, new
SetContextPropertiesRule());
}
-digester.addRule(prefix + Context,
- new CopyParentClassLoaderRule());
+
if (create) {
digester.addRule(prefix + Context,
new LifecycleListenerRule
1.289 +11 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- changelog.xml 12 Apr 2005 18:56:47 - 1.288
+++ changelog.xml 15 Apr 2005 08:58:46 - 1.289
@@ -42,9 +42,12 @@
update
Update to JDT from Eclipse 3.1M6, which is now feature complete
(remm)
/update
- update
+ update
Start refactoring, redesign and extend the cluster module (pero)
/update
+ add
+Add Apache Portable Runtime JNI wrapper and helper API (mturk)
+ /add
/changelog
/subsection
@@ -83,6 +86,10 @@
bug10385/bug: SSI Servlet now includes better support for files
that use character
encodings other than the platform default.(markt)
/fix
+ fix
+Remove CopyParentClassLoader rule, which doesn't seem to be doing
anything useful
+anymore. (remm)
+ /fix
/changelog
/subsection
@@ -94,6 +101,9 @@
update
Add some Mbean attributes and operations to ChannelSocket (pero)
/update
+ add
+Add Apache Portable Runtime based HTTP/1.1 protocol handler, without
SSL support (remm)
+ /add
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/04/15 13:15:17 Modified:webapps/docs changelog.xml Log: Refactoring and redesign cluster Revision ChangesPath 1.290 +29 -8 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.289 retrieving revision 1.290 diff -u -r1.289 -r1.290 --- changelog.xml 15 Apr 2005 08:58:46 - 1.289 +++ changelog.xml 15 Apr 2005 20:15:17 - 1.290 @@ -43,11 +43,20 @@ Update to JDT from Eclipse 3.1M6, which is now feature complete (remm) /update update -Start refactoring, redesign and extend the cluster module (pero) - /update - add -Add Apache Portable Runtime JNI wrapper and helper API (mturk) - /add +Refactoring, redesign and extend the cluster module + - Optimized performance and reduce memory usage + - Better JMX support + - add a lot of JMX stats attribute for better monitoring + - more config options + LifecycleListener + ClusterListener + more than one Cluster Valves + - better subclass support + - change a lot of existing API's (pero) + /update + add + Add Apache Portable Runtime JNI wrapper and helper API (mturk) + /add /changelog /subsection @@ -127,20 +136,32 @@ subsection name=Cluster changelog + add +Redesign SimpleTcpCluster message receiving to ClusterReceiverBase (pero) + /add + add +Cluster transfer all attributes to the generate session manager at addManager. +Remove some unused attributes at SimpleTcpCluster and ReplicationTransmitter (pero) + /add + update +Refactor DeltaManager: + - createSession call now ManagerBase super class method + - extract some long methods (pero) + /update update -update to-do.txt (pero) +Add developer actions at to-do.txt (Proposal of changes) (pero) /update update Small refactorings at FastAsyncSocketSender (pero) /update update -Refactor cluster message sending to lesser cpu and memory usage. +Redesign cluster message sending to lesser cpu and memory usage. Set at ReplicationTransmitter#compress=false as default. Change API from ClusterSender, ReplicaitonTransmitter, DataSender, SimpleTcpCluster (pero) /update add DeltaManager has now JMX expireAllLocalSessions and processExipre operation -for better cluster node shutdown handling (pero) +for better cluster node shutdown handling (usefull for testing only) (pero) /add add DataSender doWaitAckStats for better understanding wait ack problems (pero) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/04/12 11:56:47 Modified:webapps/docs changelog.xml Log: Optimize cluster send message Refactor ReplicationTransmitter Revision ChangesPath 1.288 +14 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- changelog.xml 11 Apr 2005 15:07:46 - 1.287 +++ changelog.xml 12 Apr 2005 18:56:47 - 1.288 @@ -42,6 +42,9 @@ update Update to JDT from Eclipse 3.1M6, which is now feature complete (remm) /update + update +Start refactoring, redesign and extend the cluster module (pero) + /update /changelog /subsection @@ -114,6 +117,17 @@ subsection name=Cluster changelog + update +update to-do.txt (pero) + /update + update +Small refactorings at FastAsyncSocketSender (pero) + /update + update +Refactor cluster message sending to lesser cpu and memory usage. +Set at ReplicationTransmitter#compress=false as default. Change API from +ClusterSender, ReplicaitonTransmitter, DataSender, SimpleTcpCluster (pero) + /update add DeltaManager has now JMX expireAllLocalSessions and processExipre operation for better cluster node shutdown handling (pero) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
subsection name=Cluster changelog add +DeltaManager has now JMX expireAllLocalSessions and processExipre operation +for better cluster node shutdown handling (pero) + /add Why would we want to invalidate all sessions active on one node of the cluster when bringing it down, as opposed to replicating the session data out to one or more other available nodes in the cluster and letting the other machine(s) handle them? Or, did you add these operations/methods for cases where the cluster is configured to keep any given session on exactly one node? (I wouldn't think so, since in that case what would the session clustering really be useful for?) Just curious.. -- Jason Brittain - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Yes your arguments are correct, but this method is very usefull to test the cluster implemention, a very important use case. :-) Thanks Peter Jason Brittain schrieb: subsection name=Cluster changelog add +DeltaManager has now JMX expireAllLocalSessions and processExipre operation +for better cluster node shutdown handling (pero) + /add Why would we want to invalidate all sessions active on one node of the cluster when bringing it down, as opposed to replicating the session data out to one or more other available nodes in the cluster and letting the other machine(s) handle them? Or, did you add these operations/methods for cases where the cluster is configured to keep any given session on exactly one node? (I wouldn't think so, since in that case what would the session clustering really be useful for?) Just curious.. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
larryi 2005/04/11 08:07:46 Modified:webapps/docs changelog.xml Log: Correct a correction. Mainly verifying my setup still works. :) Revision ChangesPath 1.287 +1 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.286 retrieving revision 1.287 diff -u -r1.286 -r1.287 --- changelog.xml 10 Apr 2005 19:29:09 - 1.286 +++ changelog.xml 11 Apr 2005 15:07:46 - 1.287 @@ -69,7 +69,7 @@ to it would leak a minimal amount of memory) (remm) /fix update -Re-aad patch causing Session.getId to throw an ISE, and make all internal components +Re-add patch causing Session.getId to throw an ISE, and make all internal components use a safe getIdInternal method (remm) /update update - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/04/10 09:27:13 Modified:webapps/docs changelog.xml Log: Cluster refactor and redesign a lot and porting the cluster 5.5.9 fix pack result. s. bug report http://issues.apache.org/bugzilla/show_bug.cgi?id=34389 Revision ChangesPath 1.285 +42 -6 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.284 retrieving revision 1.285 diff -u -r1.284 -r1.285 --- changelog.xml 9 Apr 2005 19:30:37 - 1.284 +++ changelog.xml 10 Apr 2005 16:27:13 - 1.285 @@ -56,7 +56,8 @@ [Modified patch from Ralf Hauser] (yoavs) /add add - Add MessageListener and LifecylceListener cluster saving to storeconfig module (pero) + Add MessageListener and LifecylceListener cluster saving to storeconfig module + (lt;Cluster ... gt;lt;ClusterListener className=org.apache.catalina.cluster.session.JvmRouteSessionIDBinderListener gt;) (pero) /add fix bug33743/bug: Add additional synchronization in webapp classloader to avoid @@ -87,6 +88,9 @@ update Add support for using Smart Cards as trust/keyStore. (billbarker) /update + update +Add some Mbean attributes and operations to ChannelSocket (pero) + /update /changelog /subsection @@ -109,12 +113,42 @@ /subsection subsection name=Cluster -changelog +changelog + add +DataSender doWaitAckStats for better understanding wait ack problems (pero) + /add + update +Refactor DeltaManager and add counter for cluster message send/receive message (pero) + /update + fix +bug34389/bug:Porting Clustering fix pack to 5.5.10 code base. +Remove synchonized from DataSender.pushMessage(). Very offen the +complete cluster blocking after replicated a bulk of new session messages under heavy load. +All cluster node standing for a lot of time and made nothing. +Fix it for pooled, asynchronous and fastasyncqueue replication mode. Very bad thing, sorry! (pero) + /fix + add +Add notifySessionListenersOnReplication attribute to SimpleTcpCluster to stop notify +event to SessionListener at backup nodes from create and destroy replicated session (pero) + /add + add +Add compress attribute to ClusterSender and ClusterReceiver interface. Now compress config +transfer from sender to receiver at SimpleTcpCluster. (pero) + /add + add +Add ClusterValve interface and implement it as ReplicationValve and JvmRouteBinderValve. Now both +Valves can be directly configured at server.xml Host/Cluster/Valve subelements. +Also this configuration are correctly handled with the StoreConfig module. (pero) + /add + update +Deactivate DataSender keepAliveMaxRequestCount change default to -1. +Cluster replication sockets are fast and very stable! (pero) + /update update Setup JvmRouteBinderValve as host valve instead context valve. Refactor the API a little bit. (pero) /update fix -Don't increment open socket counter before socket is really open, counte socket open failures (pero) +Don't increment open socket counter before socket is really open. Add socket open failures counter (pero) /fix add Add MessageListener support to cluster server.xml element (ClusterListener) to @@ -130,9 +164,11 @@ at ReplicationTransmitter. Check frequency can be change with attribute processSenderFrequency (default 2). (pero) /add - fix -Jdk13ReplicationListener active threads closed, when stop called (pero) - /fix + add +Remove useless Jdk13ReplicationListener,Jdk13ObjectReader. +Add SocketReplicationListener and SocketObjectReader to have nativ socket ClusterReceiver. +Also extract ClusterReceiverBase superclass for SocketReplicationListener and ReplicationListener (pero) + /add update Add and update some API documentation (pero) /update - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
