DO NOT REPLY [Bug 44928] Submitting empty text in inputText results in Integer with value '0' being set in backing bean (ELSupport)
https://issues.apache.org/bugzilla/show_bug.cgi?id=44928 --- Comment #2 from Errorken <[EMAIL PROTECTED]> 2008-05-03 03:16:51 PST --- Yes, you are right, thanks. But why are there differences between the sun EL RI and apache's one? Further more, why on earth is the spec saying that null should be converted to 0? Thats sounds like fuzy logic behavior to me. Also, if I add a validator to the inputText, like: Now it gets even more wrong. The first time I enter no value => submit succeeds. In my backing bean I'm receiving '0' which is normally not possible since the validator is forcing a value from 5 till 10. Then, when the page is re-rendered, a '0' appears in the text field since the value on the backing bean has become '0'. If I then re-submit again, I get a validation error "Validation Error: Specified attribute is not between the expected values of 5 and 10". So, besides the fact this is setting values on my backing bean which are normally not allowed, imagine that I have a search page in wich I have like 5 numerical fields which are not required but must have a value greater then 0. The user will have to manually blank these fields out after each submit then? (if he leaves these fields empty in the first submit) -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653034 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Sat May 3 03:21:13 2008
New Revision: 653034
URL: http://svn.apache.org/viewvc?rev=653034&view=rev
Log:
Propose fix for 43191
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=653034&r1=653033&r2=653034&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat May 3 03:21:13 2008
@@ -113,3 +113,10 @@
if (String.class.equals(type)) {
+1: remm
-1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
+ No way to turn off compression for some miime-types
+ Based on a patch by Len Popp
+ http://svn.apache.org/viewvc?rev=653032&view=rev
+ +1: markt
+ -1:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653032 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java
Author: markt
Date: Sat May 3 03:14:00 2008
New Revision: 653032
URL: http://svn.apache.org/viewvc?rev=653032&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
No way to turn off compression for some file types.
Based on a patch by Len Popp
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=653032&r1=653031&r2=653032&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Sat May
3 03:14:00 2008
@@ -442,6 +442,7 @@
*/
public void setCompressableMimeTypes(String compressableMimeTypes) {
if (compressableMimeTypes != null) {
+this.compressableMimeTypes = null;
StringTokenizer st = new StringTokenizer(compressableMimeTypes,
",");
while (st.hasMoreTokens()) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=653032&r1=653031&r2=653032&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Sat May
3 03:14:00 2008
@@ -449,6 +449,7 @@
*/
public void setCompressableMimeTypes(String compressableMimeTypes) {
if (compressableMimeTypes != null) {
+this.compressableMimeTypes = null;
StringTokenizer st = new StringTokenizer(compressableMimeTypes,
",");
while (st.hasMoreTokens()) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=653032&r1=653031&r2=653032&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Sat May 3
03:14:00 2008
@@ -432,6 +432,7 @@
*/
public void setCompressableMimeTypes(String compressableMimeTypes) {
if (compressableMimeTypes != null) {
+this.compressableMimeTypes = null;
StringTokenizer st = new StringTokenizer(compressableMimeTypes,
",");
while (st.hasMoreTokens()) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653035 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Sat May 3 03:21:36 2008 New Revision: 653035 URL: http://svn.apache.org/viewvc?rev=653035&view=rev Log: Propose fix for 43191 Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=653035&r1=653034&r2=653035&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat May 3 03:21:36 2008 @@ -169,3 +169,10 @@ http://svn.apache.org/viewvc?rev=651984&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191 + No way to turn off compression for some miime-types + Based on a patch by Len Popp + http://svn.apache.org/viewvc?rev=653032&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653039 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Sat May 3 03:29:09 2008
New Revision: 653039
URL: http://svn.apache.org/viewvc?rev=653039&view=rev
Log:
Vote
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=653039&r1=653038&r2=653039&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat May 3 03:29:09 2008
@@ -111,7 +111,7 @@
return obj;
}
if (String.class.equals(type)) {
- +1: remm
+ +1: remm, markt
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43191] compressableMimeType attribute ignored
https://issues.apache.org/bugzilla/show_bug.cgi?id=43191 --- Comment #7 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-03 03:26:17 PST --- I have applied your patch to trunk (expanded to include the other connectors) and proposed it for 6.0.x and 5.5.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653038 - /tomcat/trunk/java/org/apache/el/lang/ELSupport.java
Author: markt
Date: Sat May 3 03:28:51 2008
New Revision: 653038
URL: http://svn.apache.org/viewvc?rev=653038&view=rev
Log:
Add Remy's NPE fix to trunk.
Modified:
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
Modified: tomcat/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELSupport.java?rev=653038&r1=653037&r2=653038&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELSupport.java Sat May 3 03:28:51 2008
@@ -341,7 +341,7 @@
public final static Object coerceToType(final Object obj, final Class type)
throws IllegalArgumentException {
if (type == null || Object.class.equals(type) ||
-type.equals(obj.getClass())) {
+(obj != null && type.equals(obj.getClass( {
return obj;
}
if (String.class.equals(type)) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653097 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: remm Date: Sat May 3 09:59:10 2008 New Revision: 653097 URL: http://svn.apache.org/viewvc?rev=653097&view=rev Log: - Votes. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=653097&r1=653096&r2=653097&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat May 3 09:59:10 2008 @@ -86,19 +86,19 @@ persisting http://svn.apache.org/viewvc?rev=652662&view=rev Based on a suggestion by Wade Chandler - +1: markt + +1: markt, remm -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=4 Correct sendfile docs http://svn.apache.org/viewvc?rev=652666&view=rev - +1: markt + +1: markt, remm -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43150 Start if the installation path contains # http://svn.apache.org/viewvc?rev=652669&view=rev - +1: markt + +1: markt, remm -1: * Possible NPE in EL (one liner regression fix in org.apache.el.lang.ELSupport) @@ -115,8 +115,8 @@ -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191 - No way to turn off compression for some miime-types + No way to turn off compression for some mime-types Based on a patch by Len Popp http://svn.apache.org/viewvc?rev=653032&view=rev - +1: markt + +1: markt, remm -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43146] address attribute is ignored by Admin application
https://issues.apache.org/bugzilla/show_bug.cgi?id=43146 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-03 11:55:59 PST --- This works for me on the latest 5.5.x code and it looks like it has been this way for most (all?) of 5.5.x You may have some other issue at play here. If you still have problems with 5.5.26, then please use the users list to help figure out what is going wrong. -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653111 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Author: markt
Date: Sat May 3 12:44:24 2008
New Revision: 653111
URL: http://svn.apache.org/viewvc?rev=653111&view=rev
Log:
Fix various Eclipse warnings. Generics, unused code, etc
No functional change.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=653111&r1=653110&r2=653111&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sat May 3
12:44:24 2008
@@ -20,12 +20,9 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
@@ -341,21 +338,24 @@
* The exception pages for this web application, keyed by fully qualified
* class name of the Java exception.
*/
-private HashMap exceptionPages = new HashMap();
+private HashMap exceptionPages =
+new HashMap();
/**
* The set of filter configurations (and associated filter instances) we
* have initialized, keyed by filter name.
*/
-private HashMap filterConfigs = new HashMap();
+private HashMap filterConfigs =
+new HashMap();
/**
* The set of filter definitions for this application, keyed by
* filter name.
*/
-private HashMap filterDefs = new HashMap();
+private HashMap filterDefs =
+new HashMap();
/**
@@ -406,13 +406,15 @@
/**
* The message destinations for this web application.
*/
-private HashMap messageDestinations = new HashMap();
+private HashMap messageDestinations =
+new HashMap();
/**
* The MIME mappings for this web application, keyed by extension.
*/
-private HashMap mimeMappings = new HashMap();
+private HashMap mimeMappings =
+new HashMap();
/**
@@ -425,7 +427,7 @@
* The context initialization parameters for this web application,
* keyed by name.
*/
-private HashMap parameters = new HashMap();
+private HashMap parameters = new HashMap();
/**
@@ -486,7 +488,8 @@
* The security role mappings for this application, keyed by role
* name (as used within the application).
*/
-private HashMap roleMappings = new HashMap();
+private HashMap roleMappings =
+new HashMap();
/**
@@ -499,7 +502,8 @@
* The servlet mappings for this web application, keyed by
* matching pattern.
*/
-private HashMap servletMappings = new HashMap();
+private HashMap servletMappings =
+new HashMap();
/**
@@ -516,7 +520,8 @@
* The status code error pages for this web application, keyed by
* HTTP status code (as an Integer).
*/
-private HashMap statusPages = new HashMap();
+private HashMap statusPages =
+new HashMap();
/**
@@ -529,7 +534,7 @@
/**
* The JSP tag libraries for this web application, keyed by URI
*/
-private HashMap taglibs = new HashMap();
+private HashMap taglibs = new HashMap();
/**
@@ -575,7 +580,7 @@
* Java class name of the Wrapper class implementation we use.
*/
private String wrapperClassName = StandardWrapper.class.getName();
-private Class wrapperClass = null;
+private Class wrapperClass = null;
/**
@@ -975,9 +980,8 @@
// Create a mapper the first time it is requested
if (this.charsetMapper == null) {
try {
-Class clazz = Class.forName(charsetMapperClass);
-this.charsetMapper =
- (CharsetMapper) clazz.newInstance();
+Class clazz = Class.forName(charsetMapperClass);
+this.charsetMapper = (CharsetMapper) clazz.newInstance();
} catch (Throwable t) {
this.charsetMapper = new CharsetMapper();
}
@@ -2399,7 +2403,7 @@
// Add this mapping to our registered set
synchronized (servletMappings) {
-String name2 = (String) servletMappings.get(pattern);
+String name2 = servletMappings.get(pattern);
if (name2 != null) {
// Don't allow more than one servlet on the same pattern
Wrapper wrapper = (Wrapper) findChild(name2);
@@ -2543,7 +2547,7 @@
synchronized (instanceListeners) {
for (int i = 0; i < instanceListeners.length; i++) {
try {
-Class clazz = Class.forName(instanceListeners[i]);
+
svn commit: r653112 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Author: markt
Date: Sat May 3 12:47:13 2008
New Revision: 653112
URL: http://svn.apache.org/viewvc?rev=653112&view=rev
Log:
A final bit of code clean up.
Actually no functional change.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=653112&r1=653111&r2=653112&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sat May 3
12:47:13 2008
@@ -5202,8 +5202,7 @@
// Temporary - /admin uses the old names
return name;
}
-ObjectName result=super.preRegister(server,name);
-return name;
+return super.preRegister(server,name);
}
public void preDeregister() throws Exception {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653113 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Author: markt
Date: Sat May 3 12:49:57 2008
New Revision: 653113
URL: http://svn.apache.org/viewvc?rev=653113&view=rev
Log:
Fix bug 43117. Setting an empty workDir can delete all of CATALINA_HOME.
Patch provided by Takayuki Kaneko.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=653113&r1=653112&r2=653113&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sat May 3
12:49:57 2008
@@ -4954,7 +4954,7 @@
// Acquire (or calculate) the work directory path
String workDir = getWorkDir();
-if (workDir == null) {
+if (workDir == null || workDir.length() == 0) {
// Retrieve our parent (normally a host) name
String hostName = null;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653116 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat May 3 12:52:43 2008 New Revision: 653116 URL: http://svn.apache.org/viewvc?rev=653116&view=rev Log: Propose fix for 43117. 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=653116&r1=653115&r2=653116&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat May 3 12:52:43 2008 @@ -120,3 +120,10 @@ http://svn.apache.org/viewvc?rev=653032&view=rev +1: markt, remm -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43117 + Setting an empty workDir can delete all of CATALINA_HOME + Patch provided by Takayuki Kaneko. + http://svn.apache.org/viewvc?rev=653113&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653118 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Sat May 3 12:54:59 2008 New Revision: 653118 URL: http://svn.apache.org/viewvc?rev=653118&view=rev Log: Propose fix for 43117. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=653118&r1=653117&r2=653118&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat May 3 12:54:59 2008 @@ -176,3 +176,10 @@ http://svn.apache.org/viewvc?rev=653032&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43117 + Setting an empty workDir can delete all of CATALINA_HOME + Patch provided by Takayuki Kaneko. + http://svn.apache.org/viewvc?rev=653113&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43117] Dangerousness of workDir setting on Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=43117 --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-03 12:51:49 PST --- Many thanks for the patch. It has been applied to trunk and proposed for 6.0.x and 5.5.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653128 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java webapps/docs/config/http.xml
Author: markt
Date: Sat May 3 13:22:57 2008
New Revision: 653128
URL: http://svn.apache.org/viewvc?rev=653128&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43094
Support any keystoreType that doesn't need a file.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/webapps/docs/config/http.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=653128&r1=653127&r2=653128&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Sat May 3 13:22:57 2008
@@ -310,7 +310,7 @@
InputStream istream = null;
try {
ks = KeyStore.getInstance(type);
-if(! "PKCS11".equalsIgnoreCase(type) ) {
+if(!("PKCS11".equalsIgnoreCase(type) ||
"".equalsIgnoreCase(path))) {
File keyStoreFile = new File(path);
if (!keyStoreFile.isAbsolute()) {
keyStoreFile = new
File(System.getProperty("catalina.base"),
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=653128&r1=653127&r2=653128&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Sat May 3 13:22:57 2008
@@ -655,7 +655,9 @@
The pathname of the keystore file where you have stored the
server certificate to be loaded. By default, the pathname is
the file ".keystore" in the operating system home
- directory of the user that is running Tomcat.
+ directory of the user that is running Tomcat. If your
+ keystoreType doesn't need a file use ""
+ (empty string) for this parameter.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653130 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat May 3 13:25:35 2008 New Revision: 653130 URL: http://svn.apache.org/viewvc?rev=653130&view=rev Log: Propose fix for 43094 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=653130&r1=653129&r2=653130&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat May 3 13:25:35 2008 @@ -127,3 +127,10 @@ http://svn.apache.org/viewvc?rev=653113&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43094 + Support keystoreTypes that don't need a file + Based on a patch by Bruno Harbulot + http://svn.apache.org/viewvc?rev=653128&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43094] Allowing non-file based keystore and other providers
https://issues.apache.org/bugzilla/show_bug.cgi?id=43094 --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-03 13:22:07 PST --- I have applied a patch to trunk based on your suggestion and proposed it for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43009] Reported exception is not original cause of problem
https://issues.apache.org/bugzilla/show_bug.cgi?id=43009 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #5 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-03 13:26:41 PST --- Based on previous comments. -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44930] New: tomcat use AJP connector ,cpu use 99%
https://issues.apache.org/bugzilla/show_bug.cgi?id=44930 Summary: tomcat use AJP connector ,cpu use 99% Product: Tomcat 6 Version: 6.0.16 Platform: Other OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Native:JK AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I use httpserver: apache2.2.8 +mod_jk + mod_SSL ,tomcat's version is 6.0.16 my OS is redhat4(linux) i use 1 apache +5 tomcat for loading blancer,but when it runing more then one day ,my cpu use always 99% ,but not all tomcats,every times is one or two tomcats has this effect. of cause ,if for a long time ,others tomcat maybe 99% too. tomcat's log has no exception,and apache's errolog has no exception too. this host has only about 20 users ,another host has the same configs it's os is AIX and has more than 2000 users ,but no this problem . i am chinese ,sorry for my poor english! -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44930] tomcat use AJP connector ,cpu use 99%
https://issues.apache.org/bugzilla/show_bug.cgi?id=44930 王志猛 <[EMAIL PROTECTED]> changed: What|Removed |Added CC||[EMAIL PROTECTED] -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r653178 - in /tomcat/sandbox/tomcat-lite: build.xml coyote-apr/org/apache/coyote/http11/Http11AprProtocol.java
Author: costin
Date: Sat May 3 21:53:06 2008
New Revision: 653178
URL: http://svn.apache.org/viewvc?rev=653178&view=rev
Log:
Add jasper to build.xml, revert some bad changes on Http11AprProcessor ( now
should be same with trunk )
Modified:
tomcat/sandbox/tomcat-lite/build.xml
tomcat/sandbox/tomcat-lite/coyote-apr/org/apache/coyote/http11/Http11AprProtocol.java
Modified: tomcat/sandbox/tomcat-lite/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/build.xml?rev=653178&r1=653177&r2=653178&view=diff
==
--- tomcat/sandbox/tomcat-lite/build.xml (original)
+++ tomcat/sandbox/tomcat-lite/build.xml Sat May 3 21:53:06 2008
@@ -122,7 +122,7 @@
@@ -134,7 +134,26 @@
includes="**/*.properties **/*.xml"/>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -163,6 +182,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -173,6 +215,16 @@
todir="external" />
+
+
+
+
+
Modified:
tomcat/sandbox/tomcat-lite/coyote-apr/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/coyote-apr/org/apache/coyote/http11/Http11AprProtocol.java?rev=653178&r1=653177&r2=653178&view=diff
==
---
tomcat/sandbox/tomcat-lite/coyote-apr/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++
tomcat/sandbox/tomcat-lite/coyote-apr/org/apache/coyote/http11/Http11AprProtocol.java
Sat May 3 21:53:06 2008
@@ -37,7 +37,6 @@
import org.apache.coyote.ProtocolHandler;
import org.apache.coyote.RequestGroupInfo;
import org.apache.coyote.RequestInfo;
-import org.apache.tomcat.util.collections.SimplePool;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.net.AprEndpoint;
import org.apache.tomcat.util.net.SocketStatus;
@@ -193,10 +192,6 @@
private Http11ConnectionHandler cHandler = new
Http11ConnectionHandler(this);
-public AprEndpoint getEndpoint() {
- return endpoint;
-}
-
/**
* Processor cache.
*/
@@ -472,18 +467,45 @@
protected ConcurrentHashMap connections =
new ConcurrentHashMap();
+protected ConcurrentLinkedQueue recycledProcessors
=
+new ConcurrentLinkedQueue() {
+protected AtomicInteger size = new AtomicInteger(0);
+public boolean offer(Http11AprProcessor processor) {
+boolean offer = (proto.processorCache == -1) ? true :
(size.get() < proto.processorCache);
+//avoid over growing our cache or add after we have stopped
+boolean result = false;
+if ( offer ) {
+result = super.offer(processor);
+if ( result ) {
+size.incrementAndGet();
+}
+}
+if (!result) unregister(processor);
+return result;
+}
+
+public Http11AprProcessor poll() {
+Http11AprProcessor result = super.poll();
+if ( result != null ) {
+size.decrementAndGet();
+}
+return result;
+}
+
+public void clear() {
+Http11AprProcessor next = poll();
+while ( next != null ) {
+unregister(next);
+next = poll();
+}
+super.clear();
+size.set(0);
+}
+};
-protected SimplePool recycledProcessors;
Http11ConnectionHandler(Http11AprProtocol proto) {
this.proto = proto;
-recycledProcessors =
- new SimplePool(proto.processorCache == -1 ?
- 1024 : proto.processorCache) {
-protected void reject(Http11AprProcessor t) {
- unregister(t);
-}
-};
}
public SocketState event(long socket, SocketStatus status) {
@@ -584,8 +606,8 @@
processor.setMaxKeepAliveRequests(proto.maxKeepAliveRequests);
processor.setTimeout(proto.timeout);
processor.setDisableUploadTimeout(proto.disableUploadTimeout);
-processor.setCompression(proto.compression);
processor.setCompressionMinSize(proto.compressionMinSize);
+processor.setCompression(proto.compression);
processor.setNoCompressionUserAgents(proto.noCompressionUserAgents);
processor.setCompressableMimeTypes(proto.compressableMimeTypes);
