Bug report for Tomcat 3 [2008/10/26]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 412|Ver|Nor|2001-01-08|JspC on Windows fails to handle includes in subdir| | 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt| | 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c| | 9737|Ver|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p| |44911|Ass|Nor|2008-04-30|Test again from Chirag| +-+---+---+--+--+ | Total5 bugs | +---+ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Watchdog [2008/10/26]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug| | 279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug| | 469|Unc|Nor|2001-01-17|in example-taglib.tld urn should be uri BugRat| | 470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B| | 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths| |10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher| |11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward()| |11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav| |11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie| |11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro| |11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid.| |14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec| |15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv| |24649|New|Nor|2003-11-12|getRemoteHost fails when agent has uppercase chara| |29398|New|Nor|2004-06-04|Update site and note current status | +-+---+---+--+--+ | Total 15 bugs | +---+ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Tomcat 5 [2008/10/26]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat| |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |29160|Ver|Enh|2004-05-23|precompile problem: _jspx_meth_* (javax.servlet.js| |29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi| |30241|Ver|Enh|2004-07-21|Enhance build script to use branch argument when c| |33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis| |33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps| |33650|Inf|Enh|2005-02-19|Jasper performance for multiple files processing | |33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na| |34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a| |34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern| |34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that| |35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc| |36133|Inf|Enh|2005-08-10|Support JSS SSL implementation| |36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi| |36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's | |36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re| |36922|Inf|Enh|2005-10-04|setup.sh file mis-advertised and missing | |36923|New|Nor|2005-10-05|Deactivated EL expressions are not parsed for jsp | |37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token| |37084|Opn|Reg|2005-10-14|JspC from ant fails on JSPs that use custom taglib| |37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis| |37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user | |37458|Opn|Nor|2005-11-10|Datarace on org.apache.catalina.loader.WebappClass| |37485|Inf|Enh|2005-11-14|I'd like to run init SQL after JDBC Connection cre| |37498|Inf|Nor|2005-11-14|[PATCH] NPE in org.apache.catalina.core.ContainerB| |37515|Inf|Nor|2005-11-15|smap not generated by JspC when used from Ant for | |37627|Opn|Nor|2005-11-24|Slow and incomplete dynamic content generation aft| |37785|Inf|Nor|2005-12-05|Changing startup type via Tomcat Monitor does not | |37794|Opn|Nor|2005-12-05|getParameter() fails on POST with transfer-encodin| |37797|Inf|Maj|2005-12-05|Configure Tomcat utility truncates classpath to 96| |37847|Ass|Enh|2005-12-09|Allow User To Optionally Specify Catalina Output F| |37869|Opn|Nor|2005-12-12|Cannot obtain client certificate with SSL / client| |37918|Inf|Nor|2005-12-15|EL cannot find valid getter from object when using| |37984|New|Nor|2005-12-21|JNDIRealm.java not able to handle MD5 password| |38046|Ass|Reg|2005-12-27|apache-tomcat-5.5.14-deployer doesn't work (Illega| |38197|Opn|Maj|2006-01-09|taglib pool bug when tag is used with jsp:attribut| |38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations | |38217|Ver|Enh|2006-01-10|mention that private key password and keystore pas| |38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti| |38352|Inf|Nor|2006-01-22|Additional Entries for Default catalina.policy fil| |38360|Inf|Enh|2006-01-24|Domain for session cookies| |38367|Inf|Nor|2006-01-24|Executing any Catalina Ant task results in an exce| |38427|Inf|Nor|2006-01-27|ServletContextListener Notified Multiple Times Whe| |38483|New|Nor|2006-02-01|access log valve uses simpledateformat in tread-un| |38484|New|Min|2006-02-01|webapps Admin: Invalid path /login was requested | |38516|Inf|Nor|2006-02-05|Configuration Manager loses Log On settings | |38546|Inf|Enh|2006-02-07|Google bot sends invalid If-Modifed-Since Header, | |38553|Inf|Nor|2006-02-07|Wrong HTTP code for failed CLIENT-CERT authenticat| |38570|Inf|Nor|2006-02-08|if docBase path contains webapps, a backslash is| |38577|Inf|Enh|2006-02-08|Enhance logging of security failures |
Bug report for Tomcat 4 [2008/10/26]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 3839|Opn|Enh|2001-09-26|Problem bookmarking login page| | 4227|Opn|Enh|2001-10-17|Invalid CGI path | | 5329|New|Enh|2001-12-08|NT Service exits startup before Tomcat is finished| | 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob| | 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi| | 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio| | 6600|Opn|Enh|2002-02-20|enodeURL adds 'jsession' when 'isRequestedSessionI| | 6614|New|Enh|2002-02-21|Have Bootstrap and StandardClassLoader use the sam| | 6671|New|Enh|2002-02-25|Simple custom tag example uses old declaration sty| | 7043|New|Enh|2002-03-12|database user and password for JDBC Based Store | | 7374|New|Enh|2002-03-22|Apache Tomcat/4.0.1 message on standard output| | 7676|New|Enh|2002-04-02|Allow name property to use match experssions in h| | 7723|New|Enh|2002-04-03|[patch] additional factory for org.apache.naming.f| | 8026|New|Enh|2002-04-12|Exceptions in StandardHostDeployer.addChild are lo| | 8323|New|Enh|2002-04-20|No support for running the 64 bit JVM | | 8343|New|Enh|2002-04-21|adding a absorber logger class to org.apache.ca| | 8441|New|Enh|2002-04-23|Command line files for NetWare| | 8705|New|Enh|2002-05-01|SessionListener should extend EventListener | | 8744|New|Enh|2002-05-02|No way to configure/extend runtime classloaders. | | 8776|New|Enh|2002-05-03|The session url encoding under somce circumstances| | 9227|New|Enh|2002-05-19|Allow an empty value of a pathname in the Standard| | 9456|New|Enh|2002-05-28|Problem saving server.xml file: invalid XML markup| | 9511|New|Enh|2002-05-30|Object instantiation optimization in StandardSessi| | 9629|New|Enh|2002-06-05|Fix ServletContext.getResourcePaths to match spec | | 9745|New|Enh|2002-06-10|extern cache mgt bug for conditionally dynamic pag| | 9852|New|Enh|2002-06-13|Odd Digest and Realm Behaviour| |10021|New|Enh|2002-06-19|Include upgrade option in installer | |10060|New|Enh|2002-06-20|Make the common and shared class loaders look in c| |10120|New|Enh|2002-06-21|Custom realm and shared instalation. | |10225|New|Enh|2002-06-25|ANT Tasks Error Situation | |10335|New|Enh|2002-06-28|[RFE,patch] Make JAASRealm more flexible | |10457|New|Enh|2002-07-03|Patch submission for DefaultServlet/WebdavServlet | |10526|New|Enh|2002-07-06|Authenticators do not always cache the Principal | |10565|Opn|Enh|2002-07-08|shutdown hook problem: java.lang.NoClassDefFoundE| |10691|Ass|Enh|2002-07-11|staring tomcat gives indication that tomcat is sta| |10699|New|Enh|2002-07-11|Apache SOAP 2.3 will not operate properly | |10972|New|Enh|2002-07-19|Realm without className in server.xml produces N| |11129|New|Enh|2002-07-24|New valve for putting the sessionIDs in the reques| |11248|New|Enh|2002-07-29|DefaultServlet doesn't send expires header| |11754|Opn|Enh|2002-08-15|Synchronous shutdown script - shutdown.sh should w| |12069|New|Enh|2002-08-27|Creation of more HttpSession objects for one previ| |12428|Opn|Enh|2002-09-09|request.getUserPrincipal(): Misinterpretation of s| |12658|New|Enh|2002-09-15|a proxy host and port at the Host element level | |12766|New|Enh|2002-09-18|Tomcat should use tld files in /WEB-INF/ over vers| |13309|Opn|Enh|2002-10-04|Catalina calls System.exit() | |13634|New|Enh|2002-10-15|Allowing system properties to be substituted in co| |13689|Opn|Enh|2002-10-16|Classloader paths for 'Common' classes and librari| |13731|New|Enh|2002-10-17|Final request, response, session and other variabl| |13941|New|Enh|2002-10-24|reload is VERY slow | |13965|New|Enh|2002-10-25|Catalina.sh correction request for Tru64 Unix | |14097|New|Enh|2002-10-30|hardcoded registry value for vm lets tomcat servic|
Re: [VOTE] Release build 4.1.38
Mark Thomas wrote: The source tarball and other packages are available here: http://tomcat.apache.org/dev/dist/apache-tomcat-4.1.38/ According to the release process, the 4.1.38 tag is: [ ] Broken [ ] Alpha [ ] Beta [X] Stable Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708115 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 27 02:41:28 2008
New Revision: 708115
URL: http://svn.apache.org/viewvc?rev=708115view=rev
Log:
Update to tc-native 1.1.15
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708115r1=708114r2=708115view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 02:41:28 2008
@@ -126,11 +126,6 @@
+1: rjung, mturk, markt, pero
0: remm (also affects to the two other AJP connectors)
-* Update tc-native to lastest version:
- http://people.apache.org/~jfclere/patches/patch.new-tcnative
- +1: jclere, markt, remm
- -1:
-
* Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45878
Add proper manifests (regression from 5.5.x) and LICENSE NOTICE files
Lots of ways to do this. Alternative/better suggestions welcome
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=708115r1=708114r2=708115view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Mon Oct 27 02:41:28 2008
@@ -62,7 +62,7 @@
jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
# - Tomcat native library -
-tomcat-native.version=1.1.14
+tomcat-native.version=1.1.15
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708115r1=708114r2=708115view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 02:41:28 2008
@@ -106,6 +106,9 @@
/subsection
subsection name=Coyote
changelog
+ update
+Update tc-native to 1.1.15 in build.properties.default (jfclere)
+ /update
fix
bug43327/bug: Socket bind fails when using APR on a system with
IPv6
enabled but no explicit IPv6 address configured. (markt/jfclere)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46095] New: fail_on_status extension not work correctly
https://issues.apache.org/bugzilla/show_bug.cgi?id=46095
Summary: fail_on_status extension not work correctly
Product: Tomcat Connectors
Version: unspecified
Platform: PC
OS/Version: Windows XP
Status: NEW
Severity: normal
Priority: P2
Component: Common
AssignedTo: dev@tomcat.apache.org
ReportedBy: [EMAIL PROTECTED]
Created an attachment (id=22780)
-- (https://issues.apache.org/bugzilla/attachment.cgi?id=22780)
patch for jk_uri_worker_map.c
When fail_on_status extension is set with two values, it works correctly .
JkMount /*.jsp wk01;fail_on_status=500,501
However fail_on_status is set with three or more values, it not works
correctly.
In the following example, 502 and 503 are ignored.
JkMount /*.jsp wk01;fail_on_status=500,501,502,503
Index: mod_jk-head/native/common/jk_uri_worker_map.c
===
--- mod_jk-head/native/common/jk_uri_worker_map.c (revision 708069 (
https://svn.apache.org/viewcvs.cgi?view=revrev=708069 ))
+++ mod_jk-head/native/common/jk_uri_worker_map.c (working copy)
@@ -457,7 +457,7 @@
cnt = 0;
#ifdef _MT_CODE_PTHREAD
for (status = strtok_r(status, , , lasts);
- status; status = strtok_r(NULL, , lasts)) {
+ status; status = strtok_r(NULL, , , lasts)) {
#else
for (status = strtok(status, , ); status; status = strtok(NULL, , )) {
#endif
regards.
--
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: r708123 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/naming/resources/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Mon Oct 27 03:03:19 2008
New Revision: 708123
URL: http://svn.apache.org/viewvc?rev=708123view=rev
Log:
Allow the maximum allowed size of a resource that is cached to be configured.
The default of cacheMaxSize/20 gave too high a value for large caches.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/ProxyDirContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708123r1=708122r2=708123view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 03:03:19 2008
@@ -133,13 +133,8 @@
+1: markt, fhanik
-1:
-* Make the size limit on objects placed in the static resource cache
configurable
- http://svn.apache.org/viewvc?rev=699287view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45851
- Fix NPE and outof order message processing issues
+ Fix NPE and out of order message processing issues
http://svn.apache.org/viewvc?rev=699427view=rev
+1: markt
0:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=708123r1=708122r2=708123view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Mon
Oct 27 03:03:19 2008
@@ -618,6 +618,12 @@
/**
+ * Cache object max size in KB.
+ */
+protected int cacheObjectMaxSize = 512; // 512K
+
+
+/**
* Cache TTL in ms.
*/
protected int cacheTTL = 5000;
@@ -781,6 +787,22 @@
/**
+ * Return the maximum size of objects to be cached in KB.
+ */
+public int getCacheObjectMaxSize() {
+return cacheObjectMaxSize;
+}
+
+
+/**
+ * Set the maximum size of objects to be placed the cache in KB.
+ */
+public void setCacheObjectMaxSize(int cacheObjectMaxSize) {
+this.cacheObjectMaxSize = cacheObjectMaxSize;
+}
+
+
+/**
* Return the follow standard delegation model flag used to configure
* our ClassLoader.
*/
@@ -1823,6 +1845,8 @@
((BaseDirContext) resources).setCached(isCachingAllowed());
((BaseDirContext) resources).setCacheTTL(getCacheTTL());
((BaseDirContext) resources).setCacheMaxSize(getCacheMaxSize());
+((BaseDirContext) resources).setCacheObjectMaxSize(
+getCacheObjectMaxSize());
}
if (resources instanceof FileDirContext) {
filesystemBased = true;
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=708123r1=708122r2=708123view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Mon Oct 27 03:03:19 2008
@@ -57,6 +57,10 @@
description=Maximum cache size in KB
type=int/
+attribute name=cacheObjectMaxSize
+ description=Maximum cached object size in KB
+ type=int/
+
attribute name=cacheTTL
description=Time interval in ms between cache refeshes
type=int/
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=708123r1=708122r2=708123view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
Mon Oct 27 03:03:19 2008
@@ -105,11 +105,17 @@
/**
- * Max size of resources which will have their content cached.
+ * Max size of cache for resources.
*/
protected int cacheMaxSize = 10240; // 10 MB
+/**
+ * Max size of resources that will be content cached.
+ */
+protected int cacheObjectMaxSize = 512; // 512 K
+
+
//
svn commit: r708124 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ssi/SSIMediator.java webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 27 03:07:07 2008
New Revision: 708124
URL: http://svn.apache.org/viewvc?rev=708124view=rev
Log:
Fix HTML decoding bug reported by Find Bugs
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708124r1=708123r2=708124view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 03:07:07 2008
@@ -151,11 +151,6 @@
+1: markt,fhanik
-1:
-* Fix HTML decoding bug found by Find Bugs
- http://svn.apache.org/viewvc?rev=699635view=rev
- +1: markt, remm,fhanik
- -1:
-
* Fix ASCII parsing bug found by Find Bugs
http://svn.apache.org/viewvc?rev=699644view=rev
+1: markt, remm,fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java?rev=708124r1=708123r2=708124view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java Mon Oct
27 03:07:07 2008
@@ -211,10 +211,10 @@
if (val.indexOf('$') 0 val.indexOf('') 0) return val;
// HTML decoding
-val.replace(lt;, );
-val.replace(gt;, );
-val.replace(quot;, \);
-val.replace(amp;, );
+val = val.replace(lt;, );
+val = val.replace(gt;, );
+val = val.replace(quot;, \);
+val = val.replace(amp;, );
StringBuffer sb = new StringBuffer(val);
int charStart = sb.indexOf(#);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708124r1=708123r2=708124view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 03:07:07 2008
@@ -107,6 +107,9 @@
since the default of codecacheMaxSize/20/code gave too high a value
for large caches. (markt)
/add
+ fix
+Fix HTML decoding error in SSI processing. (markt)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708125 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/xmlparser/ASCIIReader.java webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 27 03:10:13 2008
New Revision: 708125
URL: http://svn.apache.org/viewvc?rev=708125view=rev
Log:
Fix signed/unsigned conversion reported by Find Bugs
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708125r1=708124r2=708125view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 03:10:13 2008
@@ -151,11 +151,6 @@
+1: markt,fhanik
-1:
-* Fix ASCII parsing bug found by Find Bugs
- http://svn.apache.org/viewvc?rev=699644view=rev
- +1: markt, remm,fhanik
- -1:
-
* Fix casting bug found by Find Bugs
http://svn.apache.org/viewvc?rev=699645view=rev
+1: markt, remm,fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java?rev=708125r1=708124r2=708125view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java Mon
Oct 27 03:10:13 2008
@@ -112,7 +112,7 @@
}
int count = fInputStream.read(fBuffer, 0, length);
for (int i = 0; i count; i++) {
-int b0 = fBuffer[i];
+int b0 = (0xff fBuffer[i]); // Convert to unsigned
if (b0 0x80) {
throw new
IOException(Localizer.getMessage(jsp.error.xml.invalidASCII,
Integer.toString(b0)));
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708125r1=708124r2=708125view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 03:10:13 2008
@@ -163,6 +163,9 @@
bug45691/bug: Prevent generation of duplicate variable names when
generating code for JSPs. (markt)
/fix
+ fix
+Correct signed/unsigned conversion error in ASCII parsing. (markt)
+ /fix
/changelog
/subsection
subsection name=Cluster
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708126 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/juli/logging/LogFactory.java webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 27 03:13:28 2008
New Revision: 708126
URL: http://svn.apache.org/viewvc?rev=708126view=rev
Log:
Fix cast error reported by Find Bugs
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708126r1=708125r2=708126view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 03:13:28 2008
@@ -151,11 +151,6 @@
+1: markt,fhanik
-1:
-* Fix casting bug found by Find Bugs
- http://svn.apache.org/viewvc?rev=699645view=rev
- +1: markt, remm,fhanik
- -1:
-
* Fix String comparision bugs found by Find Bugs
http://svn.apache.org/viewvc?rev=699646view=rev
+1: markt
Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java?rev=708126r1=708125r2=708126view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java Mon Oct
27 03:13:28 2008
@@ -199,7 +199,8 @@
* length array is returned.
*/
public String[] getAttributeNames() {
-return (String[])logConfig.keySet().toArray();
+String result[] = new String[logConfig.size()];
+return logConfig.keySet().toArray(result);
}
/**
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708126r1=708125r2=708126view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 03:13:28 2008
@@ -110,6 +110,9 @@
fix
Fix HTML decoding error in SSI processing. (markt)
/fix
+ fix
+Fix cast error in JULI log factory. (markt)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708135 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
Author: mturk
Date: Mon Oct 27 04:14:03 2008
New Revision: 708135
URL: http://svn.apache.org/viewvc?rev=708135view=rev
Log:
Fix BZ46095. Typo in strtok_r
Modified:
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=708135r1=708134r2=708135view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Mon Oct 27
04:14:03 2008
@@ -457,7 +457,7 @@
cnt = 0;
#ifdef _MT_CODE_PTHREAD
for (status = strtok_r(status, , , lasts);
- status; status = strtok_r(NULL, , lasts)) {
+ status; status = strtok_r(NULL, , , lasts)) {
#else
for (status = strtok(status, , ); status; status = strtok(NULL, , )) {
#endif
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46095] fail_on_status extension not work correctly
https://issues.apache.org/bugzilla/show_bug.cgi?id=46095 Mladen Turk [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mladen Turk [EMAIL PROTECTED] 2008-10-27 04:14:50 PST --- Committed, thanks! -- 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: r708145 - /tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
Author: markt
Date: Mon Oct 27 04:43:24 2008
New Revision: 708145
URL: http://svn.apache.org/viewvc?rev=708145view=rev
Log:
Previous commit undid some of the fixes for bug 45906. Correct that error.
Modified:
tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
Modified: tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java?rev=708145r1=708144r2=708145view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java Mon
Oct 27 04:43:24 2008
@@ -710,43 +710,38 @@
/**
* Get ETag.
*
- * @return Weak ETag
+ * @return strong ETag if available, else weak ETag.
*/
public String getETag() {
-return getETag(false);
-}
-
-
-/**
- * Get ETag.
- *
- * @param strong If true, the strong ETag will be returned
- * @return ETag
- */
-public String getETag(boolean strong) {
-if (strong) {
-// The strong ETag must always be calculated by the resources
-if (strongETag != null)
-return strongETag;
-if (attributes != null) {
-Attribute attribute = attributes.get(ETAG);
-if (attribute != null) {
-try {
-strongETag = attribute.get().toString();
-} catch (NamingException e) {
-; // No value for the attribute
-}
+String result = null;
+if (attributes != null) {
+Attribute attribute = attributes.get(ETAG);
+if (attribute != null) {
+try {
+result = attribute.get().toString();
+} catch (NamingException e) {
+; // No value for the attribute
}
}
-return strongETag;
-} else {
-// The weakETag is contentLenght + lastModified
-if (weakETag == null) {
-weakETag = W/\ + getContentLength() + -
-+ getLastModified() + \;
-}
-return weakETag;
}
+if (result == null) {
+if (strongETag != null) {
+// The strong ETag must always be calculated by the resources
+result = strongETag;
+} else {
+// The weakETag is contentLength + lastModified
+if (weakETag == null) {
+long contentLength = getContentLength();
+long lastModified = getLastModified();
+if ((contentLength = 0) || (lastModified = 0)) {
+weakETag = W/\ + contentLength + - +
+ lastModified + \;
+}
+}
+result = weakETag;
+}
+}
+return result;
}
@@ -813,17 +808,17 @@
if (contentLength 0) return null;
return new BasicAttribute(CONTENT_LENGTH, new
Long(contentLength));
} else if (attrID.equals(ALTERNATE_CONTENT_LENGTH)) {
- long contentLength = getContentLength();
- if (contentLength 0) return null;
- return new BasicAttribute(ALTERNATE_CONTENT_LENGTH, new
Long(contentLength));
+long contentLength = getContentLength();
+if (contentLength 0) return null;
+return new BasicAttribute(ALTERNATE_CONTENT_LENGTH, new
Long(contentLength));
} else if (attrID.equals(ETAG)) {
- String etag = getETag();
- if (etag == null) return null;
- return new BasicAttribute(ETAG, etag);
+String etag = getETag();
+if (etag == null) return null;
+return new BasicAttribute(ETAG, etag);
} else if (attrID.equals(ALTERNATE_ETAG)) {
- String etag = getETag();
- if (etag == null) return null;
- return new BasicAttribute(ALTERNATE_ETAG, etag);
+String etag = getETag();
+if (etag == null) return null;
+return new BasicAttribute(ALTERNATE_ETAG, etag);
}
} else {
return attributes.get(attrID);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708151 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/servlets/DefaultServlet.java java/org/apache/catalina/servlets/WebdavServlet.java java/org/apache/naming/resources/R
Author: markt
Date: Mon Oct 27 04:50:44 2008
New Revision: 708151
URL: http://svn.apache.org/viewvc?rev=708151view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45906
Further ETag handling improvements.
Patch provided by Chris Hubick.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/ResourceAttributes.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708151r1=708150r2=708151view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 04:50:44 2008
@@ -166,14 +166,6 @@
}
StringBuffer sb = new StringBuffer();
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45906
- Improve ETag handling in ResourceAttributes
- Patch provided by Chris Hubick
- http://svn.apache.org/viewvc?rev=700125view=rev
- Note: Deleted getETag(boolean) method to remain but deprecated
- +1: markt, remm (I was -1 originally, but it may not be so bad),fhanik
- -1:
-
* Fix some thread safety issues.
Deprecate (rather than delete) any deleted code that isn't already deprecated
http://svn.apache.org/viewvc?rev=699714view=rev (previous patch)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=708151r1=708150r2=708151view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Mon Oct 27 04:50:44 2008
@@ -578,24 +578,6 @@
/**
- * Get the ETag associated with a file.
- *
- * @param resourceAttributes The resource information
- */
-protected String getETag(ResourceAttributes resourceAttributes) {
-String result = null;
-if ((result = resourceAttributes.getETag(true)) != null) {
-return result;
-} else if ((result = resourceAttributes.getETag()) != null) {
-return result;
-} else {
-return W/\ + resourceAttributes.getContentLength() + -
-+ resourceAttributes.getLastModified() + \;
-}
-}
-
-
-/**
* URL rewriter.
*
* @param path Path which has to be rewiten
@@ -733,7 +715,7 @@
ranges = parseRange(request, response, cacheEntry.attributes);
// ETag header
-response.setHeader(ETag, getETag(cacheEntry.attributes));
+response.setHeader(ETag, cacheEntry.attributes.getETag());
// Last-Modified header
response.setHeader(Last-Modified,
@@ -979,7 +961,7 @@
;
}
-String eTag = getETag(resourceAttributes);
+String eTag = resourceAttributes.getETag();
long lastModified = resourceAttributes.getLastModified();
if (headerValueTime == (-1L)) {
@@ -1531,7 +1513,7 @@
ResourceAttributes resourceAttributes)
throws IOException {
-String eTag = getETag(resourceAttributes);
+String eTag = resourceAttributes.getETag();
String headerValue = request.getHeader(If-Match);
if (headerValue != null) {
if (headerValue.indexOf('*') == -1) {
@@ -1587,7 +1569,7 @@
// The entity has not been modified since the date
// specified by the client. This is not an error case.
response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
-response.setHeader(ETag, getETag(resourceAttributes));
+response.setHeader(ETag, resourceAttributes.getETag());
return false;
}
@@ -1615,7 +1597,7 @@
ResourceAttributes resourceAttributes)
throws IOException {
-String eTag = getETag(resourceAttributes);
+String eTag = resourceAttributes.getETag();
String headerValue = request.getHeader(If-None-Match);
if (headerValue != null) {
@@ -1645,7 +1627,7 @@
if ( (GET.equals(request.getMethod()))
|| (HEAD.equals(request.getMethod())) ) {
response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
-response.setHeader(ETag, getETag(resourceAttributes));
+response.setHeader(ETag, eTag);
return false;
} else {
Modified:
DO NOT REPLY [Bug 45906] Fix ResourceAttributes ETag handling
https://issues.apache.org/bugzilla/show_bug.cgi?id=45906 Mark Thomas [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas [EMAIL PROTECTED] 2008-10-27 04:52:33 PST --- This has been applied to 6.0.x (with getETag(boolean) marked as deprecated) and will be included in 6.0.19 onwards. Thanks again for the patch. -- 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 46096] New: DefaultAnnotationProcessor.processAnnotations should use doPrivileged to call getDeclaredFields
https://issues.apache.org/bugzilla/show_bug.cgi?id=46096 Summary: DefaultAnnotationProcessor.processAnnotations should use doPrivileged to call getDeclaredFields Product: Tomcat 6 Version: 6.0.18 Platform: PC OS/Version: Windows Vista Status: NEW Severity: normal Priority: P2 Component: Jasper AssignedTo: dev@tomcat.apache.org ReportedBy: [EMAIL PROTECTED] If tomcat is running with a SecurityManager, and a JSP uses PageContext.forward, DefaultAnnotationProcessor code can be called with untristed code on the call stack. The processAnnotations method contains the line: Field[] fields = instance.getClass().getDeclaredFields(); getDeclaredFields() is subject to security checks so this throws a java.security.AccessControlException. DefaultAnnotationProcessor is part of the code in the catlina lib directory, which is granted AllPermissions in the standard policy file. However, because there is untrusted JSP code on the stack, these permissions are not used. The call to getDeclaredFields() should be wrapped in an AccessController.doPrivileged call to avoid the exception. -- 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: r708160 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ssi/ResponseIncludeWrapper.java java/org/apache/tomcat/util/buf/MessageBytes.java java/org/apache/tomcat/util/http/S
Author: markt
Date: Mon Oct 27 05:56:37 2008
New Revision: 708160
URL: http://svn.apache.org/viewvc?rev=708160view=rev
Log:
Fix some thread safety issues in date formatting.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708160r1=708159r2=708160view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 05:56:37 2008
@@ -166,13 +166,6 @@
}
StringBuffer sb = new StringBuffer();
-* Fix some thread safety issues.
- Deprecate (rather than delete) any deleted code that isn't already deprecated
- http://svn.apache.org/viewvc?rev=699714view=rev (previous patch)
- http://svn.apache.org/viewvc?rev=700167view=rev (additional changes)
- +1: mark, remm,fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45933
Don't use xml parser from web-app to process tld files
http://svn.apache.org/viewvc?rev=701355view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=708160r1=708159r2=708160view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
Mon Oct 27 05:56:37 2008
@@ -20,6 +20,10 @@
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+import java.util.TimeZone;
import javax.servlet.ServletContext;
import javax.servlet.ServletOutputStream;
@@ -27,7 +31,6 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import org.apache.catalina.util.DateTool;
/**
* A HttpServletResponseWrapper, used from
* codeSSIServletExternalResolver/code
@@ -42,6 +45,9 @@
*/
private static final String CONTENT_TYPE = content-type;
private static final String LAST_MODIFIED = last-modified;
+private static final DateFormat RFC1123_FORMAT;
+private final static String RFC1123_PATTERN = EEE, dd MMM HH:mm:ss
z;
+
protected long lastModified = -1;
private String contentType = null;
@@ -55,7 +61,11 @@
private ServletContext context;
private HttpServletRequest request;
-
+static {
+RFC1123_FORMAT = new SimpleDateFormat(RFC1123_PATTERN, Locale.US);
+RFC1123_FORMAT.setTimeZone(TimeZone.getTimeZone(GMT));
+}
+
/**
* Initialize our wrapper with the current HttpServletResponse and
* ServletOutputStream.
@@ -208,7 +218,9 @@
String lname = name.toLowerCase();
if (lname.equals(LAST_MODIFIED)) {
try {
-lastModified = DateTool.rfc1123Format.parse(value).getTime();
+synchronized(RFC1123_FORMAT) {
+lastModified = RFC1123_FORMAT.parse(value).getTime();
+}
} catch (Throwable ignore) { }
} else if (lname.equals(CONTENT_TYPE)) {
contentType = value;
@@ -228,7 +240,9 @@
String lname = name.toLowerCase();
if (lname.equals(LAST_MODIFIED)) {
try {
-lastModified = DateTool.rfc1123Format.parse(value).getTime();
+synchronized(RFC1123_FORMAT) {
+lastModified = RFC1123_FORMAT.parse(value).getTime();
+}
} catch (Throwable ignore) { }
}
else if (lname.equals(CONTENT_TYPE))
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=708160r1=708159r2=708160view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Mon
Oct 27 05:56:37 2008
@@ -568,6 +568,9 @@
type=T_STR;
}
+/**
+ * @deprecated
+ */
public void setTime(long t) {
setTime( t, null );
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
URL:
svn commit: r708161 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/el/lang/ELSupport.java test/org/apache/el/lang/TestELSupport.java webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 27 06:00:36 2008
New Revision: 708161
URL: http://svn.apache.org/viewvc?rev=708161view=rev
Log:
Fix regression in https://issues.apache.org/bugzilla/show_bug.cgi?id=43656
Patch provided by Nils Eckert
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELSupport.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708161r1=708160r2=708161view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 06:00:36 2008
@@ -178,12 +178,6 @@
+1: markt
-0: remm (I also do not think the patch is a good idea as a backport)
-* Fix regression in https://issues.apache.org/bugzilla/show_bug.cgi?id=43656
- Patch provided by Nils Eckert
- http://svn.apache.org/viewvc?rev=702632view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix issue with nested contexts and context.xml files
http://svn.apache.org/viewvc?rev=702208view=rev
+1: markt, remm, fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java?rev=708161r1=708160r2=708161view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java Mon Oct 27
06:00:36 2008
@@ -224,13 +224,13 @@
return ((BigDecimal) number).toBigInteger();
}
if (number instanceof BigInteger) {
-return new BigInteger(number.toString());
+return number;
}
return BigInteger.valueOf(number.longValue());
}
if (BigDecimal.class.equals(type)) {
if (number instanceof BigDecimal) {
-return new BigDecimal(number.toString());
+return number;
}
if (number instanceof BigInteger) {
return new BigDecimal((BigInteger) number);
@@ -341,7 +341,7 @@
public final static Object coerceToType(final Object obj, final Class type)
throws IllegalArgumentException {
if (type == null || Object.class.equals(type) ||
-(obj != null type.equals(obj.getClass( {
+(obj != null type.isAssignableFrom(obj.getClass( {
return obj;
}
if (String.class.equals(type)) {
@@ -356,9 +356,6 @@
if (Boolean.class.equals(type) || Boolean.TYPE == type) {
return coerceToBoolean(obj);
}
-if (obj != null type.isAssignableFrom(obj.getClass())) {
-return obj;
-}
if (type.isEnum()) {
return coerceToEnum(obj, type);
}
Modified: tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELSupport.java?rev=708161r1=708160r2=708161view=diff
==
--- tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELSupport.java (original)
+++ tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELSupport.java Mon Oct 27
06:00:36 2008
@@ -56,6 +56,12 @@
testIsSame(Float.valueOf(0.123456F));
}
+public void testCoerceIntegerToNumber() {
+Integer input = 4390241;
+Object output = ELSupport.coerceToType(input, Number.class);
+assertEquals(input, output);
+}
+
private static void testIsSame(Object value) {
assertEquals(value, ELSupport.coerceToNumber(value, value.getClass()));
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708161r1=708160r2=708161view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 06:00:36 2008
@@ -48,6 +48,10 @@
bug41407/bug: Add CLIENT-CERT support to the JAAS Realm. (markt)
/add
fix
+bug43656/bug: Correct regression in previous fix for this bug.
Patch
+provided by Nils Eckert. (markt)
+ /fix
+ fix
bug45419/bug: Set Accept-Ranges for static resources served by
DefaultServlet. (markt)
/fix
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43656] ELSupport.coerceToType modifies BigDecimal Values
https://issues.apache.org/bugzilla/show_bug.cgi?id=43656 Mark Thomas [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #14 from Mark Thomas [EMAIL PROTECTED] 2008-10-27 06:00:40 PST --- Thanks for the fix. It has been applied to 6.0.x and will be included in 6.0.19 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708163 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 27 06:02:47 2008
New Revision: 708163
URL: http://svn.apache.org/viewvc?rev=708163view=rev
Log:
Fix issue with nested contexts and context.xml files
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708163r1=708162r2=708163view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 06:02:47 2008
@@ -178,11 +178,6 @@
+1: markt
-0: remm (I also do not think the patch is a good idea as a backport)
-* Fix issue with nested contexts and context.xml files
- http://svn.apache.org/viewvc?rev=702208view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45951
Support changing of JSESSIONID cookie name and jsessionid path parameter name
http://svn.apache.org/viewvc?rev=702219view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=708163r1=708162r2=708163view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon Oct 27 06:02:47 2008
@@ -854,9 +854,9 @@
docBase = ROOT;
} else {
if (path.startsWith(/)) {
-docBase = path.substring(1);
+docBase = path.substring(1).replace('/', '#');
} else {
-docBase = path;
+docBase = path.replace('/', '#');
}
}
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708163r1=708162r2=708163view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 06:02:47 2008
@@ -124,6 +124,10 @@
fix
Fix some thread safety issues in date formatting. (markt)
/fix
+ fix
+Correct handle multi-level contexts defined using context.xml files.
+(markt)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708165 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper: Constants.java compiler/Compiler.java compiler/Generator.java compiler/JspDocumentParser.java compiler/Parser.java compiler/Parse
Author: markt
Date: Mon Oct 27 06:17:35 2008
New Revision: 708165
URL: http://svn.apache.org/viewvc?rev=708165view=rev
Log:
Various EL parsing fixes. Note: the behaviour regarding un-escaping of EL in
attributes has been confirmed as correct with the EG.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java?rev=708165r1=708164r2=708165view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java Mon Oct 27
06:17:35 2008
@@ -183,8 +183,12 @@
/**
* A replacement char for \$.
* XXX This is a hack to avoid changing EL interpreter to recognize \$
+ * @deprecated
*/
public static final char ESC = '\u001b';
+/**
+ * @deprecated
+ */
public static final String ESCStr = '\\u001b';
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=708165r1=708164r2=708165view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java Mon Oct
27 06:17:35 2008
@@ -145,8 +145,28 @@
ServletWriter writer = null;
try {
+/*
+ * The setting of isELIgnored changes the behaviour of the parser
+ * in subtle ways. To add to the 'fun', isELIgnored can be set in
+ * any file that forms part of the translation unit so setting it
+ * in a file included towards the end of the translation unit can
+ * change how the parser should have behaved when parsing content
+ * up to the point where isELIgnored was set. Arghh!
+ * Previous attempts to hack around this have only provided partial
+ * solutions. We now use two passes to parse the translation unit.
+ * The first just parses the directives and the second parses the
+ * whole translation unit once we know how isELIgnored has been
set.
+ * TODO There are some possible optimisations of this process.
+ */
// Parse the file
ParserController parserCtl = new ParserController(ctxt, this);
+
+// Pass 1 - the directives
+Node.Nodes directives =
+parserCtl.parseDirectives(ctxt.getJspFile());
+Validator.validateDirectives(this, directives);
+
+// Pass 2 - the whole translation unit
pageNodes = parserCtl.parse(ctxt.getJspFile());
if (ctxt.isPrototypeMode()) {
@@ -158,8 +178,9 @@
return null;
}
-// Validate and process attributes
-Validator.validate(this, pageNodes);
+// Validate and process attributes - don't re-validate the
+// directives we validated in pass 1
+Validator.validateExDirectives(this, pageNodes);
if (log.isDebugEnabled()) {
t2 = System.currentTimeMillis();
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=708165r1=708164r2=708165view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Mon Oct
27 06:17:35 2008
@@ -806,13 +806,8 @@
}
return v;
} else if (attr.isELInterpreterInput()) {
-boolean replaceESC = v.indexOf(Constants.ESC) 0;
-v = JspUtil.interpreterCall(this.isTagFile, v, expectedType,
-attr.getEL().getMapName(), false);
-// XXX ESC replacement hack
-if (replaceESC) {
-v = ( + v + ).replace( + Constants.ESCStr + , '$');
-}
+v = attributeValueWithEL(this.isTagFile, v, expectedType,
+
svn commit: r708166 - in /tomcat/tc6.0.x/trunk: STATUS.txt webapps/docs/changelog.xml
Author: markt Date: Mon Oct 27 06:20:47 2008 New Revision: 708166 URL: http://svn.apache.org/viewvc?rev=708166view=rev Log: Update change log for EL fixes Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708166r1=708165r2=708166view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 06:20:47 2008 @@ -189,12 +189,6 @@ +1: fhanik, remm -1: -* Port remaining EL changes. This is all the remaining EL related - patches from trunk - http://people.apache.org/~markt/patches/2008-10-19-el-tck-various.patch - +1: markt, remm (let's try it), fhanik - -1: - * Backport NCDFE fix from trunk (TCK failures without it) http://svn.apache.org/viewvc?rev=640888view=rev +1: markt Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708166r1=708165r2=708166view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 06:20:47 2008 @@ -184,6 +184,12 @@ fix Correct signed/unsigned conversion error in ASCII parsing. (markt) /fix + fix +Fix various edge-cases when parsing EL, particularly inside attribute +values. Note the the Expert Group has confirmed that JSP.1.6 takes +precedence over JSP.1.3.10. Therefore EL in attributes must be escaped +twice. + /fix /changelog /subsection subsection name=Cluster - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708168 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/util/DefaultAnnotationProcessor.java webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 27 06:24:06 2008
New Revision: 708168
URL: http://svn.apache.org/viewvc?rev=708168view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45285
Correctly handle annotations in parent classes
Based on a patch by Florent BENOIT
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/DefaultAnnotationProcessor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708168r1=708167r2=708168view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 06:24:06 2008
@@ -196,13 +196,6 @@
really old to me, so where would this come from ?)
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45285
- Correctly handle annotations in parent classes
- http://people.apache.org/~markt/patches/2008-10-20-bug45285-v2.patch
- Based on a patch by Florent BENOIT
- +1: markt, remm, fhanik
- -1:
-
* Fix classcast exception upon shutdown(edgecase)
http://svn.apache.org/viewvc?rev=706433view=rev
+1: fhanik
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/DefaultAnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/DefaultAnnotationProcessor.java?rev=708168r1=708167r2=708168view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/DefaultAnnotationProcessor.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/DefaultAnnotationProcessor.java
Mon Oct 27 06:24:06 2008
@@ -56,30 +56,35 @@
public void postConstruct(Object instance)
throws IllegalAccessException, InvocationTargetException {
-Method[] methods = instance.getClass().getDeclaredMethods();
-Method postConstruct = null;
-for (int i = 0; i methods.length; i++) {
-if (methods[i].isAnnotationPresent(PostConstruct.class)) {
-if ((postConstruct != null)
-|| (methods[i].getParameterTypes().length != 0)
-|| (Modifier.isStatic(methods[i].getModifiers()))
-|| (methods[i].getExceptionTypes().length 0)
-||
(!methods[i].getReturnType().getName().equals(void))) {
-throw new IllegalArgumentException(Invalid PostConstruct
annotation);
+Class? clazz = instance.getClass();
+
+while (clazz != null) {
+Method[] methods = clazz.getDeclaredMethods();
+Method postConstruct = null;
+for (int i = 0; i methods.length; i++) {
+if (methods[i].isAnnotationPresent(PostConstruct.class)) {
+if ((postConstruct != null)
+|| (methods[i].getParameterTypes().length != 0)
+|| (Modifier.isStatic(methods[i].getModifiers()))
+|| (methods[i].getExceptionTypes().length 0)
+||
(!methods[i].getReturnType().getName().equals(void))) {
+throw new IllegalArgumentException(Invalid
PostConstruct annotation);
+}
+postConstruct = methods[i];
}
-postConstruct = methods[i];
}
-}
-
-// At the end the postconstruct annotated
-// method is invoked
-if (postConstruct != null) {
-boolean accessibility = postConstruct.isAccessible();
-postConstruct.setAccessible(true);
-postConstruct.invoke(instance);
-postConstruct.setAccessible(accessibility);
-}
+
+// At the end the postconstruct annotated
+// method is invoked
+if (postConstruct != null) {
+boolean accessibility = postConstruct.isAccessible();
+postConstruct.setAccessible(true);
+postConstruct.invoke(instance);
+postConstruct.setAccessible(accessibility);
+}
+clazz = clazz.getSuperclass();
+}
}
@@ -89,30 +94,35 @@
public void preDestroy(Object instance)
throws IllegalAccessException, InvocationTargetException {
-Method[] methods = instance.getClass().getDeclaredMethods();
-Method preDestroy = null;
-for (int i = 0; i methods.length; i++) {
-if (methods[i].isAnnotationPresent(PreDestroy.class)) {
-if ((preDestroy != null)
-|| (methods[i].getParameterTypes().length != 0)
-|| (Modifier.isStatic(methods[i].getModifiers()))
-||
DO NOT REPLY [Bug 45735] Updated ResourceAttributes.getETag
https://issues.apache.org/bugzilla/show_bug.cgi?id=45735 Mark Thomas [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas [EMAIL PROTECTED] 2008-10-27 06:27:40 PST --- This has been applied to 6.0.x and will be in 6.0.19 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45285] RESOURCES DECLARED IN PARENT CLASSES ARE NOT INJECTED
https://issues.apache.org/bugzilla/show_bug.cgi?id=45285 Mark Thomas [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #11 from Mark Thomas [EMAIL PROTECTED] 2008-10-27 06:28:44 PST --- This has been applied to 6.0.x and will be in 6.0.19 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45441] Matching of relevant servlet filters fails when request is forwarded...
https://issues.apache.org/bugzilla/show_bug.cgi?id=45441 Mark Thomas [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas [EMAIL PROTECTED] 2008-10-27 06:30:01 PST --- This has been applied to 6.0.x and will be in 6.0.19 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45451] Tag file attribute evaluation
https://issues.apache.org/bugzilla/show_bug.cgi?id=45451 Mark Thomas [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas [EMAIL PROTECTED] 2008-10-27 06:34:52 PST --- The final fix for this got caught up in a spec query (http://markmail.org/message/2rq3vkvx76vmhq75). This has been resolved and the fix has now been applied to 6.0.x. It will be in 6.0.19 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708176 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Oct 27 06:44:19 2008 New Revision: 708176 URL: http://svn.apache.org/viewvc?rev=708176view=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=708176r1=708175r2=708176view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 06:44:19 2008 @@ -186,7 +186,7 @@ * Derefence socket when the request is complete http://svn.apache.org/viewvc?rev=702676view=rev - +1: fhanik, remm + +1: fhanik, remm, markt -1: * Backport NCDFE fix from trunk (TCK failures without it) @@ -198,12 +198,12 @@ * Fix classcast exception upon shutdown(edgecase) http://svn.apache.org/viewvc?rev=706433view=rev - +1: fhanik + +1: fhanik, markt -1: * maxThreads to be 200 by default http://svn.apache.org/viewvc?rev=707264view=rev - +1: fhanik + +1: fhanik, markt -1: * Fix read/write timeout during async comet access - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708177 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Oct 27 06:48:20 2008 New Revision: 708177 URL: http://svn.apache.org/viewvc?rev=708177view=rev Log: Respond to comment 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=708177r1=708176r2=708177view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 06:48:20 2008 @@ -171,6 +171,9 @@ http://svn.apache.org/viewvc?rev=701355view=rev +1: markt -0: remm (it is a refactoring, and is not appropriate to me in 6.0.x) + markt - It is a refactoring but the refactoring was necessary + to change when TLDs were processed to avoid the bug. It + isn't refactoring for the sake of refactoring. * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 See commit message for details of negligable performance impact - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708178 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: pero Date: Mon Oct 27 06:54:04 2008 New Revision: 708178 URL: http://svn.apache.org/viewvc?rev=708178view=rev Log: cast my 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=708178r1=708177r2=708178view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 06:54:04 2008 @@ -184,12 +184,12 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45951 Support changing of JSESSIONID cookie name and jsessionid path parameter name http://svn.apache.org/viewvc?rev=702219view=rev - +1: markt, fhanik + +1: markt, fhanik, pero -1: * Derefence socket when the request is complete http://svn.apache.org/viewvc?rev=702676view=rev - +1: fhanik, remm, markt + +1: fhanik, remm, markt, pero -1: * Backport NCDFE fix from trunk (TCK failures without it) @@ -201,15 +201,15 @@ * Fix classcast exception upon shutdown(edgecase) http://svn.apache.org/viewvc?rev=706433view=rev - +1: fhanik, markt + +1: fhanik, markt, pero -1: * maxThreads to be 200 by default http://svn.apache.org/viewvc?rev=707264view=rev - +1: fhanik, markt + +1: fhanik, markt, pero -1: * Fix read/write timeout during async comet access http://svn.apache.org/viewvc?rev=707670view=rev - +1: fhanik + +1: fhanik, pero -1: \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708185 - in /tomcat/trunk/java/org/apache/tomcat/util: IntrospectionUtils.java digester/Digester.java
Author: markt
Date: Mon Oct 27 07:04:07 2008
New Revision: 708185
URL: http://svn.apache.org/viewvc?rev=708185view=rev
Log:
Apply Remy's alternative fix for the String comparison bugs found by Find Bugs.
Note FB still complains but it is a false positive.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=708185r1=708184r2=708185view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Mon Oct 27
07:04:07 2008
@@ -489,6 +489,9 @@
*/
public static String replaceProperties(String value, Hashtable staticProp,
PropertySource dynamicProp[]) {
+if (value.indexOf($) 0) {
+return value;
+}
StringBuffer sb = new StringBuffer();
int prev = 0;
// assert value!=nil
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=708185r1=708184r2=708185view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Mon Oct 27
07:04:07 2008
@@ -2866,7 +2866,7 @@
try {
String newValue =
IntrospectionUtils.replaceProperties(value, null, source);
-if (!value.equals(newValue)) {
+if (value != newValue) {
newAttrs.setValue(i, newValue);
}
}
@@ -2894,7 +2894,7 @@
return bodyText; // return unchanged data
}
-if (out.equals(in)) {
+if (out == in) {
// No substitutions required. Don't waste memory creating
// a new buffer
return bodyText;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708188 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Mon Oct 27 07:06:44 2008
New Revision: 708188
URL: http://svn.apache.org/viewvc?rev=708188view=rev
Log:
Propose Remy's alternative solution for string comp issue
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=708188r1=708187r2=708188view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 07:06:44 2008
@@ -151,21 +151,6 @@
+1: markt,fhanik
-1:
-* Fix String comparision bugs found by Find Bugs
- http://svn.apache.org/viewvc?rev=699646view=rev
- +1: markt
- -0: remm (actually, the optimization would be to return the original String
-if it was not modified, and avoid doing things with a StringBuffer)
-The simplest would be to add a (redundant) check at the beginning of
replaceProperties,
-and although the bug finder program would complain, I think the == check
for the string
-is acceptable:
-public static String replaceProperties(String value, Hashtable staticProp,
-PropertySource dynamicProp[]) {
-if (value.indexOf($) 0) {
-return value;
-}
-StringBuffer sb = new StringBuffer();
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45933
Don't use xml parser from web-app to process tld files
http://svn.apache.org/viewvc?rev=701355view=rev
@@ -212,4 +197,9 @@
* Fix read/write timeout during async comet access
http://svn.apache.org/viewvc?rev=707670view=rev
+1: fhanik, pero
- -1:
\ No newline at end of file
+ -1:
+
+* Fix String comparison bugs found by Find Bugs using Remy's alternative
solution
+
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?r1=708185r2=708184pathrev=708185
+ +1: markt
+ -1:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708195 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java NioEndpoint.java
Author: markt
Date: Mon Oct 27 07:14:14 2008
New Revision: 708195
URL: http://svn.apache.org/viewvc?rev=708195view=rev
Log:
Add warning messages to APR and NIO endpoint to match change to JIO.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=708195r1=708194r2=708195view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Oct 27
07:14:14 2008
@@ -940,6 +940,11 @@
}
if ((maxThreads 0) (curThreads maxThreads)) {
curThreadsBusy++;
+if (curThreadsBusy == maxThreads) {
+log.warn(sm.getString(endpoint.warn.maxThreads,
+Integer.toString(maxThreads), address,
+Integer.toString(port)));
+}
return (newWorkerThread());
} else {
if (maxThreads 0) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=708195r1=708194r2=708195view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Oct 27
07:14:14 2008
@@ -1074,6 +1074,11 @@
}
if ((maxThreads 0) (curThreads maxThreads)) {
curThreadsBusy++;
+if (curThreadsBusy == maxThreads) {
+log.warn(sm.getString(endpoint.warn.maxThreads,
+Integer.toString(maxThreads), address,
+Integer.toString(port)));
+}
return (newWorkerThread());
} else {
if (maxThreads 0) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708196 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Oct 27 07:18:48 2008 New Revision: 708196 URL: http://svn.apache.org/viewvc?rev=708196view=rev Log: As per Remy's and Filip's comments, make log message when creating max threads consistent across all end points. 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=708196r1=708195r2=708196view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 07:18:48 2008 @@ -80,10 +80,10 @@ * Fix log a warning if we create maxThreads http://svn.apache.org/viewvc?rev=694951view=rev + http://svn.apache.org/viewvc?rev=708195view=rev +1: markt - 0: remm (other endpoints have the same logic but no patch, and logging could pile up quickly) + 0: remm (logging could pile up quickly) markt Because thread count only grows there will only ever be one log message - fhanik would be useful to have the patch consistent across endpoints -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44382 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708201 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/Globals.java java/org/apache/catalina/authenticator/Constants.java java/org/apache/jasper/Constants.java webapps/doc
Author: markt Date: Mon Oct 27 07:38:32 2008 New Revision: 708201 URL: http://svn.apache.org/viewvc?rev=708201view=rev Log: Support changing of JSESSIONID cookie name and jsessionid path parameter name. Based on a patch by Jean-frederic Clere. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708201r1=708200r2=708201view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 07:38:32 2008 @@ -166,12 +166,6 @@ +1: markt -0: remm (I also do not think the patch is a good idea as a backport) -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45951 - Support changing of JSESSIONID cookie name and jsessionid path parameter name - http://svn.apache.org/viewvc?rev=702219view=rev - +1: markt, fhanik, pero - -1: - * Derefence socket when the request is complete http://svn.apache.org/viewvc?rev=702676view=rev +1: fhanik, remm, markt, pero Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java?rev=708201r1=708200r2=708201view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java Mon Oct 27 07:38:32 2008 @@ -269,14 +269,18 @@ * The name of the cookie used to pass the session identifier back * and forth with the client. */ -public static final String SESSION_COOKIE_NAME = JSESSIONID; +public static final String SESSION_COOKIE_NAME = +System.getProperty(org.apache.catalina.SESSION_COOKIE_NAME, +JSESSIONID); /** * The name of the path parameter used to pass the session identifier * back and forth with the client. */ -public static final String SESSION_PARAMETER_NAME = jsessionid; +public static final String SESSION_PARAMETER_NAME = +System.getProperty(org.apache.catalina.SESSION_PARAMETER_NAME, +jsessionid); /** Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java?rev=708201r1=708200r2=708201view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java Mon Oct 27 07:38:32 2008 @@ -40,7 +40,10 @@ public static final String FORM_USERNAME = j_username; // Cookie name for single sign on support -public static final String SINGLE_SIGN_ON_COOKIE = JSESSIONIDSSO; +public static final String SINGLE_SIGN_ON_COOKIE = +System.getProperty( + org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME, +JSESSIONIDSSO); // - Request Notes Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java?rev=708201r1=708200r2=708201view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java Mon Oct 27 07:38:32 2008 @@ -201,6 +201,8 @@ * The name of the path parameter used to pass the session identifier * back and forth with the client. */ -public static final String SESSION_PARAMETER_NAME = jsessionid; +public static final String SESSION_PARAMETER_NAME = +System.getProperty(org.apache.catalina.SESSION_PARAMETER_NAME, +jsessionid); } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708201r1=708200r2=708201view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 07:38:32 2008 @@ -132,6 +132,10 @@ Correct handle multi-level contexts defined using context.xml files. (markt) /fix + add +Support changing of JSESSIONID
svn commit: r708202 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Oct 27 07:39:56 2008 New Revision: 708202 URL: http://svn.apache.org/viewvc?rev=708202view=rev Log: Add bug number to change log. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708202r1=708201r2=708202view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 07:39:56 2008 @@ -133,8 +133,9 @@ (markt) /fix add -Support changing of JSESSIONID cookie name and jsessionid path parameter -name. Based on a patch by Jean-frederic Clere. (markt) +bug45951/bug: Support changing of JSESSIONID cookie name and +jsessionid path parameter name. Based on a patch by Jean-frederic Clere. +(markt) /add /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45951] Provide support for renaming JSESSIONID
https://issues.apache.org/bugzilla/show_bug.cgi?id=45951 Mark Thomas [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas [EMAIL PROTECTED] 2008-10-27 07:39:59 PST --- This has been applied to 6.0.x and will be in 6.0.19 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708205 - in /tomcat/connectors/trunk/jk/native/common: jk_ajp_common.c jk_ajp_common.h
Author: mturk
Date: Mon Oct 27 07:56:03 2008
New Revision: 708205
URL: http://svn.apache.org/viewvc?rev=708205view=rev
Log:
Remember the last AJP operation on the endpoint. I case we try to issue a new
request while the previous request was not ended recycle the connection.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=708205r1=708204r2=708205view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Mon Oct 27
07:56:03 2008
@@ -746,6 +746,7 @@
if (IS_VALID_SOCKET(ae-sd) !ae-reuse) {
jk_shutdown_socket(ae-sd, l);
ae-sd = JK_INVALID_SOCKET;
+ae-last_op = JK_AJP13_END_RESPONSE;
}
jk_reset_pool((ae-pool));
JK_TRACE_EXIT(l);
@@ -1365,6 +1366,17 @@
/* Up to now, we can recover */
op-recoverable = JK_TRUE;
+/* Check if the previous request really ended
+ */
+if (ae-last_op != JK_AJP13_END_RESPONSE) {
+jk_log(l, JK_LOG_INFO,
+(%s) did not receive END_RESPONSE,
+closing socket %d,
+ae-worker-name, ae-sd);
+jk_shutdown_socket(ae-sd, l);
+ae-sd = JK_INVALID_SOCKET;
+ae-last_op = JK_AJP13_END_RESPONSE;
+}
/*
* First try to check open connections...
*/
@@ -1654,6 +1666,13 @@
{
int rc;
jk_res_data_t res;
+if (ae-last_op == JK_AJP13_SEND_HEADERS) {
+/* Do not send anything to the client.
+ * Backend already send us the headers.
+ */
+JK_TRACE_EXIT(l);
+return JK_AJP13_ERROR;
+}
if (!ajp_unmarshal_response(msg, res, ae, l)) {
jk_log(l, JK_LOG_ERROR,
ajp_unmarshal_response failed);
@@ -1958,7 +1977,7 @@
}
rc = ajp_process_callback(op-reply, op-post, p, s, l);
-
+p-last_op = rc;
/* no more data to be sent, fine we have finish here */
if (JK_AJP13_END_RESPONSE == rc) {
JK_TRACE_EXIT(l);
@@ -2508,6 +2527,7 @@
p-ep_cache[i]-proto = proto;
p-ep_cache[i]-endpoint.service = ajp_service;
p-ep_cache[i]-endpoint.done= ajp_done;
+p-ep_cache[i]-last_op = JK_AJP13_END_RESPONSE;
}
JK_TRACE_EXIT(l);
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h?rev=708205r1=708204r2=708205view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h Mon Oct 27
07:56:03 2008
@@ -372,6 +372,8 @@
handled by this endpoint */
time_t last_access;
int last_errno;
+/* Last operation performed via this endpoint */
+int last_op;
};
/*
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r708195 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java NioEndpoint.java
-1
this is not a warning message, info or debug at best. it will only
confuse sysadmins, who are supposed to react to warn and error messages.
There is nothing wrong with the condition where we have reached max
threads, most of the time it is fully normal. I'd say drop it down to info.
If we want to notify when we have reached max threads, I'd setup a JMX
notification instead.
Filip
[EMAIL PROTECTED] wrote:
Author: markt
Date: Mon Oct 27 07:14:14 2008
New Revision: 708195
URL: http://svn.apache.org/viewvc?rev=708195view=rev
Log:
Add warning messages to APR and NIO endpoint to match change to JIO.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=708195r1=708194r2=708195view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Oct 27
07:14:14 2008
@@ -940,6 +940,11 @@
}
if ((maxThreads 0) (curThreads maxThreads)) {
curThreadsBusy++;
+if (curThreadsBusy == maxThreads) {
+log.warn(sm.getString(endpoint.warn.maxThreads,
+Integer.toString(maxThreads), address,
+Integer.toString(port)));
+}
return (newWorkerThread());
} else {
if (maxThreads 0) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=708195r1=708194r2=708195view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Oct 27
07:14:14 2008
@@ -1074,6 +1074,11 @@
}
if ((maxThreads 0) (curThreads maxThreads)) {
curThreadsBusy++;
+if (curThreadsBusy == maxThreads) {
+log.warn(sm.getString(endpoint.warn.maxThreads,
+Integer.toString(maxThreads), address,
+Integer.toString(port)));
+}
return (newWorkerThread());
} else {
if (maxThreads 0) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r708195 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java NioEndpoint.java
On Mon, 2008-10-27 at 09:20 -0600, Filip Hanik - Dev Lists wrote: -1 But it's a complex situation: - java.io maxThreads includes threads also doing keepalive, so it means the connector will perform very bad once maxThreads is reached; since it does not represent the number of threads actually doing something, it can be increased very liberally, it will only use some memory - APR maxThreads only includes threads somewhere in the applications, and the connector should continue running acceptably once this is reached; increasing maxThreads too much poses a risk of excessive locking in applications (access to pools, etc) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r708195 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java NioEndpoint.java
Filip Hanik - Dev Lists wrote:
-1
this is not a warning message, info or debug at best. it will only
confuse sysadmins, who are supposed to react to warn and error messages.
There is nothing wrong with the condition where we have reached max
threads, most of the time it is fully normal. I'd say drop it down to info.
If we want to notify when we have reached max threads, I'd setup a JMX
notification instead.
I'll drop it down to info. I think debug would be too low.
Mark
Filip
[EMAIL PROTECTED] wrote:
Author: markt
Date: Mon Oct 27 07:14:14 2008
New Revision: 708195
URL: http://svn.apache.org/viewvc?rev=708195view=rev
Log:
Add warning messages to APR and NIO endpoint to match change to JIO.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=708195r1=708194r2=708195view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon
Oct 27 07:14:14 2008
@@ -940,6 +940,11 @@
}
if ((maxThreads 0) (curThreads maxThreads)) {
curThreadsBusy++;
+if (curThreadsBusy == maxThreads) {
+log.warn(sm.getString(endpoint.warn.maxThreads,
+Integer.toString(maxThreads), address,
+Integer.toString(port)));
+}
return (newWorkerThread());
} else {
if (maxThreads 0) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=708195r1=708194r2=708195view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon
Oct 27 07:14:14 2008
@@ -1074,6 +1074,11 @@
}
if ((maxThreads 0) (curThreads maxThreads)) {
curThreadsBusy++;
+if (curThreadsBusy == maxThreads) {
+log.warn(sm.getString(endpoint.warn.maxThreads,
+Integer.toString(maxThreads), address,
+Integer.toString(port)));
+}
return (newWorkerThread());
} else {
if (maxThreads 0) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708223 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java JIoEndpoint.java NioEndpoint.java res/LocalStrings.properties
Author: markt
Date: Mon Oct 27 08:46:35 2008
New Revision: 708223
URL: http://svn.apache.org/viewvc?rev=708223view=rev
Log:
Log max threads message at info rather than warn
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=708223r1=708222r2=708223view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Oct 27
08:46:35 2008
@@ -941,7 +941,7 @@
if ((maxThreads 0) (curThreads maxThreads)) {
curThreadsBusy++;
if (curThreadsBusy == maxThreads) {
-log.warn(sm.getString(endpoint.warn.maxThreads,
+log.info(sm.getString(endpoint.info.maxThreads,
Integer.toString(maxThreads), address,
Integer.toString(port)));
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=708223r1=708222r2=708223view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Mon Oct 27
08:46:35 2008
@@ -680,7 +680,7 @@
if ((maxThreads 0) (curThreads maxThreads)) {
curThreadsBusy++;
if (curThreadsBusy == maxThreads) {
-log.warn(sm.getString(endpoint.warn.maxThreads,
+log.info(sm.getString(endpoint.info.maxThreads,
Integer.toString(maxThreads), address,
Integer.toString(port)));
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=708223r1=708222r2=708223view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Oct 27
08:46:35 2008
@@ -1075,7 +1075,7 @@
if ((maxThreads 0) (curThreads maxThreads)) {
curThreadsBusy++;
if (curThreadsBusy == maxThreads) {
-log.warn(sm.getString(endpoint.warn.maxThreads,
+log.info(sm.getString(endpoint.info.maxThreads,
Integer.toString(maxThreads), address,
Integer.toString(port)));
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=708223r1=708222r2=708223view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Mon Oct 27 08:46:35 2008
@@ -26,7 +26,7 @@
endpoint.debug.unlock=Caught exception trying to unlock accept on port {0}
endpoint.err.close=Caught exception trying to close socket
endpoint.noProcessor=No Processors - worker thread dead!
-endpoint.warn.maxThreads=Maximum number of threads ({0}) created for connector
with address {1} and port {2}
+endpoint.info.maxThreads=Maximum number of threads ({0}) created for connector
with address {1} and port {2}
endpoint.init.bind=Socket bind failed: [{0}] {1}
endpoint.init.listen=Socket listen failed: [{0}] {1}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r708195 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java NioEndpoint.java
Remy Maucherat wrote: On Mon, 2008-10-27 at 09:20 -0600, Filip Hanik - Dev Lists wrote: -1 But it's a complex situation: - java.io maxThreads includes threads also doing keepalive, so it means the connector will perform very bad once maxThreads is reached; since it does not represent the number of threads actually doing something, it can be increased very liberally, it will only use some memory - APR maxThreads only includes threads somewhere in the applications, and the connector should continue running acceptably once this is reached; increasing maxThreads too much poses a risk of excessive locking in applications (access to pools, etc) correct, I still don't see max threads as an error condition. anyone ever managed an httpd server, knows what MaxClients represents, same thing with maxThreads/BIO however, tomcat does auto tune, by turning off keep alive when we reach 75%maxThreads in number of connections, so 25% of the threads will never do keep alive in BIO that's why I think it is INFO level, give them a hint that they can tune, but its not an error, server works as usual Filip Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708235 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Oct 27 09:40:10 2008 New Revision: 708235 URL: http://svn.apache.org/viewvc?rev=708235view=rev Log: Revise patch 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=708235r1=708234r2=708235view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 09:40:10 2008 @@ -79,8 +79,9 @@ -1: * Fix log a warning if we create maxThreads - http://svn.apache.org/viewvc?rev=694951view=rev - http://svn.apache.org/viewvc?rev=708195view=rev + http://svn.apache.org/viewvc?rev=694951view=rev (JIO) + http://svn.apache.org/viewvc?rev=708195view=rev (APR, NIO) + http://svn.apache.org/viewvc?rev=708223view=rev (Change log level) +1: markt 0: remm (logging could pile up quickly) markt Because thread count only grows there will only ever be one log message - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708243 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Author: markt
Date: Mon Oct 27 10:28:16 2008
New Revision: 708243
URL: http://svn.apache.org/viewvc?rev=708243view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46096
Allow for running under a security manager when processing annotations.
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=708243r1=708242r2=708243view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Mon
Oct 27 10:28:16 2008
@@ -26,6 +26,7 @@
import java.util.Map;
import java.util.Properties;
import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
import java.io.InputStream;
@@ -46,6 +47,7 @@
import org.apache.InstanceManager;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.ContainerServlet;
+import org.apache.catalina.Globals;
import org.apache.catalina.core.Constants;
import org.apache.catalina.util.StringManager;
@@ -150,14 +152,24 @@
* @throws java.lang.reflect.InvocationTargetException
*if call fails
*/
-protected void postConstruct(Object instance, Class? clazz)
+protected void postConstruct(Object instance, final Class? clazz)
throws IllegalAccessException, InvocationTargetException {
Class? superClass = clazz.getSuperclass();
if (superClass != Object.class) {
postConstruct(instance, superClass);
}
-Method[] methods = clazz.getDeclaredMethods();
+Method[] methods = null;
+if (Globals.IS_SECURITY_ENABLED) {
+methods = AccessController.doPrivileged(
+new PrivilegedActionMethod[](){
+public Method[] run(){
+return clazz.getDeclaredMethods();
+}
+});
+} else {
+methods = clazz.getDeclaredMethods();
+}
Method postConstruct = null;
for (Method method : methods) {
if (method.isAnnotationPresent(PostConstruct.class)) {
@@ -249,7 +261,18 @@
while (clazz != null) {
// Initialize fields annotations
-Field[] fields = clazz.getDeclaredFields();
+Field[] fields = null;
+if (Globals.IS_SECURITY_ENABLED) {
+final Class? clazz2 = clazz;
+fields = AccessController.doPrivileged(
+new PrivilegedActionField[](){
+public Field[] run(){
+return clazz2.getDeclaredFields();
+}
+});
+} else {
+fields = clazz.getDeclaredFields();
+}
for (Field field : fields) {
if (injections != null
injections.containsKey(field.getName())) {
lookupFieldResource(context, instance, field,
@@ -281,7 +304,18 @@
}
// Initialize methods annotations
-Method[] methods = clazz.getDeclaredMethods();
+Method[] methods = null;
+if (Globals.IS_SECURITY_ENABLED) {
+final Class? clazz2 = clazz;
+methods = AccessController.doPrivileged(
+new PrivilegedActionMethod[](){
+public Method[] run(){
+return clazz2.getDeclaredMethods();
+}
+});
+} else {
+methods = clazz.getDeclaredMethods();
+}
for (Method method : methods) {
String methodName = method.getName();
if (injections != null methodName.startsWith(set)
methodName.length() 3) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708263 - /tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
Author: fhanik
Date: Mon Oct 27 11:21:07 2008
New Revision: 708263
URL: http://svn.apache.org/viewvc?rev=708263view=rev
Log:
Added couple more tests
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java?rev=708263r1=708262r2=708263view=diff
==
---
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
Mon Oct 27 11:21:07 2008
@@ -206,11 +206,100 @@
System.out.println([testPoolThreads20Connections10Validate]Test
complete:+delta+ ms. Iterations:+(threadcount*this.iterations));
tearDown();
}
+
+public void testDBCPThreads10Connections10WithQuery() throws Exception {
+init();
+this.datasource.getPoolProperties().setMaxActive(10);
+this.datasource.getPoolProperties().setTestOnBorrow(false);
+this.threadcount = 10;
+this.transferProperties();
+this.tDatasource.getConnection().close();
+latch = new CountDownLatch(threadcount);
+long start = System.currentTimeMillis();
+for (int i=0; ithreadcount; i++) {
+TestThread t = new TestThread();
+t.setName(tomcat-dbcp-+i);
+t.d = this.tDatasource;
+t.query = select * from user;
+t.start();
+}
+latch.await();
+long delta = System.currentTimeMillis() - start;
+System.out.println([testDBCPThreads10Connections10WithQuery]Test
complete:+delta+ ms. Iterations:+(threadcount*this.iterations));
+tearDown();
+}
+public void testPoolThreads10Connections10WithQuery() throws Exception {
+init();
+this.datasource.getPoolProperties().setMaxActive(10);
+this.datasource.getPoolProperties().setTestOnBorrow(false);
+this.threadcount = 10;
+this.transferProperties();
+this.datasource.getConnection().close();
+latch = new CountDownLatch(threadcount);
+long start = System.currentTimeMillis();
+for (int i=0; ithreadcount; i++) {
+TestThread t = new TestThread();
+t.setName(tomcat-pool-+i);
+t.d = DataSourceFactory.getDataSource(this.datasource);
+t.query = select * from user;
+t.start();
+}
+latch.await();
+long delta = System.currentTimeMillis() - start;
+System.out.println([testPoolThreads10Connections10WithQuery]Test
complete:+delta+ ms. Iterations:+(threadcount*this.iterations));
+tearDown();
+}
+
+public void testDBCPThreads10Connections10WithValidateWithQuery() throws
Exception {
+init();
+this.datasource.getPoolProperties().setMaxActive(10);
+this.datasource.getPoolProperties().setTestOnBorrow(true);
+this.datasource.getPoolProperties().setValidationQuery(SELECT 1);
+this.threadcount = 10;
+this.transferProperties();
+this.tDatasource.getConnection().close();
+latch = new CountDownLatch(threadcount);
+long start = System.currentTimeMillis();
+for (int i=0; ithreadcount; i++) {
+TestThread t = new TestThread();
+t.setName(tomcat-dbcp-+i);
+t.d = this.tDatasource;
+t.query = select * from user;
+t.start();
+}
+latch.await();
+long delta = System.currentTimeMillis() - start;
+
System.out.println([testDBCPThreads10Connections10WithValidateWithQuery]Test
complete:+delta+ ms. Iterations:+(threadcount*this.iterations));
+tearDown();
+}
+
+public void testPoolThreads10Connections10WithValidateWithQuery() throws
Exception {
+init();
+this.datasource.getPoolProperties().setMaxActive(10);
+this.datasource.getPoolProperties().setTestOnBorrow(true);
+this.datasource.getPoolProperties().setValidationQuery(SELECT 1);
+this.threadcount = 10;
+this.transferProperties();
+this.datasource.getConnection().close();
+latch = new CountDownLatch(threadcount);
+long start = System.currentTimeMillis();
+for (int i=0; ithreadcount; i++) {
+TestThread t = new TestThread();
+t.setName(tomcat-pool-+i);
+t.d = DataSourceFactory.getDataSource(this.datasource);
+t.query = select * from user;
+t.start();
+}
+latch.await();
+long delta = System.currentTimeMillis() - start;
+
System.out.println([testPoolThreads10Connections10WithValidateWithQuery]Test
complete:+delta+ ms.
svn commit: r708270 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Oct 27 11:24:47 2008 New Revision: 708270 URL: http://svn.apache.org/viewvc?rev=708270view=rev Log: Propose fix for bug 46096 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=708270r1=708269r2=708270view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 11:24:47 2008 @@ -198,3 +198,9 @@ http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?r1=708185r2=708184pathrev=708185 +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46096 + Support annotation processing whilst running under a security manager + http://people.apache.org/~markt/patches/2008-10-27-bug46096.patch + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46096] DefaultAnnotationProcessor.processAnnotations should use doPrivileged to call getDeclaredFields
https://issues.apache.org/bugzilla/show_bug.cgi?id=46096 --- Comment #1 from Mark Thomas [EMAIL PROTECTED] 2008-10-27 11:27:06 PST --- This has been fixed in trunk and a patch (http://people.apache.org/~markt/patches/2008-10-27-bug46096.patch) proposed for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46102] New: The server encountered an internal error () that prevented it from fulfilling this request.. The server in which the Website is deployed could not open the admin page
https://issues.apache.org/bugzilla/show_bug.cgi?id=46102 Summary: The server encountered an internal error () that prevented it from fulfilling this request.. The server in which the Website is deployed could not open the admin page! Product: Tomcat 5 Version: 5.5.25 Platform: PC URL: http://www.ebf-confection.com/ OS/Version: Windows XP Status: NEW Severity: blocker Priority: P2 Component: Servlet JSP API AssignedTo: dev@tomcat.apache.org ReportedBy: [EMAIL PROTECTED] org.apache.jasper.JasperException: Failed to load or instantiate TagExtraInfo class: org.apache.struts.taglib.html.MessagesTei -- 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: r708344 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11AprProtocol.java java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/config/ajp.xml
Author: markt
Date: Mon Oct 27 15:04:51 2008
New Revision: 708344
URL: http://svn.apache.org/viewvc?rev=708344view=rev
Log:
Expose deferAccept for APR HTTP connector.
I did consider adding this to the AJP connector as well but since this is to
work around a buggy client and we control the client in the AJP case, I
couldn't see a need for it.
Patch provided by Michael Leinartas.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/webapps/docs/config/ajp.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=708344r1=708343r2=708344view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Oct
27 15:04:51 2008
@@ -250,7 +250,10 @@
public void setSendfileThreadCount(int sendfileThreadCount) {
endpoint.setSendfileThreadCount(sendfileThreadCount); }
public int getSendfileThreadCount() { return
endpoint.getSendfileThreadCount(); }
-
+
+public boolean getDeferAccept() { return endpoint.getDeferAccept(); }
+public void setDeferAccept(boolean deferAccept) {
endpoint.setDeferAccept(deferAccept); }
+
protected int socketBuffer = 9000;
public int getSocketBuffer() { return socketBuffer; }
public void setSocketBuffer(int socketBuffer) { this.socketBuffer =
socketBuffer; }
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=708344r1=708343r2=708344view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Oct 27
15:04:51 2008
@@ -156,15 +156,17 @@
protected long sslContext = 0;
+// - Properties
+
+
/**
* Defer accept.
*/
protected boolean deferAccept = true;
+public void setDeferAccept(boolean deferAccept) { this.deferAccept =
deferAccept; }
+public boolean getDeferAccept() { return deferAccept; }
-// - Properties
-
-
/**
* External Executor based thread pool.
*/
@@ -659,8 +661,10 @@
// Delay accepting of new connections until data is available
// Only Linux kernels 2.4 + have that implemented
// on other platforms this call is noop and will return APR_ENOTIMPL.
-if (Socket.optSet(serverSock, Socket.APR_TCP_DEFER_ACCEPT, 1) ==
Status.APR_ENOTIMPL) {
-deferAccept = false;
+if (deferAccept) {
+if (Socket.optSet(serverSock, Socket.APR_TCP_DEFER_ACCEPT, 1) ==
Status.APR_ENOTIMPL) {
+deferAccept = false;
+}
}
// Initialize SSL if needed
Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=708344r1=708343r2=708344view=diff
==
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Mon Oct 27 15:04:51 2008
@@ -236,6 +236,13 @@
presented. The default value is infinite (i.e. no timeout)./p
/attribute
+attribute name=deferAccept required=false
+ pSets the codeTCP_DEFER_ACCEPT/code flag on the listening socket
for
+ this connector. The default value is codetrue/code where
+ codeTCP_DEFER_ACCEPT/code is supported by the operating system,
+ otherwise it is codefalse/code./p
+/attribute
+
attribute name=executor required=false
pA reference to the name in an a href=executor.htmlExecutor/a
element.
If this attribute is enabled, and the named executor exists, the
connector will
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46077] deferAccept should be a settable property in AprEndpoint
https://issues.apache.org/bugzilla/show_bug.cgi?id=46077 --- Comment #1 from Mark Thomas [EMAIL PROTECTED] 2008-10-27 15:06:47 PST --- Thanks for the patch. The only additional information I would have liked to have seen was an update to the APR documentation included in the patch. I have applied it (plus some additional words for the docs) to trunk 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]
svn commit: r708345 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Oct 27 15:06:33 2008 New Revision: 708345 URL: http://svn.apache.org/viewvc?rev=708345view=rev Log: Propose fix for 46077 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=708345r1=708344r2=708345view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 15:06:33 2008 @@ -210,3 +210,10 @@ http://svn.apache.org/viewvc?rev=708273view=rev +1: markt, fhanik -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46077 + Expose deferAccept + Patch provided by Michael Leinartas + http://svn.apache.org/viewvc?rev=708344view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708354 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: ConnectionPool.java PooledConnection.java
Author: fhanik
Date: Mon Oct 27 15:24:26 2008
New Revision: 708354
URL: http://svn.apache.org/viewvc?rev=708354view=rev
Log:
Improvements to connection handling
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=708354r1=708353r2=708354view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Mon Oct 27 15:24:26 2008
@@ -409,13 +409,15 @@
protected PooledConnection createConnection(long now, PooledConnection
con) {
//no connections where available we'll create one
boolean error = false;
+boolean inbusy = true;
try {
//connect and validate the connection
con = create();
con.lock();
if (!busy.offer(con)) {
+inbusy = false;
log.debug(Connection doesn't fit into busy array, connection
will not be traceable.);
-}
+}
con.connect();
if (con.validate(PooledConnection.VALIDATE_INIT)) {
//no need to lock a new one, its not contented
@@ -424,6 +426,10 @@
con.setStackTrace(getThreadDump());
}
return con;
+} else {
+//validation failed, make sure we disconnect
+//and clean up
+error =true;
} //end if
} catch (Exception e) {
error = true;
@@ -431,7 +437,7 @@
} finally {
if (error ) {
release(con);
-busy.remove(con);
+if (inbusy) busy.remove(con);
}
con.unlock();
}//catch
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=708354r1=708353r2=708354view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Mon Oct 27 15:24:26 2008
@@ -61,7 +61,7 @@
protected void connect() throws SQLException {
if (connection != null) {
try {
-this.disconnect();
+this.disconnect(false);
} catch (Exception x) {
log.error(Unable to disconnect previous connection., x);
} //catch
@@ -90,11 +90,11 @@
}
protected void reconnect() throws SQLException {
-this.disconnect();
+this.disconnect(false);
this.connect();
} //reconnect
-protected synchronized void disconnect() throws SQLException {
+protected synchronized void disconnect(boolean finalize) throws
SQLException {
if (isDiscarded()) {
return;
}
@@ -103,7 +103,7 @@
connection.close();
}
connection = null;
-parent.finalize(this);
+if (finalize) parent.finalize(this);
}
@@ -121,7 +121,7 @@
public boolean abandon() {
try {
-disconnect();
+disconnect(true);
} catch (SQLException x) {
log.error(, x);
} //catch
@@ -157,6 +157,10 @@
}
public boolean validate(int validateAction,String sql) {
+if (this.isDiscarded()) {
+return false;
+}
+
if (!doValidate(validateAction)) {
//no validation required, no init sql and props not set
return true;
@@ -202,9 +206,15 @@
*/
public void release() {
try {
-disconnect();
+disconnect(true);
} catch (SQLException x) {
-//TODO
+if (log.isDebugEnabled()) {
+log.debug(Unable to close SQL connection,x);
+}
+} catch (Exception x) {
+if (log.isDebugEnabled()) {
+log.debug(Unable to close SQL connection,x);
+}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708361 - /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
Author: markt
Date: Mon Oct 27 15:40:48 2008
New Revision: 708361
URL: http://svn.apache.org/viewvc?rev=708361view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46075
Don't automatically create the ByteArrayOutputStream with the full threshold -
we probably won't need it in most cases.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java?rev=708361r1=708360r2=708361view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
Mon Oct 27 15:40:48 2008
@@ -84,7 +84,14 @@
super(threshold);
this.outputFile = outputFile;
-memoryOutputStream = new ByteArrayOutputStream(threshold);
+if (threshold DefaultFileItemFactory.DEFAULT_SIZE_THRESHOLD) {
+// Small threshold, use it
+memoryOutputStream = new ByteArrayOutputStream(threshold);
+} else {
+// Large threshold. Use default and array will expand if required
+memoryOutputStream = new ByteArrayOutputStream(
+DefaultFileItemFactory.DEFAULT_SIZE_THRESHOLD);
+}
currentOutputStream = memoryOutputStream;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46075] FileUpload memory usage
https://issues.apache.org/bugzilla/show_bug.cgi?id=46075 --- Comment #1 from Mark Thomas [EMAIL PROTECTED] 2008-10-27 15:43:30 PST --- Thanks for the report. I have applied a patch that uses the default (10k) as an initial size unless the threshold is less than 10k in which case the threshold is used. The patch has been proposed for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708363 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Oct 27 15:43:36 2008 New Revision: 708363 URL: http://svn.apache.org/viewvc?rev=708363view=rev Log: Propose fix for 46075 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=708363r1=708362r2=708363view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 15:43:36 2008 @@ -217,3 +217,9 @@ http://svn.apache.org/viewvc?rev=708344view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46075 + Don't create ByteArrayOutputStream at maxmimum possible size + http://svn.apache.org/viewvc?rev=708361view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708365 - /tomcat/trunk/webapps/docs/aio.xml
Author: markt Date: Mon Oct 27 15:48:21 2008 New Revision: 708365 URL: http://svn.apache.org/viewvc?rev=708365view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46067 Correct some typos. Modified: tomcat/trunk/webapps/docs/aio.xml Modified: tomcat/trunk/webapps/docs/aio.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/aio.xml?rev=708365r1=708364r2=708365view=diff == --- tomcat/trunk/webapps/docs/aio.xml (original) +++ tomcat/trunk/webapps/docs/aio.xml Mon Oct 27 15:48:21 2008 @@ -48,7 +48,7 @@ section name=Comet support p -Comet support allows a servlet to process IO aynchronously, recieving +Comet support allows a servlet to process IO aynchronously, receiving events when data is available for reading on the connection (rather than always using a blocking read), and writing data back on connections asychnonously (most likely responding to some event raised from some @@ -155,7 +155,7 @@ subsection name=Example code p -The following pseudo code servlet implments asynchronous chat functionality using the API +The following pseudo code servlet implements asynchronous chat functionality using the API described above: /p @@ -299,7 +299,7 @@ /subsection subsection name=Comet timeouts pIf you are using the NIO connector, you can set individual timeouts for your different comet connections. - To set a timeout, simple set a request attribute like the following code shows: + To set a timeout, simply set a request attribute like the following code shows: sourceCometEvent event event.setTimeout(30*1000);/source or sourceevent.getHttpServletRequest().setAttribute(org.apache.tomcat.comet.timeout, new Integer(30 * 1000));/source This sets the timeout to 30 seconds. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r708367 - in /tomcat/tc6.0.x/trunk/webapps/docs: aio.xml changelog.xml
Author: markt Date: Mon Oct 27 15:51:02 2008 New Revision: 708367 URL: http://svn.apache.org/viewvc?rev=708367view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46067 Correct typos on AIO docs Modified: tomcat/tc6.0.x/trunk/webapps/docs/aio.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/aio.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/aio.xml?rev=708367r1=708366r2=708367view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/aio.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/aio.xml Mon Oct 27 15:51:02 2008 @@ -48,7 +48,7 @@ section name=Comet support p -Comet support allows a servlet to process IO aynchronously, recieving +Comet support allows a servlet to process IO aynchronously, receiving events when data is available for reading on the connection (rather than always using a blocking read), and writing data back on connections asychnonously (most likely responding to some event raised from some @@ -155,7 +155,7 @@ subsection name=Example code p -The following pseudo code servlet implments asynchronous chat functionality using the API +The following pseudo code servlet implements asynchronous chat functionality using the API described above: /p @@ -299,7 +299,7 @@ /subsection subsection name=Comet timeouts pIf you are using the NIO connector, you can set individual timeouts for your different comet connections. - To set a timeout, simple set a request attribute like the following code shows: + To set a timeout, simply set a request attribute like the following code shows: sourceCometEvent event event.setTimeout(30*1000);/source or sourceevent.getHttpServletRequest().setAttribute(org.apache.tomcat.comet.timeout, new Integer(30 * 1000));/source This sets the timeout to 30 seconds. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708367r1=708366r2=708367view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 15:51:02 2008 @@ -221,6 +221,9 @@ bug45940/bug: Correct name of username attribute for JDBC resources in JNDI how to. (markt) /fix + fix +bug46067/bug: Fix typos in Advanced IO how to. (markt) + /fix /changelog /subsection subsection name=Other - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46067] documentation grammar/spelling
https://issues.apache.org/bugzilla/show_bug.cgi?id=46067 Mark Thomas [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas [EMAIL PROTECTED] 2008-10-27 15:51:13 PST --- Thanks for the report. This has been fixed in trunk and 6.0.x and will be in 6.0.19 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 46104] New: displayed worker state is wrong
https://issues.apache.org/bugzilla/show_bug.cgi?id=46104 Summary: displayed worker state is wrong Product: Tomcat Connectors Version: unspecified Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Common AssignedTo: dev@tomcat.apache.org ReportedBy: [EMAIL PROTECTED] Created an attachment (id=22782) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=22782) patch for jk_lb_worker.c When one worker becomes an error state, Status worker displays that worker as the 'ERR/FRC'. Index: mod_jk-head/native/common/jk_lb_worker.c === --- mod_jk-head/native/common/jk_lb_worker.c(revision 708408 ( https://svn.apache.org/viewcvs.cgi?view=revrev=708408 )) +++ mod_jk-head/native/common/jk_lb_worker.c(working copy) @@ -73,9 +73,9 @@ JK_LB_STATE_TEXT_IDLE, JK_LB_STATE_TEXT_OK, JK_LB_STATE_TEXT_RECOVER, +JK_LB_STATE_TEXT_FORCE, JK_LB_STATE_TEXT_BUSY, JK_LB_STATE_TEXT_ERROR, -JK_LB_STATE_TEXT_FORCE, JK_LB_STATE_TEXT_PROBE, unknown, NULL regards. -- 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]
