[Bug 56692] New: request.getParameterNames(); returns empty Enumerations in Valve if servlet never call request.getParameterNames()
https://issues.apache.org/bugzilla/show_bug.cgi?id=56692 Bug ID: 56692 Summary: request.getParameterNames(); returns empty Enumerations in Valve if servlet never call request.getParameterNames() Product: Tomcat 7 Version: 7.0.54 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: chanjars...@gmail.com I'm writing a custom Valve and find a strange bug. if the servlet never call request.getParameterNames(), then i will get an empty Enumerations if i call request.getParameterNames();in a Valve. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56530] WebappClassLoader.loadClass synchronization issue due to coarse lock at WebappClassLoader instance level instead of been by class name
https://issues.apache.org/bugzilla/show_bug.cgi?id=56530 Mario Lukica mluk...@gmail.com changed: What|Removed |Added CC||mluk...@gmail.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56693] New: non-rfc conform delayed file operations with webdav
https://issues.apache.org/bugzilla/show_bug.cgi?id=56693 Bug ID: 56693 Summary: non-rfc conform delayed file operations with webdav Product: Tomcat 8 Version: trunk Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: aidbmfqognnq6gizaigaqa...@protected32.unixadm.org When uploading a file using webdav in Tomcat 8.0.9 it doesn't show up immediately even though the server responds with 201 created. This results in a 404 or even 500 on operations on a file that is supposed to be available on the server. Disabling the static resource caching in the context didn't help. Tomcat 6.0.41 and 7.0.54 act normally. According to rfc, if the server delays the file creation it should return a 202 accepted, not a 201 created. Examples: (1) dav:/webdav/ ls Listing collection `/webdav/': collection is empty. dav:/webdav/ put testfile.bin Uploading testfile.bin to `/webdav/testfile.bin': Progress: [=] 100,0% of 102400 bytes succeeded. dav:/webdav/ propget testfile.bin Fetching properties for `testfile.bin': failed: 404 Not Found [now I'm waiting for a couple of seconds] dav:/webdav/ propget testfile.bin Fetching properties for `testfile.bin': DAV: creationdate = 2014-07-01T16:29:35Z DAV: displayname = testfile.bin DAV: getlastmodified = Tue, 01 Jul 2014 16:29:35 GMT DAV: getcontentlength = 102400 DAV: getcontenttype = application/octet-stream DAV: getetag = W/102400-1404232175000 DAV: resourcetype = DAV: source = DAV: supportedlock = DAV:lockentryDAV:lockscopeDAV:exclusive/DAV:exclusive/DAV:lockscopeDAV:locktypeDAV:write/DAV:write/DAV:locktype/DAV:lockentryDAV:lockentryDAV:lockscopeDAV:shared/DAV:shared/DAV:lockscopeDAV:locktypeDAV:write/DAV:write/DAV:locktype/DAV:lockentry (2) dav:/webdav/ rm testfile.bin Deleting `testfile.bin': succeeded. dav:/webdav/ ls Listing collection `/webdav/': collection is empty. dav:/webdav/ put testfile.bin testfile.bin.tmp Uploading testfile.bin to `/webdav/testfile.bin.tmp': Progress: [=] 100,0% of 102400 bytes succeeded. dav:/webdav/ move testfile.bin.tmp testfile.bin Moving `/webdav/testfile.bin.tmp' to `/webdav/testfile.bin': failed: 500 Internal Server Error [again, waiting for a couple of seconds] dav:/webdav/ move testfile.bin.tmp testfile.bin Moving `/webdav/testfile.bin.tmp' to `/webdav/testfile.bin': succeeded. my web.xml: --%snip%-- ?xml version=1.0 encoding=UTF-8? web-app xmlns=http://java.sun.com/xml/ns/j2ee; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd; version=2.5 display-namewebdav/display-name descriptionwebdav access/description servlet servlet-namewebdav/servlet-name servlet-classorg.apache.catalina.servlets.WebdavServlet/servlet-class init-param param-namedebug/param-name param-value0/param-value /init-param init-param param-namelistings/param-name param-valuetrue/param-value /init-param init-param param-namereadonly/param-name param-valuefalse/param-value /init-param /servlet servlet-mapping servlet-namewebdav/servlet-name url-pattern/*/url-pattern /servlet-mapping security-constraint web-resource-collection web-resource-nameWebDAV/web-resource-name url-pattern/*/url-pattern http-methodCANCELUPLOAD/http-method http-methodCHECKIN/http-method http-methodCHECKOUT/http-method http-methodCOPY/http-method http-methodDELETE/http-method http-methodGET/http-method http-methodGETLIB/http-method http-methodHEAD/http-method http-methodLOCK/http-method http-methodMKCOL/http-method http-methodMOVE/http-method http-methodPROPFIND/http-method http-methodPROPPATCH/http-method http-methodPUT/http-method http-methodREPORT/http-method http-methodUNCHECKOUT/http-method http-methodUNLOCK/http-method http-methodUPDATE/http-method http-methodVERSION-CONTROL/http-method /web-resource-collection auth-constraint role-name*/role-name /auth-constraint /security-constraint login-config auth-methodBASIC/auth-method realm-nameWebDAV/realm-name /login-config security-role descriptionWebDAV User/description role-namewebdav/role-name /security-role distributable / /web-app --%snip%-- -- You are receiving this mail because: You are the assignee
Re: svn commit: r1607309 - in /tomcat/trunk: java/org/apache/catalina/valves/SSLValve.java webapps/docs/changelog.xml
2014-07-02 14:33 GMT+04:00 r...@apache.org: Author: remm Date: Wed Jul 2 10:33:49 2014 New Revision: 1607309 URL: http://svn.apache.org/r1607309 Log: Trivial change to add configuration fields to SSLValve for header names. Modified: tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java tomcat/trunk/webapps/docs/changelog.xml 1) It needs documentation. (docs/config/valve.html) 2) I wonder if there is a need for the new fields to be protected rather than private when they have setters and getters. (Just saying. Not a stopper). Best regards, Konstantin Kolinko Modified: tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=1607309r1=1607308r2=1607309view=diff == --- tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java Wed Jul 2 10:33:49 2014 @@ -64,6 +64,10 @@ public class SSLValve extends ValveBase private static final Log log = LogFactory.getLog(SSLValve.class); +protected String sslClientCertHeader = ssl_client_cert; +protected String sslCipherHeader = ssl_cipher; +protected String sslSessionIdHeader = ssl_session_id; +protected String sslCipherUserKeySizeHeader = ssl_cipher_usekeysize; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56692] request.getParameterNames(); returns empty Enumerations in Valve if servlet never call request.getParameterNames()
https://issues.apache.org/bugzilla/show_bug.cgi?id=56692 --- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com --- 1. Please provide a sample web application that reproduces the issue. 2. If parsing the parameters failed (e.g. due to an IOException), the list of parameters will be empty. This is expected behaviour, as defined by Servlet Specification. In case of a parsing failure request.getAttribute(org.apache.catalina.parameter_parse_failed) will return a non-null value. 3. Debugging: http://wiki.apache.org/tomcat/FAQ/Developing#Debugging -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56693] non-rfc conform delayed file operations with webdav
https://issues.apache.org/bugzilla/show_bug.cgi?id=56693 --- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to aidbmfqognnq6gizaigaq from comment #0) Disabling the static resource caching in the context didn't help. Did you read my answer? http://markmail.org/message/tm5acr27a6j6hfga You did it wrong. There is no such attribute as cachingAllowed on Context in Tomcat 8. The attribute was moved to nested Resources element. http://tomcat.apache.org/migration-8.html#Web_application_resources -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1607422 - /tomcat/native/branches/1.1.x/jnirelease.sh
2014-07-02 21:06 GMT+04:00 ma...@apache.org: Author: markt Date: Wed Jul 2 17:06:31 2014 New Revision: 1607422 URL: http://svn.apache.org/r1607422 Log: Tweak sed command so it does the same thing but works on OSX Modified: tomcat/native/branches/1.1.x/jnirelease.sh Modified: tomcat/native/branches/1.1.x/jnirelease.sh URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1607422r1=1607421r2=1607422view=diff == --- tomcat/native/branches/1.1.x/jnirelease.sh (original) +++ tomcat/native/branches/1.1.x/jnirelease.sh Wed Jul 2 17:06:31 2014 @@ -192,7 +192,7 @@ fi # Remove first 25 lines from converted file which contains # page navagation data. # Remember to increase the lines when new file is added to news. -sed -i '1,25d' ../../CHANGELOG.txt +sed -i '' '1,25d' ../../CHANGELOG.txt The -i option (edit in-place) is not specified in POSIX [1]. The workaround without this option is to pipe output into a new temporary file and replace the original one. Here is an example: http://stackoverflow.com/questions/18527365/what-does-sed-i-option-do I do not expect much portability from jnirelease.sh script that is being run by RM only, but if we start encountering portability issues it may be worth considering. [1] http://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.1.31
2014-07-03 2:07 GMT+04:00 Mark Thomas ma...@apache.org: Version 1.1.31 is bug fix with an update to OpenSSL 1.0.1h to address CVE-2014-0224. The Apache Tomcat Native 1.1.31 is [x] Stable, go ahead and release [ ] Broken because of ... Packaging differences (versus 1.1.30): 1. In both [ocsp]-win32-bin.zip files: In 1.1.31 the files are in a directory named tomcat-native-1.1.31-[ocsp]-win32-bin In 1.1.30 the files are in the root of the archive. This difference shall be taken into account when updating build configurations in Tomcat 8, 7, 6. 2. In src.tar.gz Added 5 files starting with . in jni\native\build\: ._apr_common.m4 ._config.guess ._config.sub ._find_apr.m4 ._install.sh (The src.zip is OK, does not contain those files). Those are some MacOS specific files, containing such text as Mac OS X, ATTR, com.apple.quarantine, q/0001;53b15f45;Firefox; and some binary data. It is odd that other directories do not contain such files. These are not show-stoppers. I've run the testsuite of Tomcat 8 with a) non-OCSP 32-bit b) OCSP 32-bit versions of tcnative-1.dll with Java 7u55 32-bit on Windows 7. Both test runs completed successfully. Version info: INFO [main] org.apache.catalina.core.AprLifecycleListener.init Loaded APR based Apache Tomcat Native library 1.1.31 using APR version 1.4.8. INFO [main] org.apache.catalina.core.AprLifecycleListener.init APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true]. INFO [main] org.apache.catalina.core.AprLifecycleListener.initializeSSL OpenSSL successfully initialized (OpenSSL 1.0.1h 5 Jun 2014) Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.1.31
2014-07-03 0:07 GMT+02:00 Mark Thomas ma...@apache.org: The Apache Tomcat Native 1.1.31 is [X] Stable, go ahead and release [ ] Broken because of ... Rémy
[Bug 56666] Improve code that clears SSO cookie
https://issues.apache.org/bugzilla/show_bug.cgi?id=5 Mark Thomas ma...@apache.org changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Fixed in 8.0.x for 8.0.10 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607592 - in /tomcat/trunk: java/org/apache/catalina/authenticator/SingleSignOn.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 3 11:37:27 2014
New Revision: 1607592
URL: http://svn.apache.org/r1607592
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=5
When clearing the SSO cookie use the same values for domain, path, httpOnly and
secure as were used to set the SSO cookie.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1607592r1=1607591r2=1607592view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Thu
Jul 3 11:37:27 2014
@@ -313,7 +313,26 @@ public class SingleSignOn extends ValveB
if (containerLog.isDebugEnabled()) {
containerLog.debug( No cached principal found, erasing SSO
cookie);
}
+// No need to return a valid SSO session ID
+cookie.setValue(REMOVE);
+// Age of zero will trigger removal
cookie.setMaxAge(0);
+// Domain and path have to match the original cookie to 'replace'
+// the original cookie
+cookie.setPath(/);
+String domain = getCookieDomain();
+if (domain != null) {
+cookie.setDomain(domain);
+}
+// This is going to trigger a Set-Cookie header. While the value is
+// not security sensitive, ensure that expectations for secure and
+// httpOnly are met
+cookie.setSecure(request.isSecure());
+if
(request.getServletContext().getSessionCookieConfig().isHttpOnly() ||
+request.getContext().getUseHttpOnly()) {
+cookie.setHttpOnly(true);
+}
+
response.addCookie(cookie);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1607592r1=1607591r2=1607592view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 3 11:37:27 2014
@@ -95,6 +95,11 @@
fix
Add configuration fields for header names in SSLValve. (remm)
/fix
+ fix
+bug5/bug: When clearing the SSO cookie use the same values for
+domain, path, httpOnly and secure as were used to set the SSO cookie.
+(markt)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607594 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/SingleSignOn.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 3 11:58:23 2014
New Revision: 1607594
URL: http://svn.apache.org/r1607594
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=5
When clearing the SSO cookie use the same values for domain, path, httpOnly and
secure as were used to set the SSO cookie.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1607592
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1607594r1=1607593r2=1607594view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Thu Jul 3 11:58:23 2014
@@ -331,7 +331,26 @@ public class SingleSignOn extends ValveB
} else {
if (containerLog.isDebugEnabled())
containerLog.debug( No cached principal found, erasing SSO
cookie);
+// No need to return a valid SSO session ID
+cookie.setValue(REMOVE);
+// Age of zero will trigger removal
cookie.setMaxAge(0);
+// Domain and path have to match the original cookie to 'replace'
+// the original cookie
+cookie.setPath(/);
+String domain = getCookieDomain();
+if (domain != null) {
+cookie.setDomain(domain);
+}
+// This is going to trigger a Set-Cookie header. While the value is
+// not security sensitive, ensure that expectations for secure and
+// httpOnly are met
+cookie.setSecure(request.isSecure());
+if
(request.getServletContext().getSessionCookieConfig().isHttpOnly() ||
+request.getContext().getUseHttpOnly()) {
+cookie.setHttpOnly(true);
+}
+
response.addCookie(cookie);
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1607594r1=1607593r2=1607594view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jul 3 11:58:23 2014
@@ -125,6 +125,11 @@
bug56665/bug: Correct the generation of the effective web.xml when
elements contain an empty string as value. (violetagg)
/fix
+ fix
+bug5/bug: When clearing the SSO cookie use the same values for
+domain, path, httpOnly and secure as were used to set the SSO cookie.
+(markt)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56666] Improve code that clears SSO cookie
https://issues.apache.org/bugzilla/show_bug.cgi?id=5 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas ma...@apache.org --- Fixed in 7.0.x for 7.0.55 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/159 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1607594 Blamelist: markt BUILD FAILED: failed compile sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607612 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Jul 3 12:41:15 2014 New Revision: 1607612 URL: http://svn.apache.org/r1607612 Log: Whitespace Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1607612r1=1607611r2=1607612view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 3 12:41:15 2014 @@ -98,7 +98,7 @@ fix bug5/bug: When clearing the SSO cookie use the same values for domain, path, httpOnly and secure as were used to set the SSO cookie. -(markt) +(markt) /fix /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56693] non-rfc conform delayed file operations with webdav
https://issues.apache.org/bugzilla/show_bug.cgi?id=56693 --- Comment #2 from aidbmfqognnq6gizaigaqa...@protected32.unixadm.org --- Hi Konstantin, thanks for your reply, that email you mentioned sadly never arrived here. As I'm not familiar enough with it, is the right way to add a META-INF/context.xml containing Context Resource name=org.apache.catalina.servlets.WebdavServlet cachingAllowed=false / /Context ? If that's the case -- it didn't help. Regardless of whether or not disabling the cache may help, if the file is not ready for immediate access after upload tomcat should return a 202 accepted, not a 201 created. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607636 - /tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
Author: markt
Date: Thu Jul 3 13:12:57 2014
New Revision: 1607636
URL: http://svn.apache.org/r1607636
Log:
Remove method parameter that is always true.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1607636r1=1607635r2=1607636view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Thu Jul 3
13:12:57 2014
@@ -68,7 +68,7 @@ public class Cache {
CachedResource cacheEntry = resourceCache.get(path);
if (cacheEntry != null
!cacheEntry.validate(useClassLoaderResources)) {
-removeCacheEntry(path, true);
+removeCacheEntry(path);
cacheEntry = null;
}
@@ -105,7 +105,7 @@ public class Cache {
if (newSize maxSize) {
// Unable to create sufficient space for this resource
// Remove it from the cache
-removeCacheEntry(path, true);
+removeCacheEntry(path);
log.warn(sm.getString(cache.addFail, path));
}
}
@@ -167,7 +167,7 @@ public class Cache {
}
// Remove the entry from the cache
-removeCacheEntry(resource.getWebappPath(), true);
+removeCacheEntry(resource.getWebappPath());
newSize = size.get();
}
@@ -175,11 +175,11 @@ public class Cache {
return newSize;
}
-private void removeCacheEntry(String path, boolean updateSize) {
+private void removeCacheEntry(String path) {
// With concurrent calls for the same path, the entry is only removed
// once and the cache size is only updated (if required) once.
CachedResource cachedResource = resourceCache.remove(path);
-if (cachedResource != null updateSize) {
+if (cachedResource != null) {
long delta = cachedResource.getSize();
size.addAndGet(-delta);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607638 - /tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
Author: markt
Date: Thu Jul 3 13:15:13 2014
New Revision: 1607638
URL: http://svn.apache.org/r1607638
Log:
Set the cache size to zero when it is cleared
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1607638r1=1607637r2=1607638view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Thu Jul 3
13:15:13 2014
@@ -243,6 +243,7 @@ public class Cache {
public void clear() {
resourceCache.clear();
+size.set(0);
}
public long getSize() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/232 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1607638 Blamelist: markt BUILD FAILED: exception compile upload_2 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607660 - in /tomcat/trunk: java/org/apache/catalina/webresources/Cache.java java/org/apache/catalina/webresources/CachedResource.java java/org/apache/catalina/webresources/StandardRoot.j
Author: markt
Date: Thu Jul 3 14:30:21 2014
New Revision: 1607660
URL: http://svn.apache.org/r1607660
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56693
Fix various issues in the static resource cache implementation where the cache
retained a stale entry after the successful completion of an operation that
always invalidates the cache entry such as a delete operation.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1607660r1=1607659r2=1607660view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Thu Jul 3
14:30:21 2014
@@ -76,7 +76,7 @@ public class Cache {
// Local copy to ensure consistency
int objectMaxSizeBytes = getObjectMaxSizeBytes();
CachedResource newCacheEntry =
-new CachedResource(root, path, getTtl(),
objectMaxSizeBytes);
+new CachedResource(this, root, path, getTtl(),
objectMaxSizeBytes);
// Concurrent callers will end up with the same CachedResource
// instance
@@ -175,7 +175,7 @@ public class Cache {
return newSize;
}
-private void removeCacheEntry(String path) {
+void removeCacheEntry(String path) {
// With concurrent calls for the same path, the entry is only removed
// once and the cache size is only updated (if required) once.
CachedResource cachedResource = resourceCache.remove(path);
Modified: tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java?rev=1607660r1=1607659r2=1607660view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java Thu
Jul 3 14:30:21 2014
@@ -36,6 +36,7 @@ public class CachedResource implements W
// based on profiler data.
private static final long CACHE_ENTRY_SIZE = 500;
+private final Cache cache;
private final StandardRoot root;
private final String webAppPath;
private final long ttl;
@@ -54,8 +55,9 @@ public class CachedResource implements W
private volatile Long cachedContentLength = null;
-public CachedResource(StandardRoot root, String path, long ttl,
+public CachedResource(Cache cache, StandardRoot root, String path, long
ttl,
int objectMaxSizeBytes) {
+this.cache = cache;
this.root = root;
this.webAppPath = path;
this.ttl = ttl;
@@ -180,7 +182,11 @@ public class CachedResource implements W
@Override
public boolean delete() {
-return webResource.delete();
+boolean deleteResult = webResource.delete();
+if (deleteResult) {
+cache.removeCacheEntry(webAppPath);
+}
+return deleteResult;
}
@Override
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1607660r1=1607659r2=1607660view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Thu
Jul 3 14:30:21 2014
@@ -164,7 +164,13 @@ public class StandardRoot extends Lifecy
return false;
}
-return main.mkdir(path);
+boolean mkdirResult = main.mkdir(path);
+
+if (mkdirResult isCachingAllowed()) {
+// Remove the entry from the cache so the new directory is visible
+cache.removeCacheEntry(path);
+}
+return mkdirResult;
}
@Override
@@ -175,7 +181,14 @@ public class StandardRoot extends Lifecy
return false;
}
-return main.write(path, is, overwrite);
+boolean writeResult = main.write(path, is, overwrite);
+
+if (writeResult isCachingAllowed()) {
+// Remove the entry from the cache so the new resource is visible
+cache.removeCacheEntry(path);
+}
+
+return writeResult;
}
private boolean preResourceExists(String path) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
[Bug 56693] non-rfc conform delayed file operations with webdav
https://issues.apache.org/bugzilla/show_bug.cgi?id=56693 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas ma...@apache.org --- It was the static resource cache that wasn't invalidating cache entries when it knew the current entry was invalid. This has been fixed in 8.0.x for 8.0.10 onwards. I have also fixed a handful of other failures identified by the Litmus WebDAV testsuite. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Graceful shutdown via Tomcat
Hello I want to know if there is an easy way, such as command line for example, to gracefully shutdown Tomcat. By graceful shutdown I mean: 1. Rejecting new requests/session/connection 2. Successfully handle existing requests/sessions/connection. Thank you for assisting
Re: Graceful shutdown via Tomcat
Efrat, On 7/3/14, 10:37 AM, Efrat Ben Yosef wrote: I want to know if there is an easy way, such as command line for example, to gracefully shutdown Tomcat. By graceful shutdown I mean: 1. Rejecting new requests/session/connection 2. Successfully handle existing requests/sessions/connection. I haven't done extensive testing, but I believe the behavior you describe is how Tomcat usually shuts down when you send the SHUTDOWN command to the shutdown port. Are you experiencing something different? Please explain how you are starting/stopping Tomcat and what behavior you are observing. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1607675 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Jul 3 15:31:35 2014
New Revision: 1607675
URL: http://svn.apache.org/r1607675
Log:
Update Checkstyle to version 5.7
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1607675r1=1607674r2=1607675view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Jul 3 15:31:35 2014
@@ -205,9 +205,10 @@ objenesis.loc=https://objenesis.googleco
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
# - Checkstyle, version 5.1 or later -
-checkstyle.version=5.6
+checkstyle.version=5.7
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
-checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle-${checkstyle.version}-bin.zip
+#checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle-${checkstyle.version}-bin.zip
+checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-bin.zip
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
# - JSON Libraries (for bayeux module) -
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1607675r1=1607674r2=1607675view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 3 15:31:35 2014
@@ -162,6 +162,9 @@
Simplify implementation of setproxy target in codebuild.xml/code.
(kkolinko)
/scode
+ update
+Update optional Checkstyle library to 5.7. (kkolinko)
+ /update
/changelog
/subsection
/section
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607678 - /tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Author: markt
Date: Thu Jul 3 15:37:48 2014
New Revision: 1607678
URL: http://svn.apache.org/r1607678
Log:
Fix a warning with the Litmus WebDAV testsuite
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1607678r1=1607677r2=1607678view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Thu Jul
3 15:37:48 2014
@@ -1676,6 +1676,18 @@ public class WebdavServlet
copyResource(errorList, childSrc, childDest);
}
} else if (sourceResource.isFile()) {
+WebResource destResource = resources.getResource(dest);
+if (!destResource.exists()
!destResource.getWebappPath().endsWith(/)) {
+int lastSlash = destResource.getWebappPath().lastIndexOf('/');
+if (lastSlash 0) {
+String parent = destResource.getWebappPath().substring(0,
lastSlash);
+WebResource parentResource = resources.getResource(parent);
+if (!parentResource.isDirectory()) {
+errorList.put(source, new
Integer(WebdavStatus.SC_CONFLICT));
+return false;
+}
+}
+}
if (!resources.write(dest, sourceResource.getInputStream(),
false)) {
errorList.put(source,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56652] EL defineFunction does not support method signatures with arrays as arguments
https://issues.apache.org/bugzilla/show_bug.cgi?id=56652 Mark Thomas ma...@apache.org changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Patches should be attached to issues in diff -u format. Providing the patch in other formats slows down the review process. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/233 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1607660 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/234 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1607678 Blamelist: kkolinko,markt BUILD FAILED: exception compile_1 upload_2 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56694] New: checkInterval attribute is not existant on StandardManager or embedded Stores of PersistentManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=56694 Bug ID: 56694 Summary: checkInterval attribute is not existant on StandardManager or embedded Stores of PersistentManager Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: trivial Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: felix.schumac...@internetallee.de Created attachment 31789 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31789action=edit remove checkInterval from docs There is no attribute checkInterval in StandardManager or the embedded Stores of PersistentManager. So just remove the attribute description from the documentation. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607740 - /tomcat/trunk/build.properties.default
Author: kkolinko
Date: Thu Jul 3 20:26:47 2014
New Revision: 1607740
URL: http://svn.apache.org/r1607740
Log:
Remove commented-out line.
(It works as well, but responds with permanent redirect to the longer url).
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1607740r1=1607739r2=1607740view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Jul 3 20:26:47 2014
@@ -207,7 +207,6 @@ objenesis.jar=${objenesis.home}/objenesi
# - Checkstyle, version 5.1 or later -
checkstyle.version=5.7
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
-#checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle-${checkstyle.version}-bin.zip
checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-bin.zip
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607742 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Jul 3 20:32:44 2014
New Revision: 1607742
URL: http://svn.apache.org/r1607742
Log:
Update Checkstyle to version 5.7
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1607675,1607740
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1607742r1=1607741r2=1607742view=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Thu Jul 3 20:32:44 2014
@@ -193,9 +193,9 @@ hamcrest.jar=${hamcrest.home}/hamcrest-c
hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
# - Checkstyle, version 5.1 or later -
-checkstyle.version=5.6
+checkstyle.version=5.7
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
-checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle-${checkstyle.version}-bin.zip
+checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-bin.zip
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
# - JSON Libraries (for bayeux module) -
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1607742r1=1607741r2=1607742view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jul 3 20:32:44 2014
@@ -233,6 +233,13 @@
/fix
/changelog
/subsection
+ subsection name=Other
+changelog
+ update
+Update optional Checkstyle library to 5.7. (kkolinko)
+ /update
+/changelog
+ /subsection
/section
section name=Tomcat 7.0.54 (violetagg) rtext=released 2014-05-22
subsection name=Catalina
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/160 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1607742 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/235 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1607740 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56692] request.getParameterNames(); returns empty Enumerations in Valve if servlet never call request.getParameterNames()
https://issues.apache.org/bugzilla/show_bug.cgi?id=56692 Violeta Georgieva violet...@apache.org changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #2 from Violeta Georgieva violet...@apache.org --- Hi, I cannot reproduce the described behavior. As Konstantin wrote please provide a reproducible example otherwise I'll close the issue with WORKSFORME. Regards, Violeta -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56692] request.getParameterNames(); returns empty Enumerations in Valve if servlet never call request.getParameterNames()
https://issues.apache.org/bugzilla/show_bug.cgi?id=56692 --- Comment #3 from chanjarster chanjars...@gmail.com --- Created attachment 31791 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31791action=edit Code can reproduce the bug See Class BUG56692. I comment out the code on line:38, and try to print out the param on line:66, nothing prints out If I remove the comment on line:38, then param name shows. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
