svn commit: r1195848 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/ha/session/ webapps/docs/

[kfujino]

Author: kfujino
Date: Tue Nov  1 07:00:21 2011
New Revision: 1195848

URL: http://svn.apache.org/viewvc?rev=1195848&view=rev
Log:
When Context manager does not exist, no context manager message is replied in 
order to avoid timeout (default 60 sec) of GET_ALL_SESSIONS sync phase.

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessage.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=1195848&r1=1195847&r2=1195848&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
 Tue Nov  1 07:00:21 2011
@@ -88,10 +88,21 @@ public class ClusterSessionListener exte
 }
 } else {
 ClusterManager mgr = (ClusterManager) managers.get(ctxname);
-if (mgr != null)
+if (mgr != null) {
 mgr.messageDataReceived(msg);
-else if (log.isWarnEnabled())
-log.warn("Context manager doesn't exist:" + ctxname);
+} else {
+if (log.isWarnEnabled())
+log.warn("Context manager doesn't exist:" + ctxname);
+
+// A no context manager message is replied in order to 
avoid
+// timeout of GET_ALL_SESSIONS sync phase.
+if (msg.getEventType() == 
SessionMessage.EVT_GET_ALL_SESSIONS) {
+SessionMessage replymsg = new 
SessionMessageImpl(ctxname,
+
SessionMessage.EVT_ALL_SESSION_NOCONTEXTMANAGER,
+null, 
"NO-CONTEXT-MANAGER","NO-CONTEXT-MANAGER-" + ctxname);
+cluster.send(replymsg, msg.getAddress());
+}
+}
 }
 }
 return;

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1195848&r1=1195847&r2=1195848&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
Tue Nov  1 07:00:21 2011
@@ -115,6 +115,7 @@ public class DeltaManager extends Cluste
 private boolean notifySessionListenersOnReplication = true;
 private boolean notifyContainerListenersOnReplication  = true;
 private volatile boolean stateTransfered = false ;
+private volatile boolean noContextManagerReceived = false ;
 private int stateTransferTimeout = 60;
 private boolean sendAllSessions = true;
 private boolean sendClusterDomainOnly = true ;
@@ -142,6 +143,7 @@ public class DeltaManager extends Cluste
 private long counterReceive_EVT_SESSION_DELTA = 0;
 private int counterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
 private long counterReceive_EVT_CHANGE_SESSION_ID = 0 ;
+private long counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER = 0 ;
 private long counterSend_EVT_GET_ALL_SESSIONS = 0 ;
 private long counterSend_EVT_ALL_SESSION_DATA = 0 ;
 private long counterSend_EVT_SESSION_CREATED = 0;
@@ -291,7 +293,14 @@ public class DeltaManager extends Cluste
 public long getCounterReceive_EVT_CHANGE_SESSION_ID() {
 return counterReceive_EVT_CHANGE_SESSION_ID;
 }
-
+
+/**
+ * @return Returns the counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER.
+ */
+public long getCounterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER() {
+return counterReceive_EVT_ALL_SESSION_NOCONTEXTMANAGER;
+}
+
 /**
  * @return Returns the processingTime.
  */
@@ -358,7 +367,15 @@ public class DeltaManager extends Cluste
 public void setStateTransfered(boolean stateTransfered) {
 this.stateTransfered = stateTransfered;
 }
-
+
+public boolean isNoContextManagerReceived() {
+return noContextManagerReceived;
+}
+
+public void setNoContextManagerReceived(boolean noContextManagerReceived) {
+this.noContextManagerReceive

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

[mturk]

Author: mturk
Date: Tue Nov  1 07:01:29 2011
New Revision: 1195850

URL: http://svn.apache.org/viewvc?rev=1195850&view=rev
Log:
Refactor main filter handler. Do not limit the size of header data (fixes 
BZ50233) by using jk_pool for huge headers

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

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195850&r1=1195849&r2=1195850&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 07:01:29 2011
@@ -167,7 +167,7 @@ static char HTTP_WORKER_HEADER_INDEX[RES
 
 #define BAD_REQUEST -1
 #define BAD_PATH-2
-#define MAX_SERVERNAME  128
+#define MAX_SERVERNAME  1024
 #define MAX_INSTANCEID  32
 #define MAX_PACKET_SIZE 65536
 
@@ -444,6 +444,8 @@ static struct error_reasons {
 #define JK_TOLOWER(x)   ((char)tolower((BYTE)(x)))
 #endif
 
+#define ISIZEOF(X)  (int)sizeof(X)
+
 #define GET_SERVER_VARIABLE_VALUE(name, place)  \
   do {  \
 (place) = NULL; \
@@ -589,9 +591,9 @@ static int get_registry_config_number(HK
   int *val);
 
 
-static int get_server_value(LPEXTENSION_CONTROL_BLOCK lpEcb,
-char *name,
-char *buf, DWORD bufsz);
+static BOOL get_server_value(LPEXTENSION_CONTROL_BLOCK lpEcb,
+ char *name,
+ char *buf, size_t bufsz);
 
 static int base64_encode_cert_len(int len);
 
@@ -882,7 +884,7 @@ static void write_error_response(PHTTP_F
 pfc->ServerSupportFunction(pfc,
SF_REQ_SEND_RESPONSE_HEADER,
status, 0, 0);
-len = (DWORD)(sizeof(HTML_ERROR_HEAD) - 1);
+len = ISIZEOF(HTML_ERROR_HEAD) - 1;
 pfc->WriteClient(pfc, HTML_ERROR_HEAD, &len,
  HSE_IO_SYNC);
 StringCbPrintf(body, sizeof(body), HTML_ERROR_BODY_FMT,
@@ -891,7 +893,7 @@ static void write_error_response(PHTTP_F
 len = (DWORD)(strlen(body));
 pfc->WriteClient(pfc, body, &len,
  HSE_IO_SYNC);
-len = (DWORD)(sizeof(HTML_ERROR_TAIL) - 1);
+len = ISIZEOF(HTML_ERROR_TAIL) - 1;
 pfc->WriteClient(pfc, HTML_ERROR_TAIL, &len,
  HSE_IO_SYNC);
 }
@@ -928,7 +930,7 @@ static void write_error_message(LPEXTENS
  0,
  (LPDWORD)CONTENT_TYPE);
 /* First write the HEAD */
-len = (DWORD)(sizeof(HTML_ERROR_HEAD) - 1);
+len = ISIZEOF(HTML_ERROR_HEAD) - 1;
 lpEcb->WriteClient(lpEcb->ConnID,
HTML_ERROR_HEAD, &len,
HSE_IO_SYNC);
@@ -939,7 +941,7 @@ static void write_error_message(LPEXTENS
 lpEcb->WriteClient(lpEcb->ConnID,
body, &len,
HSE_IO_SYNC);
-len = (DWORD)(sizeof(HTML_ERROR_TAIL) - 1);
+len = ISIZEOF(HTML_ERROR_TAIL) - 1;
 lpEcb->WriteClient(lpEcb->ConnID,
HTML_ERROR_TAIL, &len,
HSE_IO_SYNC);
@@ -1778,27 +1780,25 @@ static char *ap_pregsub(const char *inpu
 return dest;
 }
 
-static int simple_rewrite(char *uri)
+static char *simple_rewrite(jk_pool_t *p, const char *uri)
 {
 if (rewrite_map) {
 int i;
-char buf[8192];
 for (i = 0; i < jk_map_size(rewrite_map); i++) {
+size_t len;
 const char *src = jk_map_name_at(rewrite_map, i);
 if (*src == '~')
 continue;   /* Skip regexp rewrites */
-if (strncmp(uri, src, strlen(src)) == 0) {
-StringCbCopy(buf, sizeof(buf), jk_map_value_at(rewrite_map, 
i));
-StringCbCat(buf,  sizeof(buf), uri + strlen(src));
-StringCbCopy(uri, sizeof(buf), buf);
-return 1;
+len = strlen(src);
+if (strncmp(uri, src, len) == 0) {
+return jk_pool_strcat(p, jk_map_value_at(rewrite_map, i), uri 
+ len);
 }
 }
 }
-return 0;
+return NULL;
 }
 
-static int rregex_rewrite(char *uri)
+static char *rregex_rewrite(jk_pool_t *p, const char *uri)
 {
 ap_regmatch_t regm[AP_MAX_REG_MATCH];
 
@@ -1810,19 +1810,315 @@ static int rregex_rewrite(char *uri)
 char *subs = ap_pregsub(regexp->fake, uri,
AP_MAX_REG_MATCH, regm);
 if (subs) {
-char buf[8192];
-size_t diffsz = strlen(subs) - (regm[0].rm_eo - 
regm[0].rm_so);
-memcpy(&buf[0], uri, regm[0].rm_so);
-StringCbCopy(&buf[regm[0].rm_so], sizeof(buf) - 
regm[0].rm_so, subs);
- 

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

[mturk]

Author: mturk
Date: Tue Nov  1 07:06:33 2011
New Revision: 1195851

URL: http://svn.apache.org/viewvc?rev=1195851&view=rev
Log:
Use only valid port numbers

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

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195851&r1=1195850&r2=1195851&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 07:06:33 2011
@@ -1866,7 +1866,7 @@ static DWORD handle_notify_event(PHTTP_F
 const char *worker = NULL;
 rule_extension_t *extensions;
 int worker_index = -1;
-int port;
+int port = 0;
 jk_pool_atom_t pbuf[HUGE_POOL_SIZE];
 jk_pool_t pool;
 
@@ -1944,9 +1944,9 @@ static DWORD handle_notify_event(PHTTP_F
 len = ISIZEOF(szHB) - 1;
 if (pfc->GetServerVariable(pfc, "SERVER_NAME", &szHB[1], &len) && len > 1) 
{
 len = ISIZEOF(szPB);
-pfc->GetServerVariable(pfc, "SERVER_PORT", szPB, &len);
-port = atoi(szPB);
-if (port != 80 && port != 443) {
+if (pfc->GetServerVariable(pfc, "SERVER_PORT", szPB, &len))
+port = atoi(szPB);
+if (port != 0 && port != 80 && port != 443) {
 host = jk_pool_strcatv(&pool, szHB, ":", szPB, NULL);
 }
 else



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

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

[mturk]

Author: mturk
Date: Tue Nov  1 07:36:07 2011
New Revision: 1195856

URL: http://svn.apache.org/viewvc?rev=1195856&view=rev
Log:
Suppress size_t -> int warning

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

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1195856&r1=1195855&r2=1195856&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 07:36:07 2011
@@ -2000,7 +2000,7 @@ static DWORD handle_notify_event(PHTTP_F
 else if (uri_select_option == URI_SELECT_OPT_ESCAPED) {
 size_t elen  = strlen(uri) * 4;
 char *escuri = jk_pool_alloc(&pool, elen);
-if (!escape_url(uri, escuri, elen)) {
+if (!escape_url(uri, escuri, (int)elen)) {
 jk_log(logger, JK_LOG_ERROR,
"[%s] re-encoding request exceeds maximum buffer size.",
uri);
@@ -2017,7 +2017,7 @@ static DWORD handle_notify_event(PHTTP_F
 else if (uri_select_option == URI_SELECT_OPT_PROXY) {
 size_t clen  = strlen(uri) * 4;
 char *canuri = jk_pool_alloc(&pool, clen);
-if (!jk_canonenc(uri, canuri, clen)) {
+if (!jk_canonenc(uri, canuri, (int)clen)) {
 jk_log(logger, JK_LOG_ERROR,
"[%s] re-encoding request exceeds maximum buffer size.",
uri);



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

[GUMP@vmgump]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-validate has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-validate :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 31 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.5-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.5-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-01112011.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-01112011.jar:/srv/gump/public/workspace/junit/dist/junit-01112011.jar:/srv/gump
 
/public/workspace/junit/dist/junit-dep-01112011.jar:/srv/gump/public/workspace/google-guava/build/dist/guava-01112011/guava-01112011.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-01112011.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-01112011.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-01112011.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-01112011-dep.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml

download-validate:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-5.5-SNAPSHOT.jar

downloadzip:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle
[checkstyle] Running Checkstyle 5.5-SNAPSHOT on 2098 files
[checkstyle] Running Checkstyle 5.5-SNAPSHOT on 162 files
[checkstyle] Running Checkstyle 5.5-SNAPSHOT on 1037 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-7.0.x/java/org/apache/tomcat/util/http/Parameters.java:28:1:
 Disallowed import - org.apache.catalina.util.Enumerator.

BUILD FAILED
/srv/gump/public/workspace/tomcat-7.0.x/build.xml:468: Got 1 errors and 0 
warnings.

Total time: 30 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 06000601112011, vmgump.apache.org:vmgump:06000601112011
Gump E-mail Identifier (unique within run) #21.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 8.x, a web server implementing Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 34 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.5-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.5-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-01112011.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-01112011.jar:/srv/gump/public/workspace/junit/dist/junit-01112011.jar:/srv/gump
 
/public/workspace/junit/dist/junit-dep-01112011.jar:/srv/gump/public/workspace/google-guava/build/dist/guava-01112011/guava-01112011.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-01112011.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-01112011.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-01112011.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-01112011-dep.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

download-validate:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-5.5-SNAPSHOT.jar

downloadzip:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 5.5-SNAPSHOT on 2069 files
[checkstyle] Running Checkstyle 5.5-SNAPSHOT on 162 files
[checkstyle] Running Checkstyle 5.5-SNAPSHOT on 1036 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/tomcat/util/http/Parameters.java:27:1:
 Disallowed import - org.apache.catalina.util.Enumerator.

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:468: Got 1 errors and 0 
warnings.

Total time: 34 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 06000601112011, vmgump.apache.org:vmgump:06000601112011
Gump E-mail Identifier (unique within run) #22.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

svn commit: r1195899 - /tomcat/trunk/build.xml

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 09:47:42 2011
New Revision: 1195899

URL: http://svn.apache.org/viewvc?rev=1195899&view=rev
Log:
Fix checkstyle validation for startup/catalina.properties:
validation runs before compile and the file must be copied before validation 
runs.
Reconfigured the build so that copying occurs before validation.

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1195899&r1=1195898&r2=1195899&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Nov  1 09:47:42 2011
@@ -472,13 +472,15 @@
 
   
 
-  
-
+  
 
 
   
 
+  
+
+  
 
 

svn commit: r1195900 - in /tomcat/tc7.0.x/trunk: ./ build.xml

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 09:50:23 2011
New Revision: 1195900

URL: http://svn.apache.org/viewvc?rev=1195900&view=rev
Log:
Merged revision 1195899 from tomcat/trunk:
Fix checkstyle validation for startup/catalina.properties:
validation runs before compile and the file must be copied before validation 
runs.
Reconfigured the build so that copying occurs before validation.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/build.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 09:50:23 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116

svn commit: r1195905 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 09:59:13 2011
New Revision: 1195905

URL: http://svn.apache.org/viewvc?rev=1195905&view=rev
Log:
Followup to r1195531
Use standard Collections.enumeration() wrapper instead of our Enumerator class.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1195905&r1=1195904&r2=1195905&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Tue Nov  1 
09:59:13 2011
@@ -20,11 +20,11 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.catalina.util.Enumerator;
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.CharChunk;
@@ -113,7 +113,7 @@ public final class Parameters {
 
 public Enumeration getParameterNames() {
 handleQueryParameters();
-return new Enumerator(paramHashValues.keySet());
+return Collections.enumeration(paramHashValues.keySet());
 }
 
 // Shortcut.



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

svn commit: r1195909 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/Parameters.java

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 10:01:36 2011
New Revision: 1195909

URL: http://svn.apache.org/viewvc?rev=1195909&view=rev
Log:
Merged revision 1195905 from tomcat/trunk:
Followup to r1195531 (r1195537 in tc7)
Use standard Collections.enumeration() wrapper instead of our Enumerator class.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 10:01:36 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1

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

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 11:10:25 2011
New Revision: 1195927

URL: http://svn.apache.org/viewvc?rev=1195927&view=rev
Log:
Remove proposal that was applied in r1195848

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1195927&r1=1195926&r2=1195927&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  1 11:10:25 2011
@@ -102,13 +102,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* When Context manager does not exist, 
-  no context manager message is replied in order to avoid timeout (default 
60sec) 
-  of GET_ALL_SESSIONS sync phase. 
-  http://svn.apache.org/viewvc?view=revision&revision=1195393
-  +1: kfujino, markt, kkolinko
-  -1:
-
 PATCHES/ISSUES THAT ARE STALLED
 
 * Backport JSP unloading patch (BZ48358).



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

svn commit: r1195943 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 12:03:49 2011
New Revision: 1195943

URL: http://svn.apache.org/viewvc?rev=1195943&view=rev
Log:
Followup to parameter parsing improvements.
urlDecode() sets bc.charset.
If decoding is skipped (because there is no '%' in the string) we shouldn't 
forget to set the charset.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1195943&r1=1195942&r2=1195943&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Tue Nov  1 
12:03:49 2011
@@ -319,12 +319,14 @@ public final class Parameters {
 if (decodeName) {
 name = urlDecode(tmpName, charset);
 } else {
+tmpName.setCharset(charset);
 name = tmpName.toString();
 }
 
 if (decodeValue) {
 value = urlDecode(tmpValue, charset);
 } else {
+tmpValue.setCharset(charset);
 value = tmpValue.toString();
 }
 



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

svn commit: r1195944 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/Parameters.java

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 12:06:35 2011
New Revision: 1195944

URL: http://svn.apache.org/viewvc?rev=1195944&view=rev
Log:
Merged revision 1195943 from tomcat/trunk:
Followup to parameter parsing improvements.
urlDecode() sets bc.charset. If decoding is skipped (because there is no '%' in 
the string) we shouldn't forget to set the charset.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 12:06:35 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822

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

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 12:08:48 2011
New Revision: 1195946

URL: http://svn.apache.org/viewvc?rev=1195946&view=rev
Log:
Add a note

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1195946&r1=1195945&r2=1195946&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  1 12:08:48 2011
@@ -85,6 +85,7 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1195222&view=rev - performance tweaks
   +1: markt, jfclere
   -1:
+kkolinko: +r1195943 is needed, and maybe (r1195531+r1195905)
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52091
   Address performance issues related to log creation TagHandlerPool.



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

svn commit: r1195949 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 12:13:43 2011
New Revision: 1195949

URL: http://svn.apache.org/viewvc?rev=1195949&view=rev
Log:
Followup to r1195943
Simplify code. Move toString() call out of urlDecode() method.
No functional change.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1195949&r1=1195948&r2=1195949&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Tue Nov  1 
12:13:43 2011
@@ -317,18 +317,16 @@ public final class Parameters {
 String value;
 
 if (decodeName) {
-name = urlDecode(tmpName, charset);
-} else {
-tmpName.setCharset(charset);
-name = tmpName.toString();
+urlDecode(tmpName);
 }
+tmpName.setCharset(charset);
+name = tmpName.toString();
 
 if (decodeValue) {
-value = urlDecode(tmpValue, charset);
-} else {
-tmpValue.setCharset(charset);
-value = tmpValue.toString();
+urlDecode(tmpValue);
 }
+tmpValue.setCharset(charset);
+value = tmpValue.toString();
 
 addParameter(name, value);
 } catch (IOException e) {
@@ -359,14 +357,12 @@ public final class Parameters {
 }
 }
 
-private String urlDecode(ByteChunk bc, Charset charset)
+private void urlDecode(ByteChunk bc)
 throws IOException {
 if( urlDec==null ) {
 urlDec=new UDecoder();
 }
 urlDec.convert(bc);
-bc.setCharset(charset);
-return bc.toString();
 }
 
 public void processParameters( MessageBytes data, String encoding ) {



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

svn commit: r1195951 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/Parameters.java

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 12:16:04 2011
New Revision: 1195951

URL: http://svn.apache.org/viewvc?rev=1195951&view=rev
Log:
Merged revision 1195949 from tomcat/trunk:
Followup to r1195943 (r1195944 in TC7)
Simplify code. Move toString() call out of urlDecode() method.
No functional change.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 12:16:04 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189

svn commit: r1195953 - in /tomcat/trunk/java/org/apache/catalina: connector/ core/ ha/context/ session/ util/

[markt]

Author: markt
Date: Tue Nov  1 12:23:28 2011
New Revision: 1195953

URL: http://svn.apache.org/viewvc?rev=1195953&view=rev
Log:
Deprecate o.a.catalina.util.Enumerator and switch to
Collections.enumeration

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/util/Enumerator.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1195953&r1=1195952&r2=1195953&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Nov  1 
12:23:28 2011
@@ -29,10 +29,12 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.TimeZone;
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -69,7 +71,6 @@ import org.apache.catalina.core.Applicat
 import org.apache.catalina.core.AsyncContextImpl;
 import org.apache.catalina.deploy.LoginConfig;
 import org.apache.catalina.realm.GenericPrincipal;
-import org.apache.catalina.util.Enumerator;
 import org.apache.catalina.util.ParameterMap;
 import org.apache.catalina.util.StringParser;
 import org.apache.coyote.ActionCode;
@@ -965,7 +966,11 @@ public class Request
 if (isSecure() && !sslAttributesParsed) {
 getAttribute(Globals.CERTIFICATES_ATTR);
 }
-return new Enumerator(attributes.keySet(), true);
+// Take a copy to prevent ConncurrentModificationExceptions if used to
+// remove attributes
+Set names = new HashSet();
+names.addAll(attributes.keySet());
+return Collections.enumeration(names);
 }
 
 
@@ -1057,11 +1062,11 @@ public class Request
 }
 
 if (locales.size() > 0) {
-return (new Enumerator(locales));
+return Collections.enumeration(locales);
 }
 ArrayList results = new ArrayList();
 results.add(defaultLocale);
-return new Enumerator(results);
+return Collections.enumeration(results);
 
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1195953&r1=1195952&r2=1195953&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Nov  
1 12:23:28 2011
@@ -29,6 +29,7 @@ import java.util.EnumSet;
 import java.util.Enumeration;
 import java.util.EventListener;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -66,7 +67,6 @@ import org.apache.catalina.Service;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.deploy.FilterDef;
-import org.apache.catalina.util.Enumerator;
 import org.apache.catalina.util.RequestUtil;
 import org.apache.catalina.util.ResourceSet;
 import org.apache.catalina.util.ServerInfo;
@@ -232,9 +232,9 @@ public class ApplicationContext
  */
 @Override
 public Enumeration getAttributeNames() {
-
-return new Enumerator(attributes.keySet(), true);
-
+Set names = new HashSet();
+names.addAll(attributes.keySet());
+return Collections.enumeration(names);
 }
 
 
@@ -316,7 +316,7 @@ public class ApplicationContext
  */
 @Override
 public Enumeration getInitParameterNames() {
-return (new Enumerator(parameters.keySet()));
+return Collections.enumeration(parameters.keySet());
 }
 
 
@@ -670,7 +670,7 @@ public class ApplicationContext
 @Override
 @Deprecated
 public Enumeration getServletNames() {
-return (new Enumerator(emptyString));
+return Collections.enumeration(emptyString);
 }
 
 
@@ -680,7 +680,7 @@ public class ApplicationContext
 @Override
 @Deprecated
 public Enumeration getServlets() {
-return (new 

svn commit: r1195954 - /tomcat/trunk/java/org/apache/catalina/util/Enumerator.java

[markt]

Author: markt
Date: Tue Nov  1 12:24:09 2011
New Revision: 1195954

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

Removed:
tomcat/trunk/java/org/apache/catalina/util/Enumerator.java


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

svn commit: r1195955 - in /tomcat/trunk/java/org/apache/jasper: runtime/JspContextWrapper.java runtime/PageContextImpl.java util/Enumerator.java

[markt]

Author: markt
Date: Tue Nov  1 12:24:53 2011
New Revision: 1195955

URL: http://svn.apache.org/viewvc?rev=1195955&view=rev
Log:
Deprecate o.a.jasper.util.Enumerator. Use Collections.enumeration()

Modified:
tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/trunk/java/org/apache/jasper/util/Enumerator.java

Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java?rev=1195955&r1=1195954&r2=1195955&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java Tue Nov  
1 12:24:53 2011
@@ -20,6 +20,7 @@ package org.apache.jasper.runtime;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -43,7 +44,6 @@ import javax.servlet.jsp.tagext.BodyCont
 import javax.servlet.jsp.tagext.VariableInfo;
 
 import org.apache.jasper.compiler.Localizer;
-import org.apache.jasper.util.Enumerator;
 
 /**
  * Implementation of a JSP Context Wrapper.
@@ -233,7 +233,7 @@ public class JspContextWrapper extends P
 @Override
 public Enumeration getAttributeNamesInScope(int scope) {
 if (scope == PAGE_SCOPE) {
-return new Enumerator(pageAttributes.keySet().iterator());
+return Collections.enumeration(pageAttributes.keySet());
 }
 
 return invokingJspCtxt.getAttributeNamesInScope(scope);

Modified: tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1195955&r1=1195954&r2=1195955&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java Tue Nov  1 
12:24:53 2011
@@ -23,6 +23,7 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 
@@ -54,7 +55,6 @@ import org.apache.jasper.el.ExpressionEv
 import org.apache.jasper.el.FunctionMapperImpl;
 import org.apache.jasper.el.VariableResolverImpl;
 import org.apache.jasper.security.SecurityUtil;
-import org.apache.jasper.util.Enumerator;
 
 /**
  * Implementation of the PageContext class from the JSP spec. Also doubles as a
@@ -522,7 +522,7 @@ public class PageContextImpl extends Pag
 private Enumeration doGetAttributeNamesInScope(int scope) {
 switch (scope) {
 case PAGE_SCOPE:
-return new Enumerator(attributes.keySet().iterator());
+return Collections.enumeration(attributes.keySet());
 
 case REQUEST_SCOPE:
 return request.getAttributeNames();

Modified: tomcat/trunk/java/org/apache/jasper/util/Enumerator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/Enumerator.java?rev=1195955&r1=1195954&r2=1195955&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/util/Enumerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/util/Enumerator.java Tue Nov  1 
12:24:53 2011
@@ -35,7 +35,7 @@ import java.util.NoSuchElementException;
  * @author Craig R. McClanahan
  * @version $Id$
  */
-
+@Deprecated
 public final class Enumerator implements Enumeration {
 
 



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

svn commit: r1195956 - /tomcat/trunk/java/org/apache/jasper/util/Enumerator.java

[markt]

Author: markt
Date: Tue Nov  1 12:25:29 2011
New Revision: 1195956

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

Removed:
tomcat/trunk/java/org/apache/jasper/util/Enumerator.java


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

svn commit: r1195962 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/context/ java/org/apache/catalina/session/ java/org/a

[markt]

Author: markt
Date: Tue Nov  1 12:37:24 2011
New Revision: 1195962

URL: http://svn.apache.org/viewvc?rev=1195962&view=rev
Log:
Deprecate use of o.a.[catalina|jasper].util.enumeration and replace with 
Collections.enumeration

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationRequest.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Enumerator.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/Enumerator.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 12:37:24 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,11752

svn commit: r1195965 - /tomcat/trunk/webapps/docs/config/http.xml

[markt]

Author: markt
Date: Tue Nov  1 12:40:04 2011
New Revision: 1195965

URL: http://svn.apache.org/viewvc?rev=1195965&view=rev
Log:
Clarify behaviour if limit is reached

Modified:
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1195965&r1=1195964&r2=1195965&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Tue Nov  1 12:40:04 2011
@@ -94,9 +94,10 @@
 
 
 
-  The maximum number of parameters (GET plus POST) which will be
-  automatically parsed by the container. A value of less than 0 means no
-  limit. If not specified, a default of 1 is used.
+  The maximum number of parameter and value pairs (GET plus POST) which
+  will be automatically parsed by the container. Parameter and value pairs
+  beyond this limit will be ignored. A value of less than 0 means no limit.
+  If not specified, a default of 1 is used.
 
 
 



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

svn commit: r1195967 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/http.xml

[markt]

Author: markt
Date: Tue Nov  1 12:41:44 2011
New Revision: 1195967

URL: http://svn.apache.org/viewvc?rev=1195967&view=rev
Log:
Clarify behaviour if limit is reached

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 12:41:44 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190

svn commit: r1195968 - in /tomcat/trunk: java/org/apache/catalina/connector/LocalStrings.properties java/org/apache/catalina/connector/Request.java java/org/apache/tomcat/util/http/Parameters.java tes

[markt]

Author: markt
Date: Tue Nov  1 12:49:53 2011
New Revision: 1195968

URL: http://svn.apache.org/viewvc?rev=1195968&view=rev
Log:
Extend the parameter limits to multi-part processing

Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1195968&r1=1195967&r2=1195968&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Tue 
Nov  1 12:49:53 2011
@@ -62,6 +62,7 @@ coyoteRequest.authenticate.ise=Cannot ca
 coyoteRequest.uploadLocationInvalid=The temporary upload location [{0}] is not 
valid
 coyoteRequest.sessionEndAccessFail=Exception triggered ending access to 
session while recycling request
 coyoteRequest.sendfileNotCanonical=Unable to determine canonical name of file 
[{0}] specified for use with sendfile
+coyoteRequest.maxPostSizeExceeded=The multi-part request contained parameter 
data (excluding uploaded files) that exceeded the limit for maxPostSize set on 
the associated connector
 
 requestFacade.nullRequest=The request object has been recycled and is no 
longer associated with this facade
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1195968&r1=1195967&r2=1195968&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Nov  1 
12:49:53 2011
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 import java.security.Principal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -2520,26 +2521,59 @@ public class Request
 parts = new ArrayList();
 try {
 List items = upload.parseRequest(this);
+int maxPostSize = getConnector().getMaxPostSize();
+int postSize = 0;
+String enc = getCharacterEncoding();
+Charset charset = null;
+if (enc != null) {
+try {
+charset = B2CConverter.getCharset(enc);
+} catch (UnsupportedEncodingException e) {
+// Ignore
+}
+}
 for (FileItem item : items) {
 ApplicationPart part = new ApplicationPart(item, mce);
 parts.add(part);
 if (part.getFilename() == null) {
+String name = part.getName();
+String value = null;
 try {
 String encoding = parameters.getEncoding();
 if (encoding == null) {
 encoding = Parameters.DEFAULT_ENCODING;
 }
-parameters.addParameter(part.getName(),
-part.getString(encoding));
+value = part.getString(encoding);
 } catch (UnsupportedEncodingException uee) {
 try {
-parameters.addParameter(part.getName(),
-part.getString(
-Parameters.DEFAULT_ENCODING));
+value = 
part.getString(Parameters.DEFAULT_ENCODING);
 } catch (UnsupportedEncodingException e) {
 // Should not be possible
 }
 }
+if (maxPostSize > 0) {
+// Have to calculate equivalent size. Not completely
+// accurate but close enough.
+if (charset == null) {
+// Name length
+postSize += name.getBytes().length;
+} else {
+postSize += name.getBytes(charset).length;
+}
+if (value != null) {
+// Equals sign
+postSize++;
+// Value length
+postSize += part.getSize();
+}
+// Value separator
+  

svn commit: r1195977 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/tomcat/util/http/ test/org/apache/tomcat/util/http/

[markt]

Author: markt
Date: Tue Nov  1 13:09:56 2011
New Revision: 1195977

URL: http://svn.apache.org/viewvc?rev=1195977&view=rev
Log:
Extend the parameter limits to multi-part processing

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 13:09:56 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,

svn commit: r1195987 - /tomcat/tc7.0.x/trunk/modules/

[markt]

Author: markt
Date: Tue Nov  1 13:26:21 2011
New Revision: 1195987

URL: http://svn.apache.org/viewvc?rev=1195987&view=rev
Log:
Update to latest jdbc-pool changes

Modified:
tomcat/tc7.0.x/trunk/modules/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/modules/
--
--- svn:externals (original)
+++ svn:externals Tue Nov  1 13:26:21 2011
@@ -1 +1 @@
-^/tomcat/trunk/modules/jdbc-pool@1186681 jdbc-pool
+^/tomcat/trunk/modules/jdbc-pool@1189978 jdbc-pool



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

Tagging 7.0.23

[Mark Thomas]

It is that time again. I plan to tag 7.0.23 later today once I have run
the unit tests and the TCKs to check all is well.

If you have anything you want to get into this release, now is the time
to commit it.

Cheers,

Mark

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

DO NOT REPLY [Bug 52119] New: Add Diablo JDK to default JDK location search path

[bugzilla]

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

 Bug #: 52119
   Summary: Add Diablo JDK to default JDK location search path
   Product: Tomcat Native
   Version: 1.1.22
  Platform: PC
OS/Version: FreeBSD
Status: NEW
  Severity: normal
  Priority: P2
 Component: Library
AssignedTo: dev@tomcat.apache.org
ReportedBy: 1983-01...@gmx.net
Classification: Unclassified


Diablo JDK 1.6 on FreeBSD ist not found by default by the configure script. I
have adapted the tcnative.m4 file. configure runs now of of the box.

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

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

DO NOT REPLY [Bug 52119] Add Diablo JDK to default JDK location search path

[bugzilla]

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

--- Comment #1 from Michael Osipov <1983-01...@gmx.net> 2011-11-01 14:14:17 UTC 
---
Created attachment 27884
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27884
Patch for tcnative.m4

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

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

Re: Tagging 7.0.23

[Konstantin Kolinko]

2011/11/1 Mark Thomas :
> It is that time again. I plan to tag 7.0.23 later today once I have run
> the unit tests and the TCKs to check all is well.
>
> If you have anything you want to get into this release, now is the time
> to commit it.

1) Re: http://svn.apache.org/viewvc?view=revision&revision=1195965

Applies to AJP as well.

Is it possible to throw a runtime exception from parseParameters()
when the limit is reached instead of dropping the parameters, or you
think the API does not allow it?

2) http://markmail.org/message/5k4urwimvvmeqees


Best regards,
Konstantin Kolinko

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

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

[mturk]

Author: mturk
Date: Tue Nov  1 14:33:14 2011
New Revision: 1196019

URL: http://svn.apache.org/viewvc?rev=1196019&view=rev
Log:
Escaped uri can in theory have max 3 times the original size. No need for extra 
alloc

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

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1196019&r1=1196018&r2=1196019&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 14:33:14 2011
@@ -1998,7 +1998,7 @@ static DWORD handle_notify_event(PHTTP_F
 forwardURI = uri_undec;
 }
 else if (uri_select_option == URI_SELECT_OPT_ESCAPED) {
-size_t elen  = strlen(uri) * 4;
+size_t elen  = strlen(uri) * 3 + 1;
 char *escuri = jk_pool_alloc(&pool, elen);
 if (!escape_url(uri, escuri, (int)elen)) {
 jk_log(logger, JK_LOG_ERROR,
@@ -2015,9 +2015,9 @@ static DWORD handle_notify_event(PHTTP_F
 forwardURI = escuri;
 }
 else if (uri_select_option == URI_SELECT_OPT_PROXY) {
-size_t clen  = strlen(uri) * 4;
-char *canuri = jk_pool_alloc(&pool, clen);
-if (!jk_canonenc(uri, canuri, (int)clen)) {
+size_t elen  = strlen(uri) * 3 + 1;
+char *escuri = jk_pool_alloc(&pool, elen);
+if (!jk_canonenc(uri, escuri, (int)elen)) {
 jk_log(logger, JK_LOG_ERROR,
"[%s] re-encoding request exceeds maximum buffer size.",
uri);
@@ -2028,8 +2028,8 @@ static DWORD handle_notify_event(PHTTP_F
 if (JK_IS_DEBUG_LEVEL(logger))
 jk_log(logger, JK_LOG_DEBUG,
"fowarding escaped URI [%s]",
-   canuri);
-forwardURI = canuri;
+   escuri);
+forwardURI = escuri;
 }
 else {
 forwardURI = uri;



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

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

[mturk]

Author: mturk
Date: Tue Nov  1 16:07:10 2011
New Revision: 1196077

URL: http://svn.apache.org/viewvc?rev=1196077&view=rev
Log:
Axe trailing spaces

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

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1196077&r1=1196076&r2=1196077&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 16:07:10 2011
@@ -1814,7 +1814,7 @@ static char *rregex_rewrite(jk_pool_t *p
 size_t orgsz = strlen(uri);
 size_t subsz = strlen(subs);
 size_t lefts = orgsz - regm[0].rm_eo;
-
+
 ptr = buf = jk_pool_alloc(p, regm[0].rm_so + subsz + lefts 
+ 1);
 memcpy(buf, uri, regm[0].rm_so);
 ptr += regm[0].rm_so;
@@ -1847,7 +1847,7 @@ static __inline LPSTR get_pheader(jk_poo
 
 if (!pfp->GetHeader(pfc, lpszName, lpszBuf, &dwLen)) {
 if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-return NULL;   
+return NULL;
 if ((rv = jk_pool_alloc(pool, dwLen)) == NULL)
 return NULL;
 /* Try again with dynamic buffer */
@@ -1902,7 +1902,7 @@ static DWORD handle_notify_event(PHTTP_F
 ld->request_matched = JK_FALSE;
 }
 uri = get_pheader(&pool, pfp, pfc, "url", szUB, sizeof(szUB));
-if (uri == NULL) {
+if (uri == NULL) {
 jk_log(logger, JK_LOG_ERROR,
"error while getting the url");
 return SF_STATUS_REQ_ERROR;
@@ -1922,7 +1922,7 @@ static DWORD handle_notify_event(PHTTP_F
 if (uri_select_option == URI_SELECT_OPT_UNPARSED) {
 /* Duplicate unparsed uri */
 uri_undec = jk_pool_strdup(&pool, uri);
-}   
+}
 rc = unescape_url(uri);
 if (rc == BAD_REQUEST) {
 jk_log(logger, JK_LOG_ERROR,
@@ -1941,7 +1941,7 @@ static DWORD handle_notify_event(PHTTP_F
 goto cleanup;
 }
 getparents(uri);
-len = ISIZEOF(szHB) - 1;
+len = ISIZEOF(szHB) - 1;
 if (pfc->GetServerVariable(pfc, "SERVER_NAME", &szHB[1], &len) && len > 1) 
{
 len = ISIZEOF(szPB);
 if (pfc->GetServerVariable(pfc, "SERVER_PORT", szPB, &len))
@@ -2023,7 +2023,7 @@ static DWORD handle_notify_event(PHTTP_F
uri);
 write_error_response(pfc, 400);
 rv = SF_STATUS_REQ_FINISHED;
-goto cleanup;
+goto cleanup;
 }
 if (JK_IS_DEBUG_LEVEL(logger))
 jk_log(logger, JK_LOG_DEBUG,
@@ -2052,13 +2052,13 @@ static DWORD handle_notify_event(PHTTP_F
 forwardURI = rewriteURI;
 }
 itoa(worker_index, swindex, 10);
-rs = pfp->AddHeader(pfc, URI_HEADER_NAME, forwardURI); 
+rs = pfp->AddHeader(pfc, URI_HEADER_NAME, forwardURI);
 if (rs && query)
-rs = pfp->AddHeader(pfc, QUERY_HEADER_NAME, query); 
+rs = pfp->AddHeader(pfc, QUERY_HEADER_NAME, query);
 rs = rs && pfp->AddHeader(pfc, WORKER_HEADER_NAME, (LPSTR)worker);
 rs = rs && pfp->AddHeader(pfc, WORKER_HEADER_INDEX, swindex);
 rs = rs && pfp->SetHeader(pfc, "url", extension_uri);
-
+
 if (!rs) {
 jk_log(logger, JK_LOG_ERROR,
"error while adding request headers");
@@ -2112,13 +2112,13 @@ static DWORD handle_notify_event(PHTTP_F
"removing session identifier [%s] for non servlet 
url [%s]",
jsessionid, uri);
 *jsessionid = '\0';
-pfp->SetHeader(pfc, "url", uri);
+pfp->SetHeader(pfc, "url", uri);
 }
 }
 }
 cleanup:
 jk_close_pool(&pool);
-return rv;
+return rv;
 }
 
 DWORD WINAPI HttpFilterProc(PHTTP_FILTER_CONTEXT pfc,
@@ -2432,7 +2432,6 @@ BOOL WINAPI DllMain(HINSTANCE hInst,
 
 JK_INIT_CS(&init_cs, rc);
 JK_INIT_CS(&log_cs, rc);
-
 break;
 case DLL_PROCESS_DETACH:
 __try {
@@ -2817,6 +2816,8 @@ static BOOL initialize_extension(void)
 if (read_registry_init_data()) {
 if (get_iis_info(&iis_info) != JK_TRUE) {
 jk_log(logger, JK_LOG_ERROR, "Could not retrieve IIS version from 
registry");
+}
+else {
 if (use_auth_notification_flags)
 iis_info.filter_notify_event = SF_NOTIFY_AUTH_COMPLETE;
 else
@@ -2934,6 +2935,7 @@ static int read_registry_init_data(void)
 else {
 RegCloseKey(hkey);
 }
+
 return ok;
 }
 
@@ -3233,7 +3235,7 @@ static int init_ws_service(isapi_private
 &huge_buf_sz)) {
 if (GetLastE

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

[mturk]

Author: mturk
Date: Tue Nov  1 16:09:50 2011
New Revision: 1196081

URL: http://svn.apache.org/viewvc?rev=1196081&view=rev
Log:
Axe old default value. extension_uri param is required, so no point to have 
default value

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

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1196081&r1=1196080&r2=1196081&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 16:09:50 2011
@@ -491,8 +491,7 @@ static jk_logger_t *logger = NULL;
 static JK_CRIT_SEC log_cs;
 static char *CONTENT_TYPE = "Content-Type:text/html\r\n\r\n";
 
-static char extension_uri[INTERNET_MAX_URL_LENGTH] =
-"/jakarta/isapi_redirect.dll";
+static char extension_uri[INTERNET_MAX_URL_LENGTH];
 static char log_file[MAX_PATH * 2];
 static char log_file_effective[MAX_PATH * 2];
 static int  log_level = JK_LOG_DEF_LEVEL;



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

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

[mturk]

Author: mturk
Date: Tue Nov  1 16:39:24 2011
New Revision: 1196108

URL: http://svn.apache.org/viewvc?rev=1196108&view=rev
Log:
Fix log line endings. Having CR LF appended results in CR CR LF to get written. 
MSVCRT automatically sets CRLF instead LF unless the file is opened in binary 
mode

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

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1196108&r1=1196107&r2=1196108&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 16:39:24 2011
@@ -2525,7 +2525,7 @@ static int init_logger(int rotate, jk_lo
 /* Close the current log file if required, and the effective log file name 
has changed */
 if (log_open && strncmp(log_file_name, log_file_effective, 
strlen(log_file_name)) != 0) {
 FILE* lf = ((jk_file_logger_t* )logger->logger_private)->logfile;
-fprintf(lf, "Log rotated to %s\r\n", log_file_name);
+fprintf(lf, "Log rotated to %s\n", log_file_name);
 fflush(lf);
 rc = jk_close_file_logger(&logger);
 log_open = JK_FALSE;
@@ -2595,19 +2595,21 @@ static int JK_METHOD iis_log_to_file(jk_
 rc = JK_TRUE;
 
 if (p->logfile) {
+#if 0
 what[used++] = '\r';
+#endif
 what[used++] = '\n';
 what[used] = '\0';
 
 /* Perform logging within critical section to protect rotation */
-JK_ENTER_CS(&(log_cs), rc);
-if (rc && rotate_log_file(&l)) {
+JK_ENTER_CS(&log_cs, rc);
+if (rotate_log_file(&l)) {
 /* The rotation process will reallocate the jk_logger_t 
structure, so refetch */
 FILE *rotated = ((jk_file_logger_t 
*)l->logger_private)->logfile;
 fputs(what, rotated);
 fflush(rotated);
-JK_LEAVE_CS(&(log_cs), rc);
 }
+JK_LEAVE_CS(&log_cs, rc);
 }
 }
 return rc;



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

DO NOT REPLY [Bug 50233] support long URLs (more than 2048)

[bugzilla]

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

Mladen Turk  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mladen Turk  2011-11-01 17:14:18 UTC ---
Fixed in the trunk and will be part of next release.
Both uri and query are now dynamically allocated and in theory have no limit.
Not however that we are still limited by AJP protocol itself which doesn't
allow initial header to be larger then 8K (64K if large AJP message size is
used)

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

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

svn commit: r1196151 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

[mturk]

Author: mturk
Date: Tue Nov  1 17:17:22 2011
New Revision: 1196151

URL: http://svn.apache.org/viewvc?rev=1196151&view=rev
Log:
Mark BZ50233 as fixed

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

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1196151&r1=1196150&r2=1196151&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Tue Nov  1 17:17:22 2011
@@ -44,6 +44,9 @@
   
   
 
+  
+50233: Do not use hard limit on uri size (mturk).
+  
   
 IIS: Use Windows Server 2003 SP1, Windows XP SP2 as minimal
 version supported. (mturk)



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

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

[Konstantin Kolinko]

2011/11/1  :
> Author: mturk
> Date: Tue Nov  1 16:07:10 2011
> New Revision: 1196077
>
> URL: http://svn.apache.org/viewvc?rev=1196077&view=rev
> Log:
> Axe trailing spaces
>
> Modified:
>    tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
>
> Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
> URL: 
> http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1196077&r1=1196076&r2=1196077&view=diff
>

> --- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
> +++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 16:07:10 2011
> @@ -2817,6 +2816,8 @@ static BOOL initialize_extension(void)
>     if (read_registry_init_data()) {
>         if (get_iis_info(&iis_info) != JK_TRUE) {
>             jk_log(logger, JK_LOG_ERROR, "Could not retrieve IIS version from 
> registry");
> +        }
> +        else {
>             if (use_auth_notification_flags)
>                 iis_info.filter_notify_event = SF_NOTIFY_AUTH_COMPLETE;
>             else

You not only axed the whitespace, but also added the above "else" into
initialize_extension(void) method.

So filter_notify_event now defaults to 0 if registry cannot be read.

If that is expected maybe change the following log message in
init_jk(char *serverName)
to print "NONE" for the value of 0 instead of "UNKNOWN".

2669jk_log(logger, JK_LOG_DEBUG, "Using notification event %s (0x%08x)",
2670(iis_info.filter_notify_event == SF_NOTIFY_AUTH_COMPLETE) ?
2671"SF_NOTIFY_AUTH_COMPLETE" :
2672((iis_info.filter_notify_event == SF_NOTIFY_PREPROC_HEADERS) ?
2673"SF_NOTIFY_PREPROC_HEADERS" : "UNKNOWN"),
2674iis_info.filter_notify_event);

Best regards,
Konstantin Kolinko

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

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

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 18:06:16 2011
New Revision: 1196175

URL: http://svn.apache.org/viewvc?rev=1196175&view=rev
Log:
Make sure that ISE thrown by parseParts() or by addParameter() is remembered 
and rethrown when getParts() is called.

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

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1196175&r1=1196174&r2=1196175&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Nov  1 
18:06:16 2011
@@ -2584,6 +2584,9 @@ public class Request
 partsParseException = new IllegalStateException(e);
 } catch (FileUploadException e) {
 partsParseException = new IOException(e);
+} catch (IllegalStateException e) {
+checkSwallowInput();
+partsParseException = e;
 }
 
 return;



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

svn commit: r1196177 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/Request.java

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 18:09:00 2011
New Revision: 1196177

URL: http://svn.apache.org/viewvc?rev=1196177&view=rev
Log:
Merged revision 1196175 from tomcat/trunk:
Make sure that ISE thrown by parseParts() or by addParameter() is remembered 
and rethrown when getParts() is called.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 18:09:00 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-118

svn commit: r1196179 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java tomcat7-war-runner/src/main/java/org/apache

[olamy]

Author: olamy
Date: Tue Nov  1 18:10:01 2011
New Revision: 1196179

URL: http://svn.apache.org/viewvc?rev=1196179&view=rev
Log:
[MTOMCAT-103] Executable War fails to run with a NullPointerException
do not record jar entry starting with / remove it.

Modified:

tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1196179&r1=1196178&r2=1196179&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
 Tue Nov  1 18:10:01 2011
@@ -282,10 +282,11 @@ public abstract class AbstractExecWarMoj
 
 if ( "war".equals( project.getPackaging() ) )
 {
-os.putArchiveEntry( new JarArchiveEntry( path + ".war" ) );
+
+os.putArchiveEntry( new JarArchiveEntry( 
StringUtils.removeStart( path, "/" ) + ".war" ) );
 IOUtils.copy( new FileInputStream( projectArtifact.getFile() 
), os );
 os.closeArchiveEntry();
-properties.put( Tomcat7Runner.WARS_KEY, path + ".war|" + path 
);
+properties.put( Tomcat7Runner.WARS_KEY, 
StringUtils.removeStart( path, "/" ) + ".war|" + path );
 }
 
 if ( "pom".equals( project.getPackaging() ) && ( 
warRunDependencies != null
@@ -318,13 +319,11 @@ public abstract class AbstractExecWarMoj
 if ( propertyWarValue != null )
 {
 properties.put( Tomcat7Runner.WARS_KEY,
-propertyWarValue + ";" + 
warFileName + "|"
-+ warRunDependency.contextPath 
);
+propertyWarValue + ";" + 
warFileName + "|" + warRunDependency.contextPath );
 }
 else
 {
-properties.put( Tomcat7Runner.WARS_KEY,
-warFileName + "|" + 
warRunDependency.contextPath );
+properties.put( Tomcat7Runner.WARS_KEY, 
warFileName + "|" + warRunDependency.contextPath );
 }
 }
 }

Modified: 
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1196179&r1=1196178&r2=1196179&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
 Tue Nov  1 18:10:01 2011
@@ -343,7 +343,12 @@ public class Tomcat7Runner
 inputStream = 
Thread.currentThread().getContextClassLoader().getResourceAsStream( "conf/" + 
fileName );
 if ( inputStream != null )
 {
-expand( inputStream, new File( extractDirectory, "conf/" + 
fileName ) );
+File confDirectory = new File( extractDirectory, "conf" );
+if ( !confDirectory.exists() )
+{
+confDirectory.mkdirs();
+}
+expand( inputStream, new File( confDirectory, fileName ) );
 }
 }
 finally



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

[jira] [Closed] (MTOMCAT-103) Executable War fails to run with a NullPointerException

[Olivier Lamy (Closed) (JIRA)]

 [ 
https://issues.apache.org/jira/browse/MTOMCAT-103?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Olivier Lamy closed MTOMCAT-103.


Resolution: Fixed

should be fixed now. issue with path started with /
If you still have issues add a comment with stack trace.
Thanks.

> Executable War fails to run with a NullPointerException
> ---
>
> Key: MTOMCAT-103
> URL: https://issues.apache.org/jira/browse/MTOMCAT-103
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.0
> Environment: Mac OSX (tried on windows 7 as well)
>Reporter: Keith Corbin
>Assignee: Olivier Lamy
>Priority: Critical
> Fix For: 2.0
>
>
> Running the package goal with maven with the tomcat7 plugin configured the 
> generated executable war fails to run.  The error is:
> $ java -jar ./smapi-1.0-war-exec.jar -debug
> populateWebAppWarPerContext warValue:/smapi-1.0.war|/smapi-1.0
> populateWebAppWarPerContext contextValue/warFileName:/smapi-1.0//smapi-1.0.war
> webappWarPerContext entry key/value: /smapi-1.0//smapi-1.0.war
> Exception in thread "main" java.lang.NullPointerException
>   at 
> org.apache.tomcat.maven.runner.Tomcat7Runner.expand(Tomcat7Runner.java:406)
>   at 
> org.apache.tomcat.maven.runner.Tomcat7Runner.extract(Tomcat7Runner.java:309)
>   at 
> org.apache.tomcat.maven.runner.Tomcat7Runner.run(Tomcat7Runner.java:98)
>   at 
> org.apache.tomcat.maven.runner.Tomcat7RunnerCli.main(Tomcat7RunnerCli.java:144)

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira



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

[jira] [Commented] (MTOMCAT-103) Executable War fails to run with a NullPointerException

[Hudson (Commented) (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-103?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13141419#comment-13141419
 ] 

Hudson commented on MTOMCAT-103:


Integrated in TomcatMavenPlugin #56 (See 
[https://builds.apache.org/job/TomcatMavenPlugin/56/])
[MTOMCAT-103] Executable War fails to run with a NullPointerException
do not record jar entry starting with / remove it.

olamy : http://svn.apache.org/viewvc/?view=rev&rev=1196179
Files : 
* 
/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
* 
/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java


> Executable War fails to run with a NullPointerException
> ---
>
> Key: MTOMCAT-103
> URL: https://issues.apache.org/jira/browse/MTOMCAT-103
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.0
> Environment: Mac OSX (tried on windows 7 as well)
>Reporter: Keith Corbin
>Assignee: Olivier Lamy
>Priority: Critical
> Fix For: 2.0
>
>
> Running the package goal with maven with the tomcat7 plugin configured the 
> generated executable war fails to run.  The error is:
> $ java -jar ./smapi-1.0-war-exec.jar -debug
> populateWebAppWarPerContext warValue:/smapi-1.0.war|/smapi-1.0
> populateWebAppWarPerContext contextValue/warFileName:/smapi-1.0//smapi-1.0.war
> webappWarPerContext entry key/value: /smapi-1.0//smapi-1.0.war
> Exception in thread "main" java.lang.NullPointerException
>   at 
> org.apache.tomcat.maven.runner.Tomcat7Runner.expand(Tomcat7Runner.java:406)
>   at 
> org.apache.tomcat.maven.runner.Tomcat7Runner.extract(Tomcat7Runner.java:309)
>   at 
> org.apache.tomcat.maven.runner.Tomcat7Runner.run(Tomcat7Runner.java:98)
>   at 
> org.apache.tomcat.maven.runner.Tomcat7RunnerCli.main(Tomcat7RunnerCli.java:144)

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira



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

[jira] [Commented] (MTOMCAT-103) Executable War fails to run with a NullPointerException

[Keith Corbin (Commented) (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-103?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13141454#comment-13141454
 ] 

Keith Corbin commented on MTOMCAT-103:
--

That fixed it for me.  Thanks so much for your fast resolution.  This is an 
amazing plug-in keep up the good work.

> Executable War fails to run with a NullPointerException
> ---
>
> Key: MTOMCAT-103
> URL: https://issues.apache.org/jira/browse/MTOMCAT-103
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.0
> Environment: Mac OSX (tried on windows 7 as well)
>Reporter: Keith Corbin
>Assignee: Olivier Lamy
>Priority: Critical
> Fix For: 2.0
>
>
> Running the package goal with maven with the tomcat7 plugin configured the 
> generated executable war fails to run.  The error is:
> $ java -jar ./smapi-1.0-war-exec.jar -debug
> populateWebAppWarPerContext warValue:/smapi-1.0.war|/smapi-1.0
> populateWebAppWarPerContext contextValue/warFileName:/smapi-1.0//smapi-1.0.war
> webappWarPerContext entry key/value: /smapi-1.0//smapi-1.0.war
> Exception in thread "main" java.lang.NullPointerException
>   at 
> org.apache.tomcat.maven.runner.Tomcat7Runner.expand(Tomcat7Runner.java:406)
>   at 
> org.apache.tomcat.maven.runner.Tomcat7Runner.extract(Tomcat7Runner.java:309)
>   at 
> org.apache.tomcat.maven.runner.Tomcat7Runner.run(Tomcat7Runner.java:98)
>   at 
> org.apache.tomcat.maven.runner.Tomcat7RunnerCli.main(Tomcat7RunnerCli.java:144)

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira



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

svn commit: r1196212 - in /tomcat/trunk/java/org/apache/coyote/http11: InternalNioInputBuffer.java LocalStrings.properties

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 19:04:36 2011
New Revision: 1196212

URL: http://svn.apache.org/viewvc?rev=1196212&view=rev
Log:
Add additional state in HTTP Nio connector non-blocking HTTP headers parsing
as a self-guard against unexpected call to parseHeaders() after the parsing has 
already been completed
without a prior call to recycle() or nextRequest().
One such occurrence was observed because of a bug that did not recycle the 
buffer and was fixed a while ago.

The request will be rejected with error 400. The message is visible only with 
debug logging in AbstractHttp11Processor.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1196212&r1=1196211&r2=1196212&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Tue 
Nov  1 19:04:36 2011
@@ -88,7 +88,11 @@ public class InternalNioInputBuffer exte
 /**
  * Reading all bytes until the next CRLF. The line is being ignored.
  */
-HEADER_SKIPLINE
+HEADER_SKIPLINE,
+/**
+ * Done parsing headers. Request body should follow.
+ */
+HEADERS_DONE
 }
 
 // --- Constructors
@@ -469,6 +473,11 @@ public class InternalNioInputBuffer exte
 @Override
 public boolean parseHeaders()
 throws IOException {
+if (headerParsePos == HeaderParsePosition.HEADERS_DONE) {
+throw new IllegalStateException(
+sm.getString("iib.parseheaders.ise.error"));
+}
+
 HeaderParseStatus status = HeaderParseStatus.HAVE_MORE_HEADERS;
 
 do {
@@ -527,6 +536,7 @@ public class InternalNioInputBuffer exte
 // Skip
 } else if (chr == Constants.LF) {
 pos++;
+headerParsePos = HeaderParsePosition.HEADERS_DONE;
 return HeaderParseStatus.DONE;
 } else {
 break;

Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties?rev=1196212&r1=1196211&r2=1196212&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties Tue Nov  
1 19:04:36 2011
@@ -28,4 +28,5 @@ http11processor.sendfile.error=Error sen
 iib.eof.error=Unexpected EOF read on the socket
 iib.invalidheader=The HTTP header line [{0}] does not conform to RFC 2616 and 
has been ignored.
 iib.invalidmethod=Invalid character (CR or LF) found in method name
+iib.parseheaders.ise.error=Unexpected state: headers already parsed. Buffer 
not recycled?
 iib.requestheadertoolarge.error=Request header is too large



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

svn commit: r1196223 - in /tomcat/trunk/java/org/apache/coyote/http11: InternalAprInputBuffer.java InternalInputBuffer.java InternalNioInputBuffer.java

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 19:17:39 2011
New Revision: 1196223

URL: http://svn.apache.org/viewvc?rev=1196223&view=rev
Log:
Alternative implementation for r1196212 that covers all HTTP connectors.
Self-guard against unexpected call to parseHeaders() after the parsing has 
already been completed
without a prior call to recycle() or nextRequest().

There is already a flag variable (parsingHeader), so no need for additional 
state in InternalNioInputBuffer.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1196223&r1=1196222&r2=1196223&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Tue 
Nov  1 19:17:39 2011
@@ -304,6 +304,10 @@ public class InternalAprInputBuffer exte
 @Override
 public boolean parseHeaders()
 throws IOException {
+if (!parsingHeader) {
+throw new IllegalStateException(
+sm.getString("iib.parseheaders.ise.error"));
+}
 
 while (parseHeader()) {
 // Loop until there are no more headers

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=1196223&r1=1196222&r2=1196223&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java Tue Nov 
 1 19:17:39 2011
@@ -260,6 +260,10 @@ public class InternalInputBuffer extends
 @Override
 public boolean parseHeaders()
 throws IOException {
+if (!parsingHeader) {
+throw new IllegalStateException(
+sm.getString("iib.parseheaders.ise.error"));
+}
 
 while (parseHeader()) {
 // Loop until we run out of headers

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1196223&r1=1196222&r2=1196223&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Tue 
Nov  1 19:17:39 2011
@@ -88,11 +88,7 @@ public class InternalNioInputBuffer exte
 /**
  * Reading all bytes until the next CRLF. The line is being ignored.
  */
-HEADER_SKIPLINE,
-/**
- * Done parsing headers. Request body should follow.
- */
-HEADERS_DONE
+HEADER_SKIPLINE
 }
 
 // --- Constructors
@@ -473,7 +469,7 @@ public class InternalNioInputBuffer exte
 @Override
 public boolean parseHeaders()
 throws IOException {
-if (headerParsePos == HeaderParsePosition.HEADERS_DONE) {
+if (!parsingHeader) {
 throw new IllegalStateException(
 sm.getString("iib.parseheaders.ise.error"));
 }
@@ -536,7 +532,6 @@ public class InternalNioInputBuffer exte
 // Skip
 } else if (chr == Constants.LF) {
 pos++;
-headerParsePos = HeaderParsePosition.HEADERS_DONE;
 return HeaderParseStatus.DONE;
 } else {
 break;



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

svn commit: r1196231 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/ webapps/docs/

[kkolinko]

Author: kkolinko
Date: Tue Nov  1 19:29:30 2011
New Revision: 1196231

URL: http://svn.apache.org/viewvc?rev=1196231&view=rev
Log:
Merged revisions r1196212 r1196223 from tomcat/trunk:

Implement self-guard against unexpected call to parseHeaders() after the 
parsing has already been completed
without a prior call to recycle() or nextRequest().
One such occurrence was caused by a bug that did not recycle the buffer and was 
fixed a while ago.

AbstractHttp11Processor handling of ISE from parseHeaders() is to reject the 
request with response status 400 and close the socket. The message is visible 
only when debug logging is enabled in AbstractHttp11Processor.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 19:29:30 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176

Re: Tagging 7.0.23

[Mark Thomas]

On 01/11/2011 14:16, Konstantin Kolinko wrote:
> 2011/11/1 Mark Thomas :
>> It is that time again. I plan to tag 7.0.23 later today once I have run
>> the unit tests and the TCKs to check all is well.
>>
>> If you have anything you want to get into this release, now is the time
>> to commit it.
> 
> 1) Re: http://svn.apache.org/viewvc?view=revision&revision=1195965
> 
> Applies to AJP as well.

I'll get that fixed before I tag.

> Is it possible to throw a runtime exception from parseParameters()
> when the limit is reached instead of dropping the parameters, or you
> think the API does not allow it?

I don't think the API allows it. At least it may give users a nasty
surprise.

> 2) http://markmail.org/message/5k4urwimvvmeqees

I'll see if I can get that fixed too.

Mark

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

Re: Tagging 7.0.23

[Mark Thomas]

On 01/11/2011 19:42, Mark Thomas wrote:
> On 01/11/2011 14:16, Konstantin Kolinko wrote:
>> 2) http://markmail.org/message/5k4urwimvvmeqees
> 
> I'll see if I can get that fixed too.

Hmm. The problem here is that the context.xml files are registered as
resources that trigger reload rather than redeploy. As such, any changes
to the context.xml files trigger a reload but do not have any affect
since the Context object is not re-created.

My current thinking is to add redeployResoucre and reloadResource to
Context and deprecate watchedResource, making it a synonym for
reloadResource. Thoughts? (I haven't tested this yet.)

Mark

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

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

[mturk]

Author: mturk
Date: Tue Nov  1 21:39:41 2011
New Revision: 1196297

URL: http://svn.apache.org/viewvc?rev=1196297&view=rev
Log:
Use size_t since we call the functions mostly with sizeof param. No functional 
change

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

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1196297&r1=1196296&r2=1196297&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 21:39:41 2011
@@ -577,14 +577,14 @@ static BOOL initialize_extension(void);
 static int read_registry_init_data(void);
 
 static int get_config_parameter(LPVOID src, const char *tag,
-char *val, DWORD sz);
+char *val, size_t sz);
 
 static int get_config_bool(LPVOID src, const char *tag, int def);
 
 static int get_config_int(LPVOID src, const char *tag, int def);
 
 static int get_registry_config_parameter(HKEY hkey,
- const char *tag, char *b, DWORD sz);
+ const char *tag, char *b, size_t sz);
 
 static int get_registry_config_number(HKEY hkey, const char *tag,
   int *val);
@@ -2383,7 +2383,6 @@ BOOL WINAPI DllMain(HINSTANCE hInst,
 LPVOID lpReserved)  /* Reserved parameter for future use   
 */
 {
 int rc;
-BOOL fReturn = TRUE;
 char fname[MAX_PATH];
 
 UNREFERENCED_PARAMETER(lpReserved);
@@ -2399,7 +2398,7 @@ BOOL WINAPI DllMain(HINSTANCE hInst,
 }
 else {
 /* Cannot obtain file name ? */
-fReturn = JK_FALSE;
+return FALSE;
 }
 if ((p = strrchr(fname, '\\'))) {
 *(p++) = '\0';
@@ -2410,11 +2409,11 @@ BOOL WINAPI DllMain(HINSTANCE hInst,
 }
 else {
 /* Cannot obtain file name ? */
-fReturn = JK_FALSE;
+return JK_FALSE;
 }
 }
 else {
-fReturn = JK_FALSE;
+return JK_FALSE;
 }
 /* Construct redirector headers to use for this redirector instance */
 StringCbPrintf(URI_HEADER_NAME, RES_BUFFER_SIZE, HEADER_TEMPLATE, 
URI_HEADER_NAME_BASE, hInst);
@@ -2446,7 +2445,7 @@ BOOL WINAPI DllMain(HINSTANCE hInst,
 break;
 }
 
-return fReturn;
+return TRUE;
 }
 
 static DWORD WINAPI watchdog_thread(void *param)
@@ -2941,7 +2940,7 @@ static int read_registry_init_data(void)
 }
 
 static int get_config_parameter(LPVOID src, const char *tag,
-char *val, DWORD sz)
+char *val, size_t sz)
 {
 const char *tmp = NULL;
 if (using_ini_file) {
@@ -2990,15 +2989,14 @@ static int get_config_bool(LPVOID src, c
 }
 
 static int get_registry_config_parameter(HKEY hkey,
- const char *tag, char *b, DWORD sz)
+ const char *tag, char *b, size_t sz)
 {
 DWORD type = 0;
-LONG lrc;
-
-sz = sz - 1; /* Reserve space for RegQueryValueEx to add null terminator */
-b[sz] = '\0'; /* Null terminate in case RegQueryValueEx doesn't */
+LONG  lrc;
+DWORD ssz = (DWORD)sz -1;
 
-lrc = RegQueryValueEx(hkey, tag, NULL, &type, (LPBYTE)b, &sz);
+b[ssz] = '\0'; /* Null terminate in case RegQueryValueEx doesn't */
+lrc = RegQueryValueEx(hkey, tag, NULL, &type, (LPBYTE)b, &ssz);
 if ((ERROR_SUCCESS != lrc) || (type != REG_SZ)) {
 return JK_FALSE;
 }



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

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

[mturk]

Author: mturk
Date: Tue Nov  1 21:48:06 2011
New Revision: 1196303

URL: http://svn.apache.org/viewvc?rev=1196303&view=rev
Log:
Passing pointer to pointer and then getting its value just make no sense.

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

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1196303&r1=1196302&r2=1196303&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 21:48:06 2011
@@ -2874,7 +2874,7 @@ static int read_registry_init_data(void)
 return JK_FALSE;
 }
 else {
-src = &hkey;
+src = hkey;
 }
 }
 ok = ok && get_config_parameter(src, JK_LOG_FILE_TAG, log_file, 
sizeof(log_file));
@@ -2953,7 +2953,7 @@ static int get_config_parameter(LPVOID s
 return JK_FALSE;
 }
 } else {
-return get_registry_config_parameter(*((HKEY*)src), tag, val, sz);
+return get_registry_config_parameter((HKEY)src, tag, val, sz);
 }
 }
 
@@ -2963,7 +2963,7 @@ static int get_config_int(LPVOID src, co
 return jk_map_get_int((jk_map_t*)src, tag, def);
 } else {
 int val;
-if (get_registry_config_number(*((HKEY*)src), tag, &val) ) {
+if (get_registry_config_number(src, tag, &val) ) {
 return val;
 }
 else {
@@ -2978,7 +2978,7 @@ static int get_config_bool(LPVOID src, c
 return jk_map_get_bool((jk_map_t*)src, tag, def);
 } else {
 char tmpbuf[128];
-if (get_registry_config_parameter(*((HKEY*)src), tag,
+if (get_registry_config_parameter(src, tag,
   tmpbuf, sizeof(tmpbuf))) {
 return jk_get_bool_code(tmpbuf, def);
 }



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

svn commit: r1196304 - /tomcat/trunk/webapps/docs/config/ajp.xml

[markt]

Author: markt
Date: Tue Nov  1 21:50:53 2011
New Revision: 1196304

URL: http://svn.apache.org/viewvc?rev=1196304&view=rev
Log:
Clarify behaviour if limit is reached

Modified:
tomcat/trunk/webapps/docs/config/ajp.xml

Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1196304&r1=1196303&r2=1196304&view=diff
==
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Tue Nov  1 21:50:53 2011
@@ -96,9 +96,10 @@
 
 
 
-  The maximum number of parameters (GET plus POST) which will be
-  automatically parsed by the container. A value of less than 0 means no
-  limit. If not specified, a default of 1 is used.
+  The maximum number of parameter and value pairs (GET plus POST) which
+  will be automatically parsed by the container. Parameter and value pairs
+  beyond this limit will be ignored. A value of less than 0 means no limit.
+  If not specified, a default of 1 is used.
 
 
 



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

svn commit: r1196305 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java

[markt]

Author: markt
Date: Tue Nov  1 21:51:32 2011
New Revision: 1196305

URL: http://svn.apache.org/viewvc?rev=1196305&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52113
Don't assume presence of context.xml file with JMX deployment

Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1196305&r1=1196304&r2=1196305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Tue Nov  1 
21:51:32 2011
@@ -594,7 +594,9 @@ public class MBeanFactory {
  "configBaseName");
 String baseName = context.getBaseName();
 File configFile = new File(new File(configPath), baseName+".xml");
-context.setConfigFile(configFile.toURI().toURL());
+if (configFile.isFile()) {
+context.setConfigFile(configFile.toURI().toURL());
+}
 mserver.invoke(deployer, "manageApp",
new Object[] {context},
new String[] {"org.apache.catalina.Context"});



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

Re: Tagging 7.0.23

[Konstantin Kolinko]

2011/11/1 Mark Thomas :
> On 01/11/2011 14:16, Konstantin Kolinko wrote:
>>
>> 1) Re: http://svn.apache.org/viewvc?view=revision&revision=1195965
>
>> Is it possible to throw a runtime exception from parseParameters()
>> when the limit is reached instead of dropping the parameters, or you
>> think the API does not allow it?
>
> I don't think the API allows it. At least it may give users a nasty
> surprise.
>

Well, both surprises (either dropping or throwing) can be nasty. So,
what to choose...

Reviewing the API I see that getParts()/getPart() is consistent that
it rethrows the same exception if parsing failed once.

The getParameter()/getParameterValues()/getParameterNames() API does
not say about throwing an exception, and it raises a question whether
it shall be thrown the first time only or rethrown consistently.
Let's go on with dropping.

I think there might be an option, e.g. on a Context to rethrow
exception, or set a request attribute, if parameters parsing failed.
That can be deemed a different feature / itch. It may be extended to
cover some other cases, e.g. '&&' invalid chunk error, or parameters
dropped during urldecode.

2011/11/2 Mark Thomas :
> On 01/11/2011 19:42, Mark Thomas wrote:
>> On 01/11/2011 14:16, Konstantin Kolinko wrote:
>>> 2) http://markmail.org/message/5k4urwimvvmeqees
>>
>> I'll see if I can get that fixed too.
>
> Hmm. The problem here is that the context.xml files are registered as
> resources that trigger reload rather than redeploy. As such, any changes
> to the context.xml files trigger a reload but do not have any affect
> since the Context object is not re-created.
>
> My current thinking is to add redeployResoucre and reloadResource to
> Context and deprecate watchedResource, making it a synonym for
> reloadResource. Thoughts? (I haven't tested this yet.)
>

Are you talking about API or about Configuration?

 in conf/context.xml defaults to WEB-INF/web.xml.  It
is a news for me that it covers context.xml as well.

I think web.xml triggers reload, context.xml triggers redeploy.

Best regards,
Konstantin Kolinko

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

svn commit: r1196314 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/ajp.xml

[markt]

Author: markt
Date: Tue Nov  1 22:01:04 2011
New Revision: 1196314

URL: http://svn.apache.org/viewvc?rev=1196314&view=rev
Log:
Clarify behaviour if limit is reached

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 22:01:04 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,11900

Re: Tagging 7.0.23

[Konstantin Kolinko]

2011/11/2 Konstantin Kolinko :
> 2011/11/1 Mark Thomas :
>> On 01/11/2011 14:16, Konstantin Kolinko wrote:
>>>
>>> 1) Re: http://svn.apache.org/viewvc?view=revision&revision=1195965
>>
>>> Is it possible to throw a runtime exception from parseParameters()
>>> when the limit is reached instead of dropping the parameters, or you
>>> think the API does not allow it?
>>
>> I don't think the API allows it. At least it may give users a nasty
>> surprise.
>>
>
> Well, both surprises (either dropping or throwing) can be nasty. So,
> what to choose...
>
> Reviewing the API I see that getParts()/getPart() is consistent that
> it rethrows the same exception if parsing failed once.
>
> The getParameter()/getParameterValues()/getParameterNames() API does
> not say about throwing an exception, and it raises a question whether
> it shall be thrown the first time only or rethrown consistently.
> Let's go on with dropping.
>
> I think there might be an option, e.g. on a Context to rethrow
> exception, or set a request attribute, if parameters parsing failed.
> That can be deemed a different feature / itch. It may be extended to
> cover some other cases, e.g. '&&' invalid chunk error, or parameters
> dropped during urldecode.
>
> 2011/11/2 Mark Thomas :
>> On 01/11/2011 19:42, Mark Thomas wrote:
>>> On 01/11/2011 14:16, Konstantin Kolinko wrote:
 2) http://markmail.org/message/5k4urwimvvmeqees
>>>
>>> I'll see if I can get that fixed too.
>>
>> Hmm. The problem here is that the context.xml files are registered as
>> resources that trigger reload rather than redeploy. As such, any changes
>> to the context.xml files trigger a reload but do not have any affect
>> since the Context object is not re-created.
>>
>> My current thinking is to add redeployResoucre and reloadResource to
>> Context and deprecate watchedResource, making it a synonym for
>> reloadResource. Thoughts? (I haven't tested this yet.)
>>
>
> Are you talking about API or about Configuration?
>
>  in conf/context.xml defaults to WEB-INF/web.xml.  It
> is a news for me that it covers context.xml as well.
>
> I think web.xml triggers reload, context.xml triggers redeploy.

Touching webapps/myapp.war also triggers a redeploy and not a reload.


Best regards,
Konstantin Kolinko

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

svn commit: r1196316 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/mbeans/MBeanFactory.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Nov  1 22:05:15 2011
New Revision: 1196316

URL: http://svn.apache.org/viewvc?rev=1196316&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52113
Don't assume presence of context.xml file with JMX deployment

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 22:05:15 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,118830

DO NOT REPLY [Bug 52113] Tomcat reports missing context xml at wrong location on JMX deployment

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
 OS/Version||All

--- Comment #2 from Mark Thomas  2011-11-01 22:05:38 UTC ---
Thanks for the report. This has been fixed in trunk and 7.0.x and will be
included in 7.0.23 onwards.

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

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

DO NOT REPLY [Bug 52121] New: corrupt gzip output when compression=on in server.xml

[bugzilla]

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

 Bug #: 52121
   Summary: corrupt gzip output when compression=on in server.xml
   Product: Tomcat 7
   Version: 7.0.22
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
AssignedTo: dev@tomcat.apache.org
ReportedBy: dmar...@amazon.com
Classification: Unclassified


Created attachment 27886
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27886
Gzip Corruption Repro WAR

This appears to be same issue as posted by Christopher Taylor
Jun 30, 2011 at 8:05 am to Tomcat Users. The subject line has been preserved
above.

As mentioned in the post, this seems to have arisen with this issue:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48738

The change introduced this class: FlushableGZIPOutputStream. When we started
using this, we noticed that certain string flush sequences would result in
corrupt gzip output. 

The attached WAR provides a repro. The sequence of writes to the output stream
that would’ve been done by our server is mimicked in this case using a file
system. There are 40 files each representing a flush. URL:

"http://localhost:8080/TomcatBugReportWAR";

I’ve allowed the ‘start’ and ‘end’ request parameters to control to the
starting and ending points. I’ve also allowed an ‘append’ request parameter
dump anything to the outputstream.

The defaults are 0, 40, and “” for start end and append respectively.

The following query string appears particularly interesting as it seems to be
the smallest sequence that causes the corruption and the subsequent string that
is appended after the output is the only thing that appears corrupted:

"http://localhost:8080/TomcatBugReportWAR?start=19&end=30&append=something”

It’s also possible to reproduce this using only the FlushableGZIPOutputStream
without using Tomcat at all. See attached JAR.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Tagging 7.0.23

[Mark Thomas]

On 01/11/2011 22:01, Konstantin Kolinko wrote:
> 2011/11/2 Konstantin Kolinko :
>> 2011/11/1 Mark Thomas :
>>> My current thinking is to add redeployResoucre and reloadResource to
>>> Context and deprecate watchedResource, making it a synonym for
>>> reloadResource. Thoughts? (I haven't tested this yet.)
>>>
>>
>> Are you talking about API or about Configuration?
>>
>>  in conf/context.xml defaults to WEB-INF/web.xml.  It
>> is a news for me that it covers context.xml as well.
>>
>> I think web.xml triggers reload, context.xml triggers redeploy.

That is what I expected too but it isn't what happens. See line ~575 in
ContextConfig. I've checked the history and it has been that way all the
way back to 2004.

> Touching webapps/myapp.war also triggers a redeploy and not a reload.

I'm fine with that. An updated WAR may include a new context.xml file.

Mark

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

DO NOT REPLY [Bug 52121] corrupt gzip output when compression=on in server.xml

[bugzilla]

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

--- Comment #1 from David Marcks  2011-11-01 22:18:25 UTC 
---
Created attachment 27887
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27887
Isolated Reproduction without using Tomcat

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

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

Re: Tagging 7.0.23

[Konstantin Kolinko]

2011/11/2 Mark Thomas :
> On 01/11/2011 22:01, Konstantin Kolinko wrote:
>> 2011/11/2 Konstantin Kolinko :
>>> 2011/11/1 Mark Thomas :
 My current thinking is to add redeployResoucre and reloadResource to
 Context and deprecate watchedResource, making it a synonym for
 reloadResource. Thoughts? (I haven't tested this yet.)

>>>
>>> Are you talking about API or about Configuration?
>>>
>>>  in conf/context.xml defaults to WEB-INF/web.xml.  It
>>> is a news for me that it covers context.xml as well.
>>>
>>> I think web.xml triggers reload, context.xml triggers redeploy.
>
> That is what I expected too but it isn't what happens. See line ~575 in
> ContextConfig. I've checked the history and it has been that way all the
> way back to 2004.

Oh, I see. Looking at 5.5
// Add as watched resource so that cascade reload
occurs if a default
// config file is modified/added/removed

I think it talks about the "default" context file that is
$catalina.base/conf/context.xml. That explains why it says about
"cascade".

I am OK with that triggering a reload,  but as you noted that seems to
not work as Context is not recreated.

I think webapp's own Context file should be a different beast.

>
>> Touching webapps/myapp.war also triggers a redeploy and not a reload.
>
> I'm fine with that. An updated WAR may include a new context.xml file.
>

Best regards,
Konstantin Kolinko

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

Re: Tagging 7.0.23

[Mark Thomas]

On 01/11/2011 22:31, Konstantin Kolinko wrote:
> 2011/11/2 Mark Thomas :
>> On 01/11/2011 22:01, Konstantin Kolinko wrote:
>>> 2011/11/2 Konstantin Kolinko :
 2011/11/1 Mark Thomas :
> My current thinking is to add redeployResoucre and reloadResource to
> Context and deprecate watchedResource, making it a synonym for
> reloadResource. Thoughts? (I haven't tested this yet.)
>

 Are you talking about API or about Configuration?

  in conf/context.xml defaults to WEB-INF/web.xml.  It
 is a news for me that it covers context.xml as well.

 I think web.xml triggers reload, context.xml triggers redeploy.
>>
>> That is what I expected too but it isn't what happens. See line ~575 in
>> ContextConfig. I've checked the history and it has been that way all the
>> way back to 2004.
> 
> Oh, I see. Looking at 5.5
> // Add as watched resource so that cascade reload
> occurs if a default
> // config file is modified/added/removed
> 
> I think it talks about the "default" context file that is
> $catalina.base/conf/context.xml. That explains why it says about
> "cascade".
> 
> I am OK with that triggering a reload,  but as you noted that seems to
> not work as Context is not recreated.
> 
> I think webapp's own Context file should be a different beast.

Changes to any context.xml have to trigger a redeploy else they won't
take effect as no new Context object will be created.

Mark

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

Re: Tagging 7.0.23

[Mark Thomas]

On 01/11/2011 22:39, Mark Thomas wrote:
> Changes to any context.xml have to trigger a redeploy else they won't
> take effect as no new Context object will be created.

My first stab at a patch for this is at [1]. Comments welcome.

The one thing I don't like is that a change to conf/context.xml that
breaks the file effectively kills the instance until the problem is
fixed and the instance re-started.

Mark

http://people.apache.org/~markt/patches/2011-11-01-redeploy-trunk-v1.patch

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

Re: Tagging 7.0.23

[Konstantin Kolinko]

2011/11/2 Mark Thomas :
> On 01/11/2011 22:39, Mark Thomas wrote:
>> Changes to any context.xml have to trigger a redeploy else they won't
>> take effect as no new Context object will be created.
>
> My first stab at a patch for this is at [1]. Comments welcome.
>
> The one thing I don't like is that a change to conf/context.xml that
> breaks the file effectively kills the instance until the problem is
> fixed and the instance re-started.
>
> Mark
>
> http://people.apache.org/~markt/patches/2011-11-01-redeploy-trunk-v1.patch
>

Quick review - several typos:

mbeans-descriptors.xml:
- typo "findRedployResources"
- "Path to the resource, relative to docBase" - It is "either absolute
or relative to docBase".

docs: s/if is is updated/if it is updated/

At first view I was hesitant wrt to new syntax in conf/context.xml
(s/// but I am starting to like it.

Need to apply and play with it a while.


I do not see though how it is related to another/main topic of
http://markmail.org/message/5k4urwimvvmeqees
that is: if context.xml startup fails somehow the webapp continues
with the deploying the expanded dir.

I observed it during startup time, not during redeployment:

To reproduce, create conf/Catalina/localhost/host-manager.xml:

[[[


 

]]]

The logs below are from several days ago, before the multithreaded
deployment patch was applied. Note that "host-manager" is being
deployed twice.

(There seems to be NamingContextListener throwing exception from the
second deploy, but the app started successfully).

[[[ (...)
27.10.2011 16:29:04 org.apache.catalina.startup.Catalina load
INFO: Initialization processed in 1977 ms
27.10.2011 16:29:05 org.apache.catalina.core.StandardService startInternal
INFO: Starting service Catalina
27.10.2011 16:29:05 org.apache.catalina.core.StandardEngine startInternal
INFO: Starting Servlet Engine: Apache Tomcat/8.0.0-dev
27.10.2011 16:29:05 org.apache.catalina.startup.HostConfig deployDescriptor
INFO: Deploying configuration descriptor
(...)\build\conf\Catalina\localhost\host-manager.xml
27.10.2011 16:29:05 org.apache.tomcat.util.digester.SetPropertiesRule begin
WARNING: [SetPropertiesRule]{Context/Valve} Setting property 'allow'
to '(' did not find a matching property.
27.10.2011 16:29:05 org.apache.catalina.core.ContainerBase addChildInternal
SEVERE: ContainerBase.addChild: start:
org.apache.catalina.LifecycleException: Failed to start component
[StandardEngine[Catalina].StandardHost[localhost].StandardContext[/host-manager]]
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:152)
at 
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:791)
at 
org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:766)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:638)
at 
org.apache.catalina.startup.HostConfig.deployDescriptor(HostConfig.java:608)
at 
org.apache.catalina.startup.HostConfig.deployDescriptors(HostConfig.java:533)
at 
org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:446)
at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1303)
(...)
27.10.2011 16:29:07 org.apache.catalina.startup.HostConfig deployDirectory
INFO: Deploying web application directory (...)\build\webapps\host-manager
27.10.2011 16:29:07 org.apache.catalina.core.NamingContextListener
lifecycleEvent
SEVERE: Creation of the naming context failed:
javax.naming.NamingException: Context is read only
27.10.2011 16:29:07 org.apache.catalina.startup.HostConfig deployDirectory
INFO: Deploying web application directory (...)\build\webapps\manager
27.10.2011 16:29:07 org.apache.catalina.startup.HostConfig deployDirectory
INFO: Deploying web application directory (...)\build\webapps\ROOT
27.10.2011 16:29:07 org.apache.coyote.AbstractProtocol start
INFO: Starting ProtocolHandler ["http-bio-8080"]
27.10.2011 16:29:07 org.apache.coyote.AbstractProtocol start
INFO: Starting ProtocolHandler ["ajp-bio-8009"]
27.10.2011 16:29:07 org.apache.catalina.startup.Catalina start
INFO: Server startup in 2962 ms
]]]

Best regards,
Konstantin Kolinko

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