svn commit: r1593265 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu May 8 13:14:14 2014 New Revision: 1593265 URL: http://svn.apache.org/r1593265 Log: Proposal 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=1593265r1=1593264r2=1593265view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 8 13:14:14 2014 @@ -110,6 +110,11 @@ PATCHES PROPOSED TO BACKPORT: merge is unlikely to complete cleanly without Mark's 2014-04-28-bug56334-tc6-v1.patch being applied first. +* Clean-up and additional packages + svn.apache.org/r1593262 + +1: markt + -1: + PATCHES/ISSUES THAT ARE STALLED: - 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-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/63 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1593880 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
[Bug 56488] jaas custom login module
https://issues.apache.org/bugzilla/show_bug.cgi?id=56488
--- Comment #7 from dstojkov dstojkov2...@yahoo.fr ---
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.mycompany.testjaas.jaas;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
/**
*
* @author dstojkov
*/
public class SimpleLoginModule implements LoginModule {
private CallbackHandler handler;
private Subject subject;
private UserPrincipal userPrincipal;
private RolePrincipal rolePrincipal;
private String login;
private ListString userGroups;
@Override
public void initialize(Subject subject,
CallbackHandler callbackHandler,
MapString, ? sharedState,
MapString, ? options) {
handler = callbackHandler;
this.subject = subject;
}
@Override
public boolean login() throws LoginException {
Callback[] callbacks = new Callback[2];
callbacks[0] = new NameCallback(login);
callbacks[1] = new PasswordCallback(password, true);
try {
handler.handle(callbacks);
String name = ((NameCallback)callbacks[0]).getName();
String password = String.valueOf(((PasswordCallback)callbacks[1])
.getPassword());
// Here we validate the credentials against some
// authentication/authorization provider.
// It can be a Database, an external LDAP,
// a Web Service, etc.
// For this tutorial we are just checking if
// user is user123 and password is pass123
if(name != null
name.equals(user123)
password != null
password.equals(pass123)) {
// We store the username and roles
// fetched from the credentials provider
// to be used later in commit() method.
// For this tutorial we hard coded the
// admin role
login = name;
userGroups = new ArrayListString();
userGroups.add(admin);
return true;
}
// If credentials are NOT OK we throw a LoginException
throw new LoginException(Authentication failed);
} catch(IOException e) {
throw new LoginException(e.getMessage());
} catch(UnsupportedCallbackException e) {
throw new LoginException(e.getMessage());
}
}
@Override
public boolean commit() throws LoginException {
userPrincipal = new UserPrincipal(login);
subject.getPrincipals().add(userPrincipal);
if(userGroups != null userGroups.size() 0) {
for(String groupName : userGroups) {
rolePrincipal = new RolePrincipal(groupName);
subject.getPrincipals().add(rolePrincipal);
}
}
return true;
}
@Override
public boolean abort() throws LoginException {
return false;
}
@Override
public boolean logout() throws LoginException {
subject.getPrincipals().remove(userPrincipal);
subject.getPrincipals().remove(rolePrincipal);
return true;
}
}
--
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 56512] New: filter url-pattern xyz/* does not match xyz/
https://issues.apache.org/bugzilla/show_bug.cgi?id=56512
Bug ID: 56512
Summary: filter url-pattern xyz/* does not match xyz/
Product: Tomcat 7
Version: trunk
Hardware: All
OS: All
Status: NEW
Severity: trivial
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: j...@yahoo.com
I was looking for what patterns are valid for url-pattern, and I was unable to
find any official documentation, so I went to the source:
http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
I believe this line is an error:
} else if ('/' == requestPath.charAt(testPath.length() - 2)) {
And I believe it should be:
} else if ('/' == requestPath.charAt(testPath.length() - 1)) {
--
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 56512] filter url-pattern xyz/* does not match xyz/
https://issues.apache.org/bugzilla/show_bug.cgi?id=56512 j...@yahoo.com changed: What|Removed |Added CC||j...@yahoo.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
svn commit: r1593371 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml
Author: kkolinko
Date: Thu May 8 18:36:11 2014
New Revision: 1593371
URL: http://svn.apache.org/r1593371
Log:
Merged r1593335 from tomcat/trunk:
Review of r1593288:
Do not forget to call the symmetrical unset method on stop.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1593335
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1593371r1=1593370r2=1593371view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
Thu May 8 18:36:11 2014
@@ -329,7 +329,8 @@ public class NamingContextListener
}
ContextAccessController.unsetSecurityToken(getName(), container);
-
+ContextAccessController.unsetSecurityToken(container, container);
+
// unregister mbeans.
CollectionObjectName names = objectNames.values();
for (ObjectName objectName : names) {
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=1593371r1=1593370r2=1593371view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu May 8 18:36:11 2014
@@ -156,6 +156,10 @@
requiring code to have the codeaccessClassInPackage/code permission
when running under a security manager. (markt)
/add
+ fix
+Make the naming context tokens for containers more robust by using a
+separate object. (markt/kkolinko)
+ /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: r1593047 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11Nio2Processor.java java/org/apache/coyote/http11/InternalNio2InputBuffer.java java/org/apache/tomcat/util/net/Nio2Endpoint.
Author: remm
Date: Wed May 7 16:00:44 2014
New Revision: 1593047
URL: http://svn.apache.org/r1593047
Log:
- Fix possible (very rare) corruption doing keepalive after a Comet request.
- Stop ignoring read pending exceptions.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1593047r1=1593046r2=1593047view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Wed May
7 16:00:44 2014
@@ -132,7 +132,9 @@ public class Http11Nio2Processor extends
if (keepAlive) {
inputBuffer.nextRequest();
outputBuffer.nextRequest();
-return SocketState.OPEN;
+// Following Comet processing, a read is still pending, so
+// keep the processor associated
+return SocketState.LONG;
} else {
return SocketState.CLOSED;
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java?rev=1593047r1=1593046r2=1593047view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java Wed
May 7 16:00:44 2014
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.nio.channels.CompletionHandler;
-import java.nio.channels.ReadPendingException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -265,12 +264,8 @@ public class InternalNio2InputBuffer ext
flipped = false;
readPending = true;
Nio2Endpoint.startInline();
-try {
-socket.getSocket().read(byteBuffer,
socket.getTimeout(),
+socket.getSocket().read(byteBuffer,
socket.getTimeout(),
TimeUnit.MILLISECONDS, socket,
completionHandler);
-} catch (ReadPendingException e) {
-// Ignore ?
-}
Nio2Endpoint.endInline();
// Return the number of bytes that have been placed
into the buffer
if (!readPending) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1593047r1=1593046r2=1593047view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Wed May 7
16:00:44 2014
@@ -29,7 +29,6 @@ import java.nio.channels.AsynchronousSoc
import java.nio.channels.ClosedChannelException;
import java.nio.channels.CompletionHandler;
import java.nio.channels.FileChannel;
-import java.nio.channels.ReadPendingException;
import java.nio.file.StandardOpenOption;
import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
@@ -922,12 +921,8 @@ public class Nio2Endpoint extends Abstra
}
ByteBuffer byteBuffer =
socket.getSocket().getBufHandler().getReadBuffer();
byteBuffer.clear();
-try {
-socket.getSocket().read(byteBuffer, socket.getTimeout(),
-TimeUnit.MILLISECONDS, socket, awaitBytes);
-} catch (ReadPendingException e) {
-// Ignore
-}
+socket.getSocket().read(byteBuffer, socket.getTimeout(),
+ TimeUnit.MILLISECONDS, socket, awaitBytes);
}
public boolean processSendfile(final Nio2SocketWrapper socket) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1593047r1=1593046r2=1593047view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May 7 16:00:44 2014
@@ -182,6 +182,9 @@
bug56416/bug: Correct documentation for default
Re: JDK 9 build 06 is available on java.net
Thanks for confirming, working on backports. Rgds, Rory On 08/05/2014 22:17, Mark Thomas wrote: On 02/05/2014 12:39, Rory O'Donnell Oracle, Dublin Ireland wrote: Hi Mark, The fix for JDK-8039751 https://bugs.openjdk.java.net/browse/JDK-8039751 fix is in 9 b10, now available for download https://jdk9.java.net/download/ . Can you test and let me know results, assuming a fix we will them work on backports. The Tomcat UTF-8 tests now all pass without having to add any workarounds for bugs in the JRE provided UTF-8 decoder. This looks good to back-port to me. Cheers, Mark Rgds,Rory On 09/04/2014 14:36, Rory O'Donnell Oracle, Dublin ireland wrote: https://bugs.openjdk.java.net/browse/JDK-8039751 Dalibor has written a blog http://robilad.livejournal.com/139637.html on how to track your issues in the JDK bug system. I hope this helps. Rgds,Rory On 04/ 9/14 01:25 PM, Mark Thomas wrote: On 09/04/2014 05:59, Mark Thomas wrote: On 09/04/2014 05:14, Rory O'Donnell Oracle, Dublin ireland wrote: Hi Mark, If you log a bug, send me the incident number, I will follow it up. I'll see if I can find the incident number for the bug I already reported but I think I deleted the e-mail after 6 or so months of no response. If I don't find it, I open a new incident. Your Report (Review ID: JI-9011609) - UTF-8 decoder fails to handle some edge cases correctly I didn't say so in the bug report but I'm happy to walk Oracle through any of the failing test cases if it isn't clear why any of them are bugs. Just point them towards the Tomcat dev list. If you can nudge the right folks into getting this fixed for both Java 7 and Java 8 that would great. I'd be extremely happy to be able to delete Tomcat's customer UTF-8 decoder. Mark Mark Rgds, Rory On 04/ 9/14 12:00 PM, Mark Thomas wrote: On 09/04/2014 04:36, Rory O'Donnell Oracle, Dublin ireland wrote: Hi Mark, I suggest you send an email to core-libs-...@openjdk.java.net or log a bug. I've already filed the bug against Java. As far as I recall I never received any response - not unusual in my experience of reporting bugs with Java. I've pretty much reached the conclusion - after reporting multiple bugs only to have them completely ignored - that reporting bugs in Java is a waste of my time. I'll try the e-mail route but I have little hope that anything will actually come of it. Mark Rgds, Rory On 04/ 8/14 12:49 PM, Mark Thomas wrote: On 08/04/2014 02:25, Rory O'Donnell Oracle, Dublin Ireland wrote: Hi Mladen, JDK 9 Build 06 Early Access Build is now available for download https://jdk9.java.net/download test. Rgds, Rory Rory, Java 8 (and I am guessing Java 9) still has issues with UTF-8 decoding. For the latest status, see the Tomcat 8 unit tests for Java 8 decoding [1]. If you look at the change history you'll see how things improved between Java 7 and Java 8. It should be obvious what the problems are from that unit test but ask of the Tomcat dev list if things aren't clear. Mark [1] http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/buf/TestUtf8.java?view=annotate - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org -- Rgds, Rory O'Donnell Senior Quality Engineering Manager Java Platform Group Oracle EMEA , Block P5, East Point Business Park, Dublin 3 Phone: +353 (0)1 8033887 -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA , Dublin, Ireland - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA , Dublin, Ireland - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593232 - /tomcat/trunk/java/org/apache/naming/ContextBindings.java
Author: markt
Date: Thu May 8 10:35:14 2014
New Revision: 1593232
URL: http://svn.apache.org/r1593232
Log:
No functional change.
Rename fields and variables and update comments to reflect current usage
Modified:
tomcat/trunk/java/org/apache/naming/ContextBindings.java
Modified: tomcat/trunk/java/org/apache/naming/ContextBindings.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ContextBindings.java?rev=1593232r1=1593231r2=1593232view=diff
==
--- tomcat/trunk/java/org/apache/naming/ContextBindings.java (original)
+++ tomcat/trunk/java/org/apache/naming/ContextBindings.java Thu May 8
10:35:14 2014
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.naming;
import java.util.Hashtable;
@@ -26,9 +24,14 @@ import javax.naming.NamingException;
/**
* Handles the associations :
* ul
- * liCatalina context name with the NamingContext/li
- * liCalling thread with the NamingContext/li
+ * liObject with a NamingContext/li
+ * liCalling thread with a NamingContext/li
+ * liCalling thread with object bound to the same naming context/li
+ * liThread context class loader with a NamingContext/li
+ * liThread context class loader with object bound to the same
+ * NamingContext/li
* /ul
+ * The objects are typically Catalina Server or Context objects.
*
* @author Remy Maucherat
*/
@@ -39,37 +42,37 @@ public class ContextBindings {
/**
- * Bindings name - naming context. Keyed by name.
+ * Bindings object - naming context. Keyed by object.
*/
-private static final HashtableObject,Context contextNameBindings =
+private static final HashtableObject,Context objectBindings =
new Hashtable();
/**
- * Bindings thread - naming context. Keyed by thread id.
+ * Bindings thread - naming context. Keyed by thread.
*/
private static final HashtableThread,Context threadBindings =
new Hashtable();
/**
- * Bindings thread - name. Keyed by thread id.
+ * Bindings thread - object. Keyed by thread.
*/
-private static final HashtableThread,Object threadNameBindings =
+private static final HashtableThread,Object threadObjectBindings =
new Hashtable();
/**
- * Bindings class loader - naming context. Keyed by CL id.
+ * Bindings class loader - naming context. Keyed by class loader.
*/
private static final HashtableClassLoader,Context clBindings =
new Hashtable();
/**
- * Bindings class loader - name. Keyed by CL id.
+ * Bindings class loader - object. Keyed by class loader.
*/
-private static final HashtableClassLoader,Object clNameBindings =
+private static final HashtableClassLoader,Object clObjectBindings =
new Hashtable();
@@ -84,113 +87,115 @@ public class ContextBindings {
/**
- * Binds a context name.
+ * Binds an object and a naming context.
*
- * @param name Name of the context
- * @param context Associated naming context instance
+ * @param obj Object to bind with naming context
+ * @param context Associated naming context instance
*/
-public static void bindContext(Object name, Context context) {
-bindContext(name, context, null);
+public static void bindContext(Object obj, Context context) {
+bindContext(obj, context, null);
}
/**
- * Binds a context name.
+ * Binds an object and a naming context.
*
- * @param name Name of the context
- * @param context Associated naming context instance
- * @param token Security token
- */
-public static void bindContext(Object name, Context context,
- Object token) {
-if (ContextAccessController.checkSecurityToken(name, token))
-contextNameBindings.put(name, context);
+ * @param obj Object to bind with naming context
+ * @param context Associated naming context instance
+ * @param token Security token
+ */
+public static void bindContext(Object obj, Context context, Object token) {
+if (ContextAccessController.checkSecurityToken(obj, token)) {
+objectBindings.put(obj, context);
+}
}
/**
- * Unbind context name.
+ * Unbinds an object and a naming context.
*
- * @param name Name of the context
+ * @param obj Object to unbind
* @param token Security token
*/
-public static void unbindContext(Object name, Object token) {
-if (ContextAccessController.checkSecurityToken(name, token))
-contextNameBindings.remove(name);
+public static void unbindContext(Object obj, Object token) {
+if (ContextAccessController.checkSecurityToken(obj, token)) {
+
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/48 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] 1593201 Blamelist: violetagg Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56492] Avoid eclipse debugger pausing on uncaught exceptions when tomcat renews its threads
https://issues.apache.org/bugzilla/show_bug.cgi?id=56492 Sylvain Laurent slaur...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Sylvain Laurent slaur...@apache.org --- I merged to tomcat 7 : r1593392 The fix will be available in tomcat 7.0.54 and tomcat 8.0.6 -- 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: r1593514 - /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/
Author: markt Date: Fri May 9 11:01:52 2014 New Revision: 1593514 URL: http://svn.apache.org/r1593514 Log: Simplify Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ (props changed) Propchange: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ -- Merged /commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:r1458501-1458579,1458581-1458596,1458598-1458927,1458929-1458935,1458937-1459120,1459122-1459182,1459185-1459187,1459189-1459900,1459902-1460342,1460344-1475835,1475837-1507047,1507049-1513133 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593940 - in /tomcat/trunk: java/org/apache/catalina/realm/JAASMemoryLoginModule.java webapps/docs/changelog.xml
Author: markt
Date: Mon May 12 12:10:05 2014
New Revision: 1593940
URL: http://svn.apache.org/r1593940
Log:
Correct regression introduced in r797162 that broke authentication of users
when using the JASSMemoryLoginModule.
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=1593940r1=1593939r2=1593940view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Mon
May 12 12:10:05 2014
@@ -182,7 +182,7 @@ public class JAASMemoryLoginModule exten
String roles[] = ((GenericPrincipal) principal).getRoles();
for (int i = 0; i roles.length; i++) {
subject.getPrincipals().add(
-new GenericPrincipal(null, roles[i], null));
+new GenericPrincipal(roles[i], null, null));
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1593940r1=1593939r2=1593940view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon May 12 12:10:05 2014
@@ -183,8 +183,13 @@
codethreadRenewalDelay/code setting. Improve documentation.
(kkolinko)
/fix
fix
-Fix regression introduced in rev1239520/rev that broke loading of
-users from codetomcat-users.xml/code when using the
+Correct regression introduced in rev1239520/rev that broke loading
+of users from codetomcat-users.xml/code when using the
+codeJASSMemoryLoginModule/code. (markt)
+ /fix
+ fix
+Correct regression introduced in rev797162/rev that broke
+authentication of users when using the
codeJASSMemoryLoginModule/code. (markt)
/fix
/changelog
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593939 - in /tomcat/trunk: java/org/apache/catalina/realm/JAASCallbackHandler.java java/org/apache/catalina/realm/JAASMemoryLoginModule.java webapps/docs/changelog.xml
Author: markt
Date: Mon May 12 12:05:01 2014
New Revision: 1593939
URL: http://svn.apache.org/r1593939
Log:
Fix regression introduced in r1239520 that broke loading of users from
tomcat-users.xml when using the JASSMemoryLoginModule
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java
tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java?rev=1593939r1=1593938r2=1593939view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java Mon
May 12 12:05:01 2014
@@ -215,6 +215,8 @@ public class JAASCallbackHandler impleme
cb.setText(md5a2);
} else if (cb.getPrompt().equals(authMethod)) {
cb.setText(authMethod);
+} else if (cb.getPrompt().equals(catalinaBase)) {
+
cb.setText(realm.getContainer().getCatalinaBase().getAbsolutePath());
} else {
throw new UnsupportedCallbackException(callbacks[i]);
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=1593939r1=1593938r2=1593939view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Mon
May 12 12:05:01 2014
@@ -338,8 +338,15 @@ public class JAASMemoryLoginModule exten
// Validate the existence of our configuration file
File file = new File(pathname);
-if (!file.isAbsolute())
-file = new File(getContainer().getCatalinaBase(), pathname);
+if (!file.isAbsolute()) {
+String catalinaBase = getCatalinaBase();
+if (catalinaBase == null) {
+log.warn(Unable to determine Catalina base to load file +
pathname);
+return;
+} else {
+file = new File(catalinaBase, pathname);
+}
+}
if (!file.exists() || !file.canRead()) {
log.warn(Cannot load configuration file +
file.getAbsolutePath());
return;
@@ -359,6 +366,29 @@ public class JAASMemoryLoginModule exten
} finally {
digester.reset();
}
+}
+
+private String getCatalinaBase() {
+// Have to get this via a callback as that is the only link we have
back
+// to the defining Realm. Can't use the system property as that may not
+// be set/correct in an embedded scenario
+
+if (callbackHandler == null) {
+return null;
+}
+
+Callback callbacks[] = new Callback[1];
+callbacks[0] = new TextInputCallback(catalinaBase);
+
+String result = null;
+
+try {
+callbackHandler.handle(callbacks);
+result = ((TextInputCallback) callbacks[0]).getText();
+} catch (IOException | UnsupportedCallbackException e) {
+return null;
+}
+return result;
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1593939r1=1593938r2=1593939view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon May 12 12:05:01 2014
@@ -182,6 +182,11 @@
trigger threads renewal for failed contexts. Do not ignore
codethreadRenewalDelay/code setting. Improve documentation.
(kkolinko)
/fix
+ fix
+Fix regression introduced in rev1239520/rev that broke loading of
+users from codetomcat-users.xml/code when using the
+codeJASSMemoryLoginModule/code. (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 56512] filter url-pattern xyz/* does not match xyz/
https://issues.apache.org/bugzilla/show_bug.cgi?id=56512 --- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to j__n from comment #0) I was looking for what patterns are valid for url-pattern, and I was unable to find any official documentation, Read the Servlet specification. It is all documented there. -- 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 56513] New: Javadoc change for NIO compression and NIO sendfile
https://issues.apache.org/bugzilla/show_bug.cgi?id=56513 Bug ID: 56513 Summary: Javadoc change for NIO compression and NIO sendfile Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: mgai...@hotmail.com In NIO Connector documentation compression is mentioned sendfile use is mentioned but the 2 clearly do not work together in a NIO Connector https://tomcat.apache.org/tomcat-7.0-doc/aio.html states When APR or NIO is enabled, Tomcat supports using sendfile to send large static files. These writes, as soon as the system load increases, will be performed asynchronously in the most efficient way. Instead of sending a large response using blocking writes, it is possible to write content to a static file, and write it using a sendfile code. A caching valve could take advantage of this to cache the response data in a file rather than store it in memory. Sendfile support is available if the request attribute org.apache.tomcat.sendfile.support is set to Boolean.TRUE. Any servlet can instruct Tomcat to perform a sendfile call by setting the appropriate request attributes. It is also necessary to correctly set the content length for the response. When using sendfile, it is best to ensure that neither the request or response have been wrapped, since as the response body will be sent later by the connector itself, it cannot be filtered. Other than setting the 3 needed request attributes, the servlet should not send any response data, but it may use any method which will result in modifying the response header (like setting cookies). org.apache.tomcat.sendfile.filename: Canonical filename of the file which will be sent as a String org.apache.tomcat.sendfile.start: Start offset as a Long org.apache.tomcat.sendfile.end: End offset as a Long Needs to state: NIO works with either sendfile OR compression NIO with Sendfile: NIO with Compression: http://tomcat.apache.org/tomcat-7.0-doc/config/http.html#NIO_specific_configuration states (with regards to compression) Note: There is a tradeoff between using compression (saving your bandwidth) and using the sendfile feature (saving your CPU cycles). If the connector supports the sendfile feature, e.g. the NIO connector, using sendfile will take precedence over compression. The symptoms will be that static files greater that 48 Kb will be sent uncompressed. You can turn off sendfile by setting useSendfile attribute of the connector, as documented below, or change the sendfile usage threshold in the configuration of the DefaultServlet in the default conf/web.xml or in the web.xml of your web application. Needs to say: NIO works with sendfile feature OR compression NIO with Sendfile: NIO with Compression: -- 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 56512] filter url-pattern xyz/* does not match xyz/
https://issues.apache.org/bugzilla/show_bug.cgi?id=56512
Konstantin Kolinko knst.koli...@gmail.com changed:
What|Removed |Added
Status|NEW |RESOLVED
Resolution|--- |INVALID
--- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com ---
(In reply to j__n from comment #0)
I was looking for what patterns are valid for url-pattern, and I was unable
to find any official documentation, so I went to the source:
The code in ApplicationFilterFactory.matchFiltersURL(String, String) is
[[[
// Case 2 - Path Match (/.../*)
if (testPath.equals(/*))
return (true);
if (testPath.endsWith(/*)) {
if (testPath.regionMatches(0, requestPath, 0,
testPath.length() - 2)) {
if (requestPath.length() == (testPath.length() - 2)) {
return (true);
} else if ('/' == requestPath.charAt(testPath.length() - 2)) {
return (true);
}
}
return (false);
}
]]]
testPath.length() - 2 is url-pattern minus ending /*.
The first if (requestPath.length() == (testPath.length() - 2)) covers the
case when request uri is equal to pattern.substring(0, pattern.length()-2).
The second if ('/' == requestPath.charAt(testPath.length() - 2)) covers the
case when request uri starts with (pattern.substring(0, pattern.length()-2) +
'/').
I see no error here.
--
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: r1593946 - /tomcat/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon May 12 12:37:09 2014 New Revision: 1593946 URL: http://svn.apache.org/r1593946 Log: Correct typos in class name 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=1593946r1=1593945r2=1593946view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon May 12 12:37:09 2014 @@ -185,12 +185,12 @@ fix Correct regression introduced in rev1239520/rev that broke loading of users from codetomcat-users.xml/code when using the -codeJASSMemoryLoginModule/code. (markt) +codeJAASMemoryLoginModule/code. (markt) /fix fix Correct regression introduced in rev797162/rev that broke authentication of users when using the -codeJASSMemoryLoginModule/code. (markt) +codeJAASMemoryLoginModule/code. (markt) /fix /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1593939 - svn:log
Author: kkolinko Revision: 1593939 Modified property: svn:log Modified: svn:log at Mon May 12 12:37:41 2014 -- --- svn:log (original) +++ svn:log Mon May 12 12:37:41 2014 @@ -1 +1 @@ -Fix regression introduced in r1239520 that broke loading of users from tomcat-users.xml when using the JASSMemoryLoginModule +Fix regression introduced in r1239520 that broke loading of users from tomcat-users.xml when using the JAASMemoryLoginModule - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593389 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml
Author: kkolinko
Date: Thu May 8 19:19:42 2014
New Revision: 1593389
URL: http://svn.apache.org/r1593389
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56472#c1
Per my comment on that issue, always set 'NamingContextListener.initialized'
field to 'true'
so that its cleanup on configure_stop event is not skipped.
It is backport of r1593356 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1593356
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1593389r1=1593388r2=1593389view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
Thu May 8 19:19:42 2014
@@ -246,102 +246,109 @@ public class NamingContextListener
if (initialized)
return;
-HashtableString, Object contextEnv = new HashtableString,
Object();
try {
-namingContext = new NamingContext(contextEnv, getName());
-} catch (NamingException e) {
-// Never happens
-}
-ContextAccessController.setSecurityToken(getName(), container);
-ContextAccessController.setSecurityToken(container, container);
-ContextBindings.bindContext(container, namingContext, container);
-if( log.isDebugEnabled() ) {
-log.debug(Bound + container );
-}
+HashtableString, Object contextEnv = new HashtableString,
Object();
+try {
+namingContext = new NamingContext(contextEnv, getName());
+} catch (NamingException e) {
+// Never happens
+}
+ContextAccessController.setSecurityToken(getName(), container);
+ContextAccessController.setSecurityToken(container, container);
+ContextBindings.bindContext(container, namingContext,
container);
+if( log.isDebugEnabled() ) {
+log.debug(Bound + container );
+}
-// Configure write when read-only behaviour
-namingContext.setExceptionOnFailedWrite(
-getExceptionOnFailedWrite());
+// Configure write when read-only behaviour
+namingContext.setExceptionOnFailedWrite(
+getExceptionOnFailedWrite());
-// Setting the context in read/write mode
-ContextAccessController.setWritable(getName(), container);
+// Setting the context in read/write mode
+ContextAccessController.setWritable(getName(), container);
-try {
-createNamingContext();
-} catch (NamingException e) {
-logger.error
+try {
+createNamingContext();
+} catch (NamingException e) {
+logger.error
(sm.getString(naming.namingContextCreationFailed, e));
-}
+}
-namingResources.addPropertyChangeListener(this);
+namingResources.addPropertyChangeListener(this);
-// Binding the naming context to the class loader
-if (container instanceof Context) {
-// Setting the context in read only mode
-ContextAccessController.setReadOnly(getName());
-try {
-ContextBindings.bindClassLoader
+// Binding the naming context to the class loader
+if (container instanceof Context) {
+// Setting the context in read only mode
+ContextAccessController.setReadOnly(getName());
+try {
+ContextBindings.bindClassLoader
(container, container,
- ((Container) container).getLoader().getClassLoader());
-} catch (NamingException e) {
-logger.error(sm.getString(naming.bindFailed, e));
+((Container)
container).getLoader().getClassLoader());
+} catch (NamingException e) {
+logger.error(sm.getString(naming.bindFailed, e));
+}
}
-}
-if (container instanceof Server) {
-
svn commit: r1593947 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon May 12 12:42:59 2014 New Revision: 1593947 URL: http://svn.apache.org/r1593947 Log: Correct typo in class name Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 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=1593947r1=1593946r2=1593947view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon May 12 12:42:59 2014 @@ -176,7 +176,7 @@ fix Correct regression introduced in rev797162/rev that broke authentication of users when using the -codeJASSMemoryLoginModule/code. (markt) +codeJAASMemoryLoginModule/code. (markt) /fix /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593963 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt conf/catalina.properties webapps/docs/changelog.xml
Author: kkolinko Date: Mon May 12 13:21:09 2014 New Revision: 1593963 URL: http://svn.apache.org/r1593963 Log: Clean-up and add additional packages It is backport of r1593262, r1593285 Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/conf/catalina.properties tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1593259,1593261 Merged /tomcat/tc7.0.x/trunk:r1593262 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593963r1=1593962r2=1593963view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 12 13:21:09 2014 @@ -28,12 +28,6 @@ None PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -* Clean-up and add additional packages - https://svn.apache.org/r1593262 - https://svn.apache.org/r1593285 - +1: markt, kkolinko, fhanik - -1: - * Extend token protection to either access option in NamingContextListener https://svn.apache.org/r1593288 https://svn.apache.org/r1593371 Modified: tomcat/tc6.0.x/trunk/conf/catalina.properties URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/catalina.properties?rev=1593963r1=1593962r2=1593963view=diff == --- tomcat/tc6.0.x/trunk/conf/catalina.properties (original) +++ tomcat/tc6.0.x/trunk/conf/catalina.properties Mon May 12 13:21:09 2014 @@ -19,7 +19,8 @@ # passed to checkPackageAccess unless the # corresponding RuntimePermission (accessClassInPackage.+package) has # been granted. -package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans. +package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,\ +org.apache.naming.resources.,org.apache.tomcat.,sun.beans. # # List of comma-separated packages that start with or equal this string # will cause a security exception to be thrown when @@ -30,7 +31,8 @@ package.access=sun.,org.apache.catalina. # by default, no packages are restricted for definition, and none of # the class loaders supplied with the JDK call checkPackageDefinition. # -package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper. +package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\ +org.apache.jasper.,org.apache.naming.,org.apache.tomcat. # # 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=1593963r1=1593962r2=1593963view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 12 13:21:09 2014 @@ -104,6 +104,16 @@ additional locations where, theoretically, a memory leak could occur. (markt) /add + add +Add the codeorg.apache.naming/code package to the packages requiring +code to have the codedefineClassInPackage/code permission when +running under a security manager. (markt) + /add + add +Add the codeorg.apache.naming.resources/code package to the packages +requiring code to have the codeaccessClassInPackage/code permission +when running under a security manager. (markt) + /add /changelog /subsection subsection name=Coyote - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Plans for 8.0.6
Over the weekend I ran the unit tests for BIO, NIO and APR on OSX, Win64 and Linux64 and they all passed. My plans for 8.0.6 are therefore: - work through the backlog of messages that built up during the mail server outage; - fix any new issues that might emerge from the backlog - re-run the unit tests - tag 8.0.6 and start the release Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1593940 - svn:log
Author: kkolinko Revision: 1593940 Modified property: svn:log Modified: svn:log at Mon May 12 12:37:57 2014 -- --- svn:log (original) +++ svn:log Mon May 12 12:37:57 2014 @@ -1 +1 @@ -Correct regression introduced in r797162 that broke authentication of users when using the JASSMemoryLoginModule. +Correct regression introduced in r797162 that broke authentication of users when using the JAASMemoryLoginModule. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Plans for 8.0.6
2014-05-12 14:33 GMT+02:00 Mark Thomas ma...@apache.org: Over the weekend I ran the unit tests for BIO, NIO and APR on OSX, Win64 and Linux64 and they all passed. My plans for 8.0.6 are therefore: - work through the backlog of messages that built up during the mail server outage; - fix any new issues that might emerge from the backlog - re-run the unit tests - tag 8.0.6 and start the release +1 (the changelog is now significant, but there doesn't seem to be any testsuite regression - I did run it often during the time buildbot was down) In the backlog, I had a question about read pending. Rémy
Re: svn commit: r1593303 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
On 11/05/2014 07:37, Rémy Maucherat wrote: 2014-05-08 16:55 GMT+02:00 ma...@apache.org: Author: markt Date: Thu May 8 14:55:08 2014 New Revision: 1593303 URL: http://svn.apache.org/r1593303 Log: Fix test failure with NIO2 where additional, unexpected access log entry was being created during connector shutdown. I didn't run into any problem with the testsuite, and I don't see a direct relation with the connector shutdown, can you give me the trace and details ? Maybe that catch is the best place to do it, but I'd like to be sure. My understanding was that the ReadPendingException was thrown because the kept alive connection was trying to read from an open client connection when the connector was shut down. This triggered a 400 entry in the access log since it was treated as a failed request. This is the exception that triggers it: java.nio.channels.ReadPendingException at sun.nio.ch.AsynchronousSocketChannelImpl.read(AsynchronousSocketChannelImpl.java:250) at sun.nio.ch.AsynchronousSocketChannelImpl.read(AsynchronousSocketChannelImpl.java:296) at org.apache.tomcat.util.net.Nio2Channel.read(Nio2Channel.java:145) at org.apache.coyote.http11.InternalNio2InputBuffer.fill(InternalNio2InputBuffer.java:271) at org.apache.coyote.http11.AbstractNioInputBuffer.parseRequestLine(AbstractNioInputBuffer.java:190) at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:925) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:652) at org.apache.coyote.http11.Http11Nio2Protocol$Http11ConnectionHandler.process(Http11Nio2Protocol.java:175) at org.apache.tomcat.util.net.Nio2Endpoint$SocketProcessor.doRun(Nio2Endpoint.java:1132) at org.apache.tomcat.util.net.Nio2Endpoint$SocketProcessor.run(Nio2Endpoint.java:1091) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:744) In terms of whether there is a better place, I didn't look lower down the stack. We probably only want to swallow this if we haven't read any part of the request line. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Plans for 8.0.6
On 12/05/2014 15:01, Rémy Maucherat wrote: 2014-05-12 14:33 GMT+02:00 Mark Thomas ma...@apache.org: Over the weekend I ran the unit tests for BIO, NIO and APR on OSX, Win64 and Linux64 and they all passed. My plans for 8.0.6 are therefore: - work through the backlog of messages that built up during the mail server outage; - fix any new issues that might emerge from the backlog - re-run the unit tests - tag 8.0.6 and start the release +1 (the changelog is now significant, but there doesn't seem to be any testsuite regression - I did run it often during the time buildbot was down) In the backlog, I had a question about read pending. I just got to that. I've answered your immediate question but I want to do a little more digging of my own. I'll respond in more detail on that thread. That said, I'm not expecting NIO2 to be declared stable in this release so I don't see this as a release blocker. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56513] Javadoc change for NIO compression and NIO sendfile
https://issues.apache.org/bugzilla/show_bug.cgi?id=56513 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added OS||All --- Comment #1 from Christopher Schultz ch...@christopherschultz.net --- (In reply to Martin Gainty from comment #0) Needs to state: NIO works with either sendfile OR compression NIO with Sendfile: NIO with Compression: http://tomcat.apache.org/tomcat-7.0-doc/config/http. html#NIO_specific_configuration states Also for the APR connector. (with regards to compression) Note: There is a tradeoff between using compression (saving your bandwidth) and using the sendfile feature (saving your CPU cycles). If the connector supports the sendfile feature, e.g. the NIO connector, using sendfile will take precedence over compression. The symptoms will be that static files greater that 48 Kb will be sent uncompressed. You can turn off sendfile by setting useSendfile attribute of the connector, as documented below, or change the sendfile usage threshold in the configuration of the DefaultServlet in the default conf/web.xml or in the web.xml of your web application. Needs to say: NIO works with sendfile feature OR compression NIO with Sendfile: NIO with Compression: Seems reasonable. Care to submit a documentation patch? -- 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/64 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1593939 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
Tomcat 8 now available in Debian
Hi all, Tomcat 8 is now officially available in Debian [1]. I'll backport it to the stable distribution (Wheezy) once Tomcat 8.0.6 has been released. Emmanuel Bourg [1] https://packages.debian.org/jessie/tomcat8 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56400] Change POOL2/DBCP2 consumption strategy
https://issues.apache.org/bugzilla/show_bug.cgi?id=56400 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas ma...@apache.org --- 1 through 3 fixed. 4. I don't think so. If we start making functional changes (why would we?) then yes, but otherwise I don't see a need to make our unit tests run for even longer than they do already when Commons is already testing this code. -- 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: r1593994 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Author: markt
Date: Mon May 12 15:11:49 2014
New Revision: 1593994
URL: http://svn.apache.org/r1593994
Log:
Fix double checked locking issue identified by FindBugs
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1593994r1=1593993r2=1593994view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon
May 12 15:11:49 2014
@@ -105,7 +105,7 @@ public class WsWebSocketContainer
private static final Random random = new Random();
private static final byte[] crlf = new byte[] {13, 10};
-private AsynchronousChannelGroup asynchronousChannelGroup = null;
+private volatile AsynchronousChannelGroup asynchronousChannelGroup = null;
private final Object asynchronousChannelGroupLock = new Object();
private final Log log = LogFactory.getLog(WsWebSocketContainer.class);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56400] Change POOL2/DBCP2 consumption strategy
https://issues.apache.org/bugzilla/show_bug.cgi?id=56400 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- This has been fixed for 8.0.6 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
[Bug 56513] Javadoc change for NIO compression and NIO sendfile
https://issues.apache.org/bugzilla/show_bug.cgi?id=56513 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas ma...@apache.org --- Fixed for 8.0.6 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: r1593998 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Author: markt
Date: Mon May 12 15:29:09 2014
New Revision: 1593998
URL: http://svn.apache.org/r1593998
Log:
Fix double checked locking issue identified by FindBugs
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1593994
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1593998r1=1593997r2=1593998view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Mon May 12 15:29:09 2014
@@ -105,7 +105,7 @@ public class WsWebSocketContainer
private static final Random random = new Random();
private static final byte[] crlf = new byte[] {13, 10};
-private AsynchronousChannelGroup asynchronousChannelGroup = null;
+private volatile AsynchronousChannelGroup asynchronousChannelGroup = null;
private final Object asynchronousChannelGroupLock = new Object();
private final Log log = LogFactory.getLog(WsWebSocketContainer.class);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1593942 - svn:log
Author: kkolinko Revision: 1593942 Modified property: svn:log Modified: svn:log at Mon May 12 12:39:24 2014 -- --- svn:log (original) +++ svn:log Mon May 12 12:39:24 2014 @@ -1 +1 @@ -Correct regression introduced in r797162 that broke authentication of users when using the JASSMemoryLoginModule. +Correct regression introduced in r797162 that broke authentication of users when using the JAASMemoryLoginModule. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593303 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Author: markt
Date: Thu May 8 14:55:08 2014
New Revision: 1593303
URL: http://svn.apache.org/r1593303
Log:
Fix test failure with NIO2 where additional, unexpected access log entry was
being created during connector shutdown.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1593303r1=1593302r2=1593303view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu
May 8 14:55:08 2014
@@ -18,6 +18,7 @@ package org.apache.coyote.http11;
import java.io.IOException;
import java.io.InterruptedIOException;
+import java.nio.channels.ReadPendingException;
import java.util.Locale;
import java.util.StringTokenizer;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -954,7 +955,7 @@ public abstract class AbstractHttp11Proc
setSocketTimeout(connectionUploadTimeout);
}
}
-} catch (IOException e) {
+} catch (IOException | ReadPendingException e) {
if (getLog().isDebugEnabled()) {
getLog().debug(
sm.getString(http11processor.header.parse), e);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-267) Support 'skip' parameter for Catalina-based goals (deploy)
[ https://issues.apache.org/jira/browse/MTOMCAT-267?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Andrey Utkin updated MTOMCAT-267: - Attachment: MTOMCAT-267.patch Support 'skip' parameter for Catalina-based goals (deploy) -- Key: MTOMCAT-267 URL: https://issues.apache.org/jira/browse/MTOMCAT-267 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Components: tomcat7 Affects Versions: 2.2 Reporter: Andrey Utkin Assignee: Olivier Lamy (*$^¨%`£) Attachments: MTOMCAT-267.patch Add support for 'skip' configuration option for goals like 'deploy', 'redeploy' and so on. Please see patch attached. -- This message was sent by Atlassian JIRA (v6.2#6252) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593335 - /tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
Author: kkolinko Date: Thu May 8 17:11:53 2014 New Revision: 1593335 URL: http://svn.apache.org/r1593335 Log: Review of r1593288: Do not forget to call the symmetrical unset method on stop. Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1593335r1=1593334r2=1593335view=diff == --- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Thu May 8 17:11:53 2014 @@ -310,6 +310,7 @@ public class NamingContextListener } ContextAccessController.unsetSecurityToken(getName(), token); +ContextAccessController.unsetSecurityToken(container, token); // unregister mbeans. CollectionObjectName names = objectNames.values(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1594015 - in /tomcat/trunk: BUILDING.txt SVN-MERGE.txt build.properties.default java/org/apache/tomcat/dbcp/dbcp2/package-info.java res/ide-support/eclipse/eclipse.classpath
Author: markt
Date: Mon May 12 15:57:36 2014
New Revision: 1594015
URL: http://svn.apache.org/r1594015
Log:
Follow up to fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56400
- Update description of DBCP packaging in buidling.txt
- remove DBCP2 and Pool2 versions from build.properties.default
- update svn-merge docs
- remove external tomcat-dbcp.jar from sample Eclipse class path
- remove reference in Javadoc to class that does not exist
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/SVN-MERGE.txt
tomcat/trunk/build.properties.default
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/package-info.java
tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1594015r1=1594014r2=1594015view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Mon May 12 15:57:36 2014
@@ -45,24 +45,19 @@ source distribution, do the following:
Note regarding later versions of Java:
As documented elsewhere, one of components in Apache Tomcat includes
- a private copy of the Apache Commons DBCP library. The source code
- for this library is downloaded, processed by the build script
- (renaming the packages) and compiled.
-
- Due to changes in JDBC interfaces implemented by the library between
- versions of Java SE specification, the library has to target specific
- version of Java and can be compiled only with the JDK version
- implementing this version of specification.
+ a private copy of the Apache Commons DBCP library.
+
+ The JDBC interfaces implemented by DBCP frequently change in
non-backwards
+ compatible ways between versions of the Java SE specification. Therefore,
+ it is likely that DBCP will only compile with the specific version of
Java
+ listed above and that compilation will fail if a later version of Java is
+ used.
See Apache Commons DBCP project web site for more details on
available versions of the library and its requirements,
http://commons.apache.org/dbcp/
- If you really want to use a later version of JDK to build Tomcat,
- several workarounds are possible. One of them is to skip building
- the component (tomcat-dbcp.jar).
-
3. Install the JDK according to the instructions included with the release.
4. Set an environment variable JAVA_HOME to the pathname of the directory
Modified: tomcat/trunk/SVN-MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/SVN-MERGE.txt?rev=1594015r1=1594014r2=1594015view=diff
==
--- tomcat/trunk/SVN-MERGE.txt (original)
+++ tomcat/trunk/SVN-MERGE.txt Mon May 12 15:57:36 2014
@@ -32,8 +32,10 @@ org.apache.tomcat.util.bcel is copied fr
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel
DBCP
-org.apache.tomcat.dbcp is generated by the build process from Commons DBCP and
-Commons Pool.
+org.apache.tomcat.dbcp.dbcp2 is copied from:
+/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2
+org.apache.tomcat.dbcp.pool2 is copied from:
+/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2
FileUpload
org.apache.tomcat.util.http.fileupload is copied from:
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1594015r1=1594014r2=1594015view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon May 12 15:57:36 2014
@@ -152,18 +152,6 @@ tomcat-native.loc.2=${base-tomcat.loc.2}
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
-# - Commons DBCP, version 2.0 or later -
-commons-dbcp.version=2.0
-commons-dbcp.home=${base.path}/commons-dbcp2-${commons-dbcp.version}-src
-commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
-commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
-
-# - Commons Pool, version 2.1 or later -
-commons-pool.version=2.2
-commons-pool.home=${base.path}/commons-pool2-${commons-pool.version}-src
-commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool2-${commons-pool.version}-src.tar.gz
-commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool2-${commons-pool.version}-src.tar.gz
-
# - NSIS, version 2.0 or later -
nsis.home=${base.path}/nsis-2.46
nsis.exe=${nsis.home}/makensis.exe
Re: svn commit: r1593303 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
2014-05-12 16:25 GMT+02:00 Mark Thomas ma...@apache.org: In terms of whether there is a better place, I didn't look lower down the stack. We probably only want to swallow this if we haven't read any part of the request line. Ok, I'll add back the two try/catch I removed, I should have cleaned up the bad cases where the completion handler from the buffer is pending, but the processor is recycled. Hopefully ;) (if not, hey, it's still beta) Rémy
[Bug 56501] problems with urlencoding in webapp name
https://issues.apache.org/bugzilla/show_bug.cgi?id=56501 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #9 from Mark Thomas ma...@apache.org --- Fixed in 7.0.x for 7.0.54 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: r1594018 - in /tomcat/trunk/webapps/docs: aio.xml changelog.xml config/http.xml
Author: markt Date: Mon May 12 16:13:14 2014 New Revision: 1594018 URL: http://svn.apache.org/r1594018 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56513 Make it crystal clear that using sendfile will disable any compression that might otherwise have been used. Modified: tomcat/trunk/webapps/docs/aio.xml tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/aio.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/aio.xml?rev=1594018r1=1594017r2=1594018view=diff == --- tomcat/trunk/webapps/docs/aio.xml (original) +++ tomcat/trunk/webapps/docs/aio.xml Mon May 12 16:13:14 2014 @@ -348,6 +348,11 @@ Tomcat will not do that for you, since you may have already written data to the output stream. /p + p +Note that the use of sendfile will disable any compression that Tomcat may +otherwise have performed on the response. + /p + /section /body Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1594018r1=1594017r2=1594018view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon May 12 16:13:14 2014 @@ -357,6 +357,11 @@ update Improve valves documentation. Split valves into groups. (kkolinko) /update + fix +bug56513/bug: Make the documentation crystal clear that using +sendfile will disable any compression that Tomcat may otherwise have +applied to the response. (markt) + /fix /changelog /subsection subsection name=Other Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1594018r1=1594017r2=1594018view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Mon May 12 16:13:14 2014 @@ -668,7 +668,9 @@ attribute name=useSendfile required=false p(bool)Use this attribute to enable or disable sendfile capability. -The default value is codetrue/code./p +The default value is codetrue/code. Note that the use of sendfile +will disable any compression that Tomcat may otherwise have performed on +the response./p /attribute attribute name=socket.directBuffer required=false @@ -801,7 +803,9 @@ attribute name=useSendfile required=false p(bool)Use this attribute to enable or disable sendfile capability. -The default value is codetrue/code./p +The default value is codetrue/code. Note that the use of sendfile +will disable any compression that Tomcat may otherwise have performed on +the response./p /attribute attribute name=socket.directBuffer required=false @@ -951,7 +955,9 @@ attribute name=useSendfile required=false p(bool)Use this attribute to enable or disable sendfile capability. -The default value is codetrue/code./p +The default value is codetrue/code. Note that the use of sendfile +will disable any compression that Tomcat may otherwise have performed on +the response./p /attribute /attributes - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 8 now available in Debian
Emmanuel, On 5/12/14, 10:25 AM, Emmanuel Bourg wrote: Tomcat 8 is now officially available in Debian [1]. I'll backport it to the stable distribution (Wheezy) once Tomcat 8.0.6 has been released. Emmanuel Bourg [1] https://packages.debian.org/jessie/tomcat8 Great! Could you announce on u...@tomcat.apache.org as well? You have a bigger audience over there. Feel free to put [ANN] in the subject which is often put into announcement emails to our lists. Thanks, -chris signature.asc Description: OpenPGP digital signature
[Bug 56501] problems with urlencoding in webapp name
https://issues.apache.org/bugzilla/show_bug.cgi?id=56501 --- Comment #2 from Kay apacheiss...@sourceway.eu --- filter filter-nameIndexFilter/filter-name filter-classmy.package.index.IndexFilter/filter-class /filter filter-mapping filter-nameIndexFilter/filter-name url-pattern/*/url-pattern /filter-mapping this is my mapping -- 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: r1593009 - in /tomcat/tc7.0.x/trunk: java/org/apache/naming/resources/BaseDirContext.java test/org/apache/naming/resources/TestNamingContext.java
Author: markt
Date: Wed May 7 13:12:27 2014
New Revision: 1593009
URL: http://svn.apache.org/r1593009
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56451
Revert r1592052 and apply and alternative fix that should have fewer side
effects.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=1593009r1=1593008r2=1593009view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
Wed May 7 13:12:27 2014
@@ -181,7 +181,11 @@ public abstract class BaseDirContext imp
* Add an alias.
*/
public void addAlias(String path, BaseDirContext dirContext) {
-aliases.put(convertPathToName(path), dirContext);
+if (!path.startsWith(/)) {
+throw new IllegalArgumentException(
+sm.getString(resources.invalidAliasPath, path));
+}
+aliases.put(path, dirContext);
}
@@ -189,21 +193,14 @@ public abstract class BaseDirContext imp
* Remove an alias.
*/
public void removeAlias(String path) {
-aliases.remove(convertPathToName(path));
-}
-
-
-private String convertPathToName(String path) {
-// Path should have a leading /
if (!path.startsWith(/)) {
throw new IllegalArgumentException(
sm.getString(resources.invalidAliasPath, path));
}
-
-// Name should not have a leading /
-return path.substring(1);
+aliases.remove(path);
}
+
/**
* Get the current alias configuration in String form. If no aliases are
* configured, an empty string will be returned.
@@ -220,7 +217,6 @@ public abstract class BaseDirContext imp
result.append(',');
}
EntryString,BaseDirContext entry = iter.next();
-result.append('/');
result.append(entry.getKey());
result.append('=');
result.append(entry.getValue().getDocBase());
@@ -1656,7 +1652,23 @@ public abstract class BaseDirContext imp
private AliasResult findAlias(String name) {
AliasResult result = new AliasResult();
-String searchName = name;
+// The JNDI resources code mixes names (that don't have leading '/')
and
+// paths (which do have leading '/'). This code is a little messy but
+// the alternative is reviewing the entire o.a.n.resources package for
+// the correct use of name vs path and that is very likely to break
+// clients (including Tomcat internals and user applications).
+String searchName;
+boolean slashAppended;
+if (name.length() == 0) {
+searchName = /;
+slashAppended = true;
+} else if (name.charAt(0) == '/') {
+searchName = name;
+slashAppended = false;
+} else {
+searchName = / + name;
+slashAppended = true;
+}
result.dirContext = aliases.get(searchName);
while (result.dirContext == null) {
@@ -1667,8 +1679,13 @@ public abstract class BaseDirContext imp
result.dirContext = aliases.get(searchName);
}
-if (result.dirContext != null)
-result.aliasName = name.substring(searchName.length());
+if (result.dirContext != null) {
+if (slashAppended) {
+result.aliasName = name.substring(searchName.length() - 1);
+} else {
+result.aliasName = name.substring(searchName.length());
+}
+}
return result;
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1593009r1=1593008r2=1593009view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
Wed May 7 13:12:27 2014
@@ -148,7 +148,7 @@ public class TestNamingContext extends T
+,/a2= + alternate2.getCanonicalPath());
// Check first alias
-Object file = ctx.lookup(a1/test1.txt);
+Object file = ctx.lookup(/a1/test1.txt);
Assert.assertNotNull(file);
Assert.assertTrue(file instanceof Resource);
@@ -168,7
[Bug 56060] Request parameter is intermittently missing
https://issues.apache.org/bugzilla/show_bug.cgi?id=56060 --- Comment #2 from Sid sharmasiddha...@hotmail.com --- Hi Mark/Pie, Just checking if there is any known issue around this in Tomcat 7.0.22 We're encountering the same issue. Few of our requests have no values in parameters map even though query string is proper. -Sid -- 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: r1593196 - in /tomcat/tc7.0.x/trunk: ./ conf/web.xml java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml webapps/docs/default-servlet.xml webapps/docs/security
Author: violetagg
Date: Thu May 8 07:30:47 2014
New Revision: 1593196
URL: http://svn.apache.org/r1593196
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56463
Merged revision 1593189 from tomcat/trunk:
Property for disabling server information is added to the DefaultServlet.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/conf/web.xml
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml
tomcat/tc7.0.x/trunk/webapps/docs/security-howto.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1593189
Modified: tomcat/tc7.0.x/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/web.xml?rev=1593196r1=1593195r2=1593196view=diff
==
--- tomcat/tc7.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc7.0.x/trunk/conf/web.xml Thu May 8 07:30:47 2014
@@ -94,6 +94,10 @@
!-- path that points to a location below either--
!-- $CATALINA_BASE/conf (checked first) or --
!-- $CATALINA_HOME/conf (checked second).[null]--
+ !-- --
+ !-- showServerInfo Should server information be presented in the --
+ !-- response sent to clients when directory--
+ !-- listings is enabled? [true]--
servlet
servlet-namedefault/servlet-name
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1593196r1=1593195r2=1593196view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Thu May 8 07:30:47 2014
@@ -225,6 +225,11 @@ public class DefaultServlet
*/
protected static final ArrayListRange FULL = new ArrayListRange();
+/**
+ * Flag to determine if server information is presented.
+ */
+protected boolean showServerInfo = true;
+
// - Static Initializer
@@ -277,6 +282,7 @@ public class DefaultServlet
protected static final int BUFFER_SIZE = 4096;
+
// - Public Methods
@@ -352,6 +358,9 @@ public class DefaultServlet
throw new UnavailableException(No resources);
}
+if (getServletConfig().getInitParameter(showServerInfo) != null) {
+showServerInfo =
Boolean.parseBoolean(getServletConfig().getInitParameter(showServerInfo));
+}
}
@@ -1561,7 +1570,9 @@ public class DefaultServlet
sb.append(HR size=\1\ noshade=\noshade\);
}
-sb.append(h3).append(ServerInfo.getServerInfo()).append(/h3);
+if (showServerInfo) {
+
sb.append(h3).append(ServerInfo.getServerInfo()).append(/h3);
+}
sb.append(/body\r\n);
sb.append(/html\r\n);
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=1593196r1=1593195r2=1593196view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu May 8 07:30:47 2014
@@ -140,6 +140,12 @@
bug56451/bug: Make resources accessed via a context alias
accessible
via JNDI in the same way standard resources are available. (markt)
/fix
+ add
+bug56463/bug: Property for disabling server information is added to
+the codeDefaultServlet/code. Server information is presented in the
+response sent to the client when directory listings is enabled.
+(violetagg)
+ /add
/changelog
/subsection
subsection name=Coyote
Modified: tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml?rev=1593196r1=1593195r2=1593196view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/default-servlet.xml Thu May 8 07:30:47
2014
@@ -156,6 +156,10 @@ directory listings are disabled and debu
If true, the Accept-Ranges header will be set when appropriate for the
svn commit: r1594008 - /tomcat/trunk/res/findbugs/filter-false-positives.xml
Author: markt Date: Mon May 12 15:39:25 2014 New Revision: 1594008 URL: http://svn.apache.org/r1594008 Log: Update filter after split into two classes Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1594008r1=1594007r2=1594008view=diff == --- tomcat/trunk/res/findbugs/filter-false-positives.xml (original) +++ tomcat/trunk/res/findbugs/filter-false-positives.xml Mon May 12 15:39:25 2014 @@ -668,8 +668,11 @@ /Match Match !-- Return value of latch is intentionally ignored -- -Class name=org.apache.tomcat.websocket.TestWebSocketFrameClient/ -Method name=testConnectToServerEndpointSSL/ +Or + Class name=org.apache.tomcat.websocket.TestWebSocketFrameClient/ + Class name=org.apache.tomcat.websocket.TestWebSocketFrameClientSSL/ +/Or +Method name=testConnectToServerEndpoint/ Bug pattern=RV_RETURN_VALUE_IGNORED/ /Match Match - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56488] jaas custom login module
https://issues.apache.org/bugzilla/show_bug.cgi?id=56488 --- Comment #14 from Mark Thomas ma...@apache.org --- (In reply to dstojkov from comment #13) I also find that http://marc.info/?l=tomcat-userm=135180802717290w=4 which related to my pb as well but without response I took a look at that report. The report does correctly identify an issue that I have now fixed for 8.0.x and 7.0.x (along with an additional issue for 8.0.x). However, the only relationship to your problem appears to be that both involve an NPE. Again, the Tomcat users mailing list is where you need to go to seek help with your code. -- 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: r1594105 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml
Author: kkolinko
Date: Mon May 12 22:14:19 2014
New Revision: 1594105
URL: http://svn.apache.org/r1594105
Log:
Extend token protection to either access option in NamingContextListener
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r1593335
Merged /tomcat/tc7.0.x/trunk:r1593288,1593371
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1594105r1=1594104r2=1594105view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 12 22:14:19 2014
@@ -28,12 +28,7 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Extend token protection to either access option in NamingContextListener
- https://svn.apache.org/r1593288
- https://svn.apache.org/r1593371
- +1: markt, fhanik
- +1: kkolinko: Added r1593371 to proposal
- -1:
+None
PATCHES/ISSUES THAT ARE STALLED:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1594105r1=1594104r2=1594105view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
Mon May 12 22:14:19 2014
@@ -226,6 +226,7 @@ public class NamingContextListener
// Never happens
}
ContextAccessController.setSecurityToken(getName(), container);
+ContextAccessController.setSecurityToken(container, container);
ContextBindings.bindContext(container, namingContext, container);
if( log.isDebugEnabled() ) {
log.debug(Bound + container );
@@ -297,7 +298,8 @@ public class NamingContextListener
}
ContextAccessController.unsetSecurityToken(getName(), container);
-
+ContextAccessController.unsetSecurityToken(container, container);
+
// unregister mbeans.
CollectionObjectName names = objectNames.values();
for (ObjectName objectName : names) {
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=1594105r1=1594104r2=1594105view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 12 22:14:19 2014
@@ -114,6 +114,10 @@
requiring code to have the codeaccessClassInPackage/code permission
when running under a security manager. (markt)
/add
+ fix
+Make the naming context tokens for containers more robust.
+(markt/kkolinko)
+ /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
[Tomcat Wiki] Update of Events by VioletaGeorgieva
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The Events page has been changed by VioletaGeorgieva: https://wiki.apache.org/tomcat/Events?action=diffrev1=1rev2=2 * [[http://events.linuxfoundation.org/events/apachecon-north-america|ApacheCon North America, Denver, April 7-9, 2014]] * [[summit-na-2014|Apache Tomcat Summit, April 11, 2014]] + * [[http://events.linuxfoundation.org/events/apachecon-europe|ApacheCon Europe, Budapest, Hungary, November 17-21, 2014]] - 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-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/66 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1594018 Blamelist: markt Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1594091 - /tomcat/trunk/res/findbugs/filter-false-positives.xml
Author: markt Date: Mon May 12 20:54:12 2014 New Revision: 1594091 URL: http://svn.apache.org/r1594091 Log: Whitespace police Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1594091r1=1594090r2=1594091view=diff == --- tomcat/trunk/res/findbugs/filter-false-positives.xml (original) +++ tomcat/trunk/res/findbugs/filter-false-positives.xml Mon May 12 20:54:12 2014 @@ -295,7 +295,7 @@ thread sees latest value. -- Class name=org.apache.tomcat.dbcp.pool2.impl.DefaultPooledObject / Method name=allocate / -Bug pattern=VO_VOLATILE_INCREMENT / +Bug pattern=VO_VOLATILE_INCREMENT / /Match Match !-- Return value is ignored but a null result will trigger an exception -- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Plans for 8.0.6
2014-05-12 16:39 GMT+02:00 Mark Thomas ma...@apache.org: I just got to that. I've answered your immediate question but I want to do a little more digging of my own. I'll respond in more detail on that thread. That said, I'm not expecting NIO2 to be declared stable in this release so I don't see this as a release blocker. Ok. I looked at it more, and I think the comment you made is correct: on shutdown it would simply try to read data (but the read for the keepalive is pending, so it gets an exception). So I'm not reverting anything, the code as is won't do anything that would cause real issues even if it's not perfect. The main idea was to avoid ignoring read pending exceptions. Rémy
svn commit: r1593995 - /tomcat/trunk/res/findbugs/filter-false-positives.xml
Author: markt Date: Mon May 12 15:12:46 2014 New Revision: 1593995 URL: http://svn.apache.org/r1593995 Log: Fix FindBugs false positive Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1593995r1=1593994r2=1593995view=diff == --- tomcat/trunk/res/findbugs/filter-false-positives.xml (original) +++ tomcat/trunk/res/findbugs/filter-false-positives.xml Mon May 12 15:12:46 2014 @@ -291,6 +291,13 @@ Bug code=Nm / /Match Match +!-- Increment is in sync block so it is safe. Volatile is used so reading + thread sees latest value. -- +Class name=org.apache.tomcat.dbcp.pool2.impl.DefaultPooledObject / +Method name=allocate / +Bug pattern=VO_VOLATILE_INCREMENT / + /Match + Match !-- Return value is ignored but a null result will trigger an exception -- Class name=org.apache.tomcat.jdbc.pool.ConnectionPool$ConnectionFuture / Method name=get / - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot retry in ASF Buildbot on tomcat-trunk
on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/46 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1593232 Blamelist: markt BUILD FAILED: retry exception slave lost sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56516] New: VariableInfo doesn't handle scope changes correctly
https://issues.apache.org/bugzilla/show_bug.cgi?id=56516
Bug ID: 56516
Summary: VariableInfo doesn't handle scope changes correctly
Product: Tomcat 7
Version: 7.0.53
Hardware: PC
OS: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: ad...@moparisthebest.com
Created attachment 31609
-- https://issues.apache.org/bugzilla/attachment.cgi?id=31609action=edit
zip containing test case
Basically the problem is that when VariableInfo is returned from a
TagExtraInfo, the variable is declared once in the generated .java file and
never again. If any scope changes happen, like a try/catch, if/else etc etc,
the variable isn't declared in subsequent scopes, and it won't compile.
quick example, generates this:
try{
java.lang.String message = null;
// initialize tag
message = (java.lang.String) _jspx_page_context.findAttribute(message);
} catch(Exception e) {
// initialize tag
message = (java.lang.String) _jspx_page_context.findAttribute(message); //
error here, message not declared in scope
}
should generate this:
try{
java.lang.String message = null;
// initialize tag
message = (java.lang.String) _jspx_page_context.findAttribute(message);
} catch(Exception e) {
java.lang.String message = null;
// initialize tag
message = (java.lang.String) _jspx_page_context.findAttribute(message);
}
I am attaching all files required for a test case as a single zip file:
./com/taglib/HelloTag.java - example tag
./com/taglib/HelloExtraInfo.java - example tag extra info
./hello.tld - example tld
./badtomcat.jsp - example jsp
./badtomcat_jsp.java - incorrect generated java code for example jsp
Let me know if you have any more questions.
--
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
[jira] [Created] (MTOMCAT-268) warfile for snapshop version grows unlimited since every snapshot jar is included
Wolfgang Fahl created MTOMCAT-268: - Summary: warfile for snapshop version grows unlimited since every snapshot jar is included Key: MTOMCAT-268 URL: https://issues.apache.org/jira/browse/MTOMCAT-268 Project: Apache Tomcat Maven Plugin Issue Type: Bug Affects Versions: 2.2 Reporter: Wolfgang Fahl For a main jar based project I try creating a war by adding a single dependency to the pom pointing to the jar file artifact using a snapshot version. The created war file contains the jar of the dependency in all available versions of the snapshot. E.g. instead of having one 50 MByte Jar I get 5 50 MByte Jars added so in principle my war will grow indefinetely with every new snapshot. -- This message was sent by Atlassian JIRA (v6.2#6252) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-263) tomcat7:exec-war can't create .extract/webapps
[ https://issues.apache.org/jira/browse/MTOMCAT-263?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) updated MTOMCAT-263: --- Fix Version/s: 3.0 tomcat7:exec-war can't create .extract/webapps -- Key: MTOMCAT-263 URL: https://issues.apache.org/jira/browse/MTOMCAT-263 Project: Apache Tomcat Maven Plugin Issue Type: Bug Affects Versions: 2.1, 2.2 Reporter: jieryn Fix For: 3.0 bash$ java -jar target/app-1.0-SNAPSHOT-war-exec.jar Exception in thread main java.lang.Exception: FATAL: impossible to create directories:.extract/webapps at org.apache.tomcat.maven.runner.Tomcat7Runner.extract(Tomcat7Runner.java:586) at org.apache.tomcat.maven.runner.Tomcat7Runner.run(Tomcat7Runner.java:204) at org.apache.tomcat.maven.runner.Tomcat7RunnerCli.main(Tomcat7RunnerCli.java:212) -- This message was sent by Atlassian JIRA (v6.2#6252) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project taglibs-parent (in module tomcat-taglibs) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project taglibs-parent has an issue affecting its community integration. This issue affects 2 projects, and has been outstanding for 33 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - taglibs-parent : Taglib Parent POM - taglibs-standard-spec : JSP Taglibs Full details are available at: http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Sole pom output [pom.xml] identifier set to project name -INFO- Optional dependency commons-io failed with reason build failed -INFO- Optional dependency commons-collections failed with reason build failed -DEBUG- (Apache Gump generated) Apache Maven Settings in: /srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/gump_mvn_settings.xml -INFO- Failed with reason build failed -DEBUG- Maven POM in: /srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/pom.xml -DEBUG- Extracted fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/gump_work/build_tomcat-taglibs_taglibs-parent.html Work Name: build_tomcat-taglibs_taglibs-parent (Type: Build) Work ended in a state of : Failed Elapsed: 2 secs Command Line: /opt/maven2/bin/mvn --batch-mode --settings /srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/gump_mvn_settings.xml install [Working Directory: /srv/gump/public/workspace/tomcat-taglibs/taglibs-parent] M2_HOME: /opt/maven2 - [INFO] Scanning for projects... [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Error building POM (may not be this project's POM). Project ID: junit:junit Reason: Invalid JDK version in profile 'restrict-doclint': Unbounded range: [1.8, for project junit:junit [INFO] [INFO] For more information, run Maven with the -e switch [INFO] [INFO] Total time: 1 second [INFO] Finished at: Tue May 13 00:21:10 UTC 2014 [INFO] Final Memory: 4M/15M [INFO] - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 2014051307, vmgump.apache.org:vmgump:2014051307 Gump E-mail Identifier (unique within run) #12. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593506 - in /tomcat/trunk: java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/bcel/classfile/ java/org/apache/tomcat/util/bcel/util/ webapps/docs/
Author: markt
Date: Fri May 9 10:16:51 2014
New Revision: 1593506
URL: http://svn.apache.org/r1593506
Log:
Update package renamed Apache Commons BCEL to r1593495 to pick up some
additional changes for Java 7 support and some code clean up.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/package.html
tomcat/trunk/webapps/docs/changelog.xml
Propchange: tomcat/trunk/java/org/apache/tomcat/util/bcel/
--
Merged
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:r1547758-1593495
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1593506r1=1593505r2=1593506view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Fri May 9
10:16:51 2014
@@ -108,15 +108,17 @@ public interface Constants {
public static final byte ATTR_SIGNATURE = 10;
public static final byte ATTR_STACK_MAP = 11;
public static final byte ATTR_RUNTIME_VISIBLE_ANNOTATIONS = 12;
- public static final byte ATTR_RUNTIMEIN_VISIBLE_ANNOTATIONS = 13;
+ public static final byte ATTR_RUNTIME_INVISIBLE_ANNOTATIONS = 13;
public static final byte ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS = 14;
- public static final byte ATTR_RUNTIMEIN_VISIBLE_PARAMETER_ANNOTATIONS = 15;
+ public static final byte ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS = 15;
public static final byte ATTR_ANNOTATION_DEFAULT = 16;
public static final byte ATTR_LOCAL_VARIABLE_TYPE_TABLE = 17;
public static final byte ATTR_ENCLOSING_METHOD= 18;
public static final byte ATTR_STACK_MAP_TABLE = 19;
+ public static final byte ATTR_BOOTSTRAP_METHODS = 20;
+ public static final byte ATTR_METHOD_PARAMETERS = 21;
- public static final short KNOWN_ATTRIBUTES = 20;
+ public static final short KNOWN_ATTRIBUTES = 22;
// TOFO: FIX
public static final String[] ATTRIBUTE_NAMES = {
@@ -126,7 +128,8 @@ public interface Constants {
PMGClass, Signature, StackMap,
RuntimeVisibleAnnotations, RuntimeInvisibleAnnotations,
RuntimeVisibleParameterAnnotations,
RuntimeInvisibleParameterAnnotations,
-AnnotationDefault, LocalVariableTypeTable, EnclosingMethod,
StackMapTable
+AnnotationDefault, LocalVariableTypeTable, EnclosingMethod,
StackMapTable,
+BootstrapMethods, MethodParameters
};
/** Constants used in the StackMap attribute.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
URL:
svn commit: r1593288 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
Author: markt
Date: Thu May 8 14:07:12 2014
New Revision: 1593288
URL: http://svn.apache.org/r1593288
Log:
Cover both access options
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1593288r1=1593287r2=1593288view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
Thu May 8 14:07:12 2014
@@ -253,6 +253,7 @@ public class NamingContextListener
// Never happens
}
ContextAccessController.setSecurityToken(getName(), container);
+ContextAccessController.setSecurityToken(container, container);
ContextBindings.bindContext(container, namingContext, container);
if( log.isDebugEnabled() ) {
log.debug(Bound + container );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 24 mins 4 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140508-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140508.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140508-native-src.tar.gz -Dexecute.test.nio=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/apache-comm ons/pool -Dcommons-dbcp.home=/srv/gump/public/workspace/apache-commons/dbcp -Dexecute.test.nio2=false -Dexecute.test.bio=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140508.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servle t-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat
