[Bug 52751] Optimized configuration of the system info displayed in the default error page
https://issues.apache.org/bugzilla/show_bug.cgi?id=52751 --- Comment #10 from polina.gen...@gmail.com --- Hi Violeta, Yes, the given solution perfectly solves my use case. Thanks and regards, Polina -- 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 56488] jaas custom login module
https://issues.apache.org/bugzilla/show_bug.cgi?id=56488 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |INVALID --- Comment #3 from Mark Thomas ma...@apache.org --- Then you haven't copied and pasted correctly. That example works fine for me with the latest 8.0.x. -- 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: r1593132 - in /tomcat/trunk: java/org/apache/tomcat/util/threads/StopPooledThreadException.java java/org/apache/tomcat/util/threads/TaskThread.java java/org/apache/tomcat/util/threads/Thre
Author: slaurent
Date: Wed May 7 20:39:07 2014
New Revision: 1593132
URL: http://svn.apache.org/r1593132
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56492
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56492
Avoid eclipse debugger pausing on uncaught exceptions when tomcat renews its
threads
Added:
tomcat/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/TaskThread.java
tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
tomcat/trunk/webapps/docs/changelog.xml
Added:
tomcat/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java?rev=1593132view=auto
==
---
tomcat/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
(added)
+++
tomcat/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
Wed May 7 20:39:07 2014
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.util.threads;
+
+
+/**
+ * A custom {@link RuntimeException} thrown by the {@link ThreadPoolExecutor}
+ * to signal that the thread should be disposed of.
+ */
+public class StopPooledThreadException extends RuntimeException {
+
+private static final long serialVersionUID = 1L;
+
+public StopPooledThreadException(String msg) {
+super(msg);
+}
+}
Modified: tomcat/trunk/java/org/apache/tomcat/util/threads/TaskThread.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/TaskThread.java?rev=1593132r1=1593131r2=1593132view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/threads/TaskThread.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/TaskThread.java Wed May 7
20:39:07 2014
@@ -16,22 +16,26 @@
*/
package org.apache.tomcat.util.threads;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* A Thread implementation that records the time at which it was created.
*
*/
public class TaskThread extends Thread {
+private static final Log log = LogFactory.getLog(TaskThread.class);
private final long creationTime;
public TaskThread(ThreadGroup group, Runnable target, String name) {
-super(group, target, name);
+super(group, new WrappingRunnable(target), name);
this.creationTime = System.currentTimeMillis();
}
public TaskThread(ThreadGroup group, Runnable target, String name,
long stackSize) {
-super(group, target, name, stackSize);
+super(group, new WrappingRunnable(target), name, stackSize);
this.creationTime = System.currentTimeMillis();
}
@@ -42,4 +46,26 @@ public class TaskThread extends Thread {
return creationTime;
}
+/**
+ * Wraps a {@link Runnable} to swallow any {@link
StopPooledThreadException}
+ * instead of letting it go and potentially trigger a break in a debugger.
+ */
+private static class WrappingRunnable implements Runnable {
+private Runnable wrappedRunnable;
+WrappingRunnable(Runnable wrappedRunnable) {
+this.wrappedRunnable = wrappedRunnable;
+}
+@Override
+public void run() {
+try {
+wrappedRunnable.run();
+} catch(StopPooledThreadException exc) {
+//expected : we just swallow the exception to avoid disturbing
+//debuggers like eclipse's
+log.debug(Thread exiting on purpose, exc);
+}
+}
+
+}
+
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java?rev=1593132r1=1593131r2=1593132view=diff
==
---
[Bug 56027] Unable to use TCN on RHEL6 boxes if box is booted in fips mode
https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #18 from Konstantin Kolinko knst.koli...@gmail.com --- Fixed in Tomcat 6 by r1593696 and will be in 6.0.40. -- 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 56488] jaas custom login module
https://issues.apache.org/bugzilla/show_bug.cgi?id=56488
dstojkov dstojkov2...@yahoo.fr changed:
What|Removed |Added
Status|RESOLVED|REOPENED
Resolution|INVALID |---
--- Comment #4 from dstojkov dstojkov2...@yahoo.fr ---
You are right
I used this example and adapted it to a jsf page
I used request.login() instead of the form that of the example
here the index.xhtml
!DOCTYPE html
html xmlns=http://www.w3.org/1999/xhtml;
xmlns:h=http://xmlns.jcp.org/jsf/html;
xmlns:ui=http://xmlns.jcp.org/jsf/facelets;
h:head
titlelogin/title
/h:head
h:body
ui:debug hotkey=Y/
#{directoryService.init()}
h:form id=login
h:outputLabel for=usernameInput value=username : /
h:inputText id=usernameInput value=#{userFa.name}/
h:outputLabel for=passwordInput value=password : /
h:inputSecret id=passwordInput value=#{userFa.password}/
h:commandButton value=login action=#{userFa.login()}/
/h:form
/h:body
/html
--
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 56488] jaas custom login module
https://issues.apache.org/bugzilla/show_bug.cgi?id=56488 --- Comment #12 from dstojkov dstojkov2...@yahoo.fr --- ok sorry mate Will then code my own realm. Which would have cost me some hours You wasted a evening on it and I spend 1 week to try to figure out why role is null. I give up on JAAS since it works too much randomly to my taste. At least I gave it a try in use with jsf Regards -- 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 56526] New option to interrupt stuck threads
https://issues.apache.org/bugzilla/show_bug.cgi?id=56526 --- Comment #1 from Sylvain Laurent slaur...@apache.org --- (I'm working on it right now, I created the BZ issue to get an ID for the commit message) -- 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: r1594723 - in /tomcat/trunk: java/org/apache/el/parser/AstValue.java test/org/apache/el/TestValueExpressionImpl.java webapps/docs/changelog.xml
Author: markt
Date: Wed May 14 21:20:40 2014
New Revision: 1594723
URL: http://svn.apache.org/r1594723
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56522
When setting a value for a ValueExpression, ensure that the expected coercions
take place such as a null string being coerced to an empty string.
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=1594723r1=1594722r2=1594723view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Wed May 14 21:20:40
2014
@@ -197,30 +197,14 @@ public final class AstValue extends Simp
// coerce to the expected type
Class? targetClass = resolver.getType(ctx, t.base, t.property);
-if (!isAssignable(value, targetClass)) {
-resolver.setValue(ctx, t.base, t.property,
-ELSupport.coerceToType(value, targetClass));
-} else {
-resolver.setValue(ctx, t.base, t.property, value);
-}
+resolver.setValue(ctx, t.base, t.property,
+ELSupport.coerceToType(value, targetClass));
if (!ctx.isPropertyResolved()) {
throw new PropertyNotFoundException(MessageFactory.get(
error.resolver.unhandled, t.base, t.property));
}
}
-private boolean isAssignable(Object value, Class? targetClass) {
-if (targetClass == null) {
-return false;
-} else if (value != null targetClass.isPrimitive()) {
-return false;
-} else if (value != null !targetClass.isInstance(value)) {
-return false;
-}
-return true;
-}
-
-
@Override
// Interface el.parser.Node uses raw types (and is auto-generated)
public MethodInfo getMethodInfo(EvaluationContext ctx,
Modified: tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java?rev=1594723r1=1594722r2=1594723view=diff
==
--- tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java Wed May 14
21:20:40 2014
@@ -241,4 +241,29 @@ public class TestValueExpressionImpl {
Integer result = (Integer) ve.getValue(context);
assertEquals(Integer.valueOf(0), result);
}
+
+
+@Test
+public void testBug56522SetNullValue() {
+ExpressionFactory factory = ExpressionFactory.newInstance();
+ELContext context = new ELContextImpl(factory);
+
+TesterBeanB beanB = new TesterBeanB();
+beanB.setName(Tomcat);
+ValueExpression var =
+factory.createValueExpression(beanB, TesterBeanB.class);
+context.getVariableMapper().setVariable(beanB, var);
+
+ValueExpression ve = factory.createValueExpression(
+context, ${beanB.name}, String.class);
+
+// First check the basics work
+String result = (String) ve.getValue(context);
+assertEquals(Tomcat, result);
+
+// Now set the value to null
+ve.setValue(context, null);
+
+assertEquals(, beanB.getName());
+}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1594723r1=1594722r2=1594723view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May 14 21:20:40 2014
@@ -44,6 +44,18 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not pop up wrt. others).
--
+section name=Tomcat 8.0.7 (markt)
+ subsection name=Jasper
+changelog
+ fix
+bug56522/bug: When setting a value for a
+codeValueExpression/code, ensure that the expected coercions take
+place such as a codenull/code string being coerced to an empty
+string. (markt)
+ /fix
+/changelog
+ /subsection
+/section
section name=Tomcat 8.0.6 (markt)
subsection name=Catalina
changelog
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1594725 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed May 14 21:25:11 2014 New Revision: 1594725 URL: http://svn.apache.org/r1594725 Log: Add BZ 56516 to changelog 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=1594725r1=1594724r2=1594725view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed May 14 21:25:11 2014 @@ -48,6 +48,11 @@ subsection name=Jasper changelog fix +bug56516/bug: When tags require scripting variables to be declared, +declare them at the start of the page so that they are always available +to the entire page. (markt) + /fix + fix bug56522/bug: When setting a value for a codeValueExpression/code, ensure that the expected coercions take place such as a codenull/code string being coerced to an empty - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56523] SPNEGO auth failures are leading to stack trace prints of PrivilegedActionExceptions
https://issues.apache.org/bugzilla/show_bug.cgi?id=56523 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas ma...@apache.org --- I think the LoginExceptions need to stay at error level. They indicate a general problem with SPNEGO auth and it is likely that any attempts to authenticate users will fail. The exceptions triggered by user login failures should be reduced to debug. I have applied a patch that should do this to 8.0.x for 8.0.7 onwards and to 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
[Bug 56488] jaas custom login module
https://issues.apache.org/bugzilla/show_bug.cgi?id=56488
--- Comment #8 from dstojkov dstojkov2...@yahoo.fr ---
sorry it was a wrong one before
/*
* 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.lobby_alpha.helper.jaas;
import java.io.IOException;
import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
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.FailedLoginException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
/**
*
* @author dstojkov
*/
public class SimpleLoginModule implements LoginModule {
private SetString lobbyUsers;
private ListString lobbyGroups;
private Subject subject;
private CallbackHandler callbackHandler;
private Principal simpleUser;
private boolean committed;
public SimpleLoginModule() {
System.out.println(creation SimpleLoginModule);
this.lobbyUsers = new TreeSet();
this.lobbyGroups = new ArrayList();
this.simpleUser = null;
this.committed = false;
dataInit();
}
@Override
public void initialize(Subject subject, CallbackHandler callbackHandler,
MapString, ? sharedState, MapString, ? options) {
System.out.println(debut initialise);
this.subject = subject;
this.callbackHandler = callbackHandler;
System.out.println(debut sharedState);
for(String tmp : sharedState.keySet()) {
System.out.println(key : + tmp + value : +
sharedState.get(tmp));
}
System.out.println(fin sharedState);
System.out.println(debut options);
for(String tmp : options.keySet()) {
System.out.println(key : + tmp + value : +
options.get(tmp));
}
System.out.println(fin options);
System.out.println(fin initialise);
}
@Override
public boolean login() throws LoginException {
System.out.println(debut login);
//boolean ret = false;
Callback[] callbacks = {new NameCallback(username), new
PasswordCallback(password, true)};
try {
callbackHandler.handle(callbacks);
} catch(IOException | UnsupportedCallbackException ex) {
throw new LoginException(ex.getMessage());
}
System.out.println(callbacks[0] : + callbacks[0]);
System.out.println(callbacks[1] : + callbacks[1]);
String name = ((NameCallback)callbacks[0]).getName();
String password =
String.valueOf(((PasswordCallback)callbacks[1]).getPassword());
System.out.println(debut lobbyUsers);
for(String tmp : lobbyUsers) {
System.out.println(tmp : + tmp);
}
System.out.println(fin lobbyUsers);
System.out.println(name : - + name + -);
System.out.println(password : - + password + -);
System.out.println( + !this.lobbyUsers.contains(name));
System.out.println( + !name.equals(password));
if(name.equals() || !this.lobbyUsers.contains(name) ||
!name.equals(password)) {
throw new FailedLoginException(bad credentials);
}
this.simpleUser = new SimpleUser(name);
//this.simpleUser = new GenericPrincipal(name, password,
Arrays.asList(user));
System.out.println(fin login);
return true;
}
@Override
public boolean commit() throws LoginException {
if(this.simpleUser == null) {
return false;
}
System.out.println(debut commit);
System.out.println(debut Principals);
for(Principal tmp : subject.getPrincipals()) {
System.out.println(tmp : + tmp);
}
System.out.println(fin Principals);
subject.getPrincipals().add(this.simpleUser);
subject.getPrincipals().add(new SimpleRole(user));
System.out.println(fin commit);
this.committed = true;
return true;
}
@Override
public boolean abort() throws LoginException {
System.out.println(debut abort);
if(this.simpleUser == null) {
return false;
}
if(this.committed) {
logout();
} else {
this.committed = false;
this.simpleUser = null;
}
System.out.println(fin abort);
return true;
}
@Override
public boolean logout() throws LoginException {
System.out.println(debut logout);
subject.getPrincipals().remove(this.simpleUser);
committed =
svn commit: r1593262 - in /tomcat/tc7.0.x/trunk: ./ conf/catalina.properties
Author: markt Date: Thu May 8 13:12:59 2014 New Revision: 1593262 URL: http://svn.apache.org/r1593262 Log: Back-port clean-up from 8.0.x package.access+=o.a.naming.resources Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/conf/catalina.properties Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1593259,1593261 Modified: tomcat/tc7.0.x/trunk/conf/catalina.properties URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.properties?rev=1593262r1=1593261r2=1593262view=diff == --- tomcat/tc7.0.x/trunk/conf/catalina.properties (original) +++ tomcat/tc7.0.x/trunk/conf/catalina.properties Thu May 8 13:12:59 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. +package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,\ +org.apache.naming.resources.,org.apache.tomcat. # # 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. # # - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56491] attribute references do not resolve to their values
https://issues.apache.org/bugzilla/show_bug.cgi?id=56491 --- Comment #9 from Christopher Schultz ch...@christopherschultz.net --- (In reply to Konstantin Kolinko from comment #8) Thus it is correct to disable EL evaluation here. Great! Thanks for tracking down the spec on this. It's nice to see that some parts of the spec make practical sense :) -- 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 56494] Changing AJP Connector properties (e.g. maxthreads) during runtime using JMX had no effect
https://issues.apache.org/bugzilla/show_bug.cgi?id=56494 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #3 from Mark Thomas ma...@apache.org --- The result of calling setMaxThreads is applied at runtime. The bug report is suspicious as the default value of maxThreads quoted (40) is not correct for Tomcat 7 or any other current, supported version of Apache Tomcat. -- 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 56399] Re-factor request/response recycling so Coyote and Catalina objects are recycled simultaneously
https://issues.apache.org/bugzilla/show_bug.cgi?id=56399 --- Comment #3 from Remy Maucherat r...@apache.org --- After testing some more, I don't see any problems besides the one TestAbstractHttp11Processor test (as seen on buildbot), but it's still best to only include it in the next version. The commit could be improved (besides trying to identify the problem with the test): - no apparent benefit of logging a stacktrace since it does not give any additional info; if this is done for visibility in logs then I disagree with that trick - checking the request should be enough (although I would like to get info if this is meant to try to detect bad async access too, in which case checking the response commit state is a good idea) Another related topic: the amount of WebappClassLoader.clearReferencesThreads logging that happens running the testsuite. This feature is a good idea, but with a lot of noise. -- 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: r1594734 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed May 14 21:37:36 2014 New Revision: 1594734 URL: http://svn.apache.org/r1594734 Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1594734r1=1594733r2=1594734view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed May 14 21:37:36 2014 @@ -30,7 +30,7 @@ PATCHES PROPOSED TO BACKPORT: * Require RuntimePermission when introducing a new token. https://svn.apache.org/r1594230 - +1: kkolinko, remm + +1: kkolinko, remm, markt -1: - 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 dstojkov dstojkov2...@yahoo.fr changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID |--- --- Comment #2 from dstojkov dstojkov2...@yahoo.fr --- Well i follow this tutorial http://www.byteslounge.com/tutorials/jaas-authentication-in-tomcat-example but used the form based one http://www.byteslounge.com/tutorials/jaas-form-based-authentication-in-tomcat-example just copy paste it it seems that it has worked before though ... Regards -- 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 56516] VariableInfo doesn't handle scope changes correctly
https://issues.apache.org/bugzilla/show_bug.cgi?id=56516
--- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com ---
Re: r1594715
I think this report is invalid.
In JSP specification (JSP2.3MR.pdf) there are three occurrences where an action
defines a variable:
1. A jsp:useBean action (chapter JSP.5.1)
2. A custom action returning a VariableInfo with declare=true from its TEI
class
3. A tag file declaring a variable declare=true
For 1. there is explicit example on visibility of declared variables. See
ch.JSP.5.1 jsp:useBean page 1-95 (133 of 594)/
For 2.,3. declaration of variables is illustrated in ch.JSP.9.4.4 Actions
page 1-196 (234 of 594). It also says:
Their visibility is affected by other constructs, for example scriptlets.
For 3. in ch.JSP.8.5.3 The variable Directive on page 1-183 (221 of 594)
description of declare attribute says:
declare (optional) Whether the variable is declared or not in the
calling page/tag file, after this tag invocation. true is the
default.
I see no provision for declaring the variables prematurely.
Also Re: r1594715
1) I see no test example
2) I am certain that it is wrong to prematurely declare NESTED variables.
Regarding NESTED variables, iff c:forEach declared NESTED variables I expect
the following to fail with r1594715 because of duplicate declaration of i:
[[[
c:forEach var=i begin=1 end=10 ${i} /c:forEach
% for (int i=0; i 10; i++) {
out.println(i);
}
%
]]]
Actually JSTL tags do not work that way. They expose information only as JSP
scoped attributes. They do not expose them as scripting (java) variables.
--
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] [Commented] (MTOMCAT-268) warfile for snapshop version grows unlimited since every snapshot jar is included
[ https://issues.apache.org/jira/browse/MTOMCAT-268?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13998334#comment-13998334 ] Olivier Lamy (*$^¨%`£) commented on MTOMCAT-268: sounds weird for me. Can you share your pom configuration? What Maven command are you using? Maybe you miss to clean? 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
svn commit: r1593435 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Thu May 8 22:12:46 2014 New Revision: 1593435 URL: http://svn.apache.org/r1593435 Log: Votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593435r1=1593434r2=1593435view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 8 22:12:46 2014 @@ -57,7 +57,7 @@ PATCHES PROPOSED TO BACKPORT: Update version of Tomcat Native library included with Tomcat to 1.1.30 and make it the recommended version. https://people.apache.org/~kkolinko/patches/2014-04-27_tc6_native_1_1_30.patch - +1: kkolinko, markt + +1: kkolinko, markt, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 @@ -67,31 +67,31 @@ PATCHES PROPOSED TO BACKPORT: (Reimplemented, based on earlier proposal by schultz) https://people.apache.org/~kkolinko/patches/2014-04-27_tc6_56027_FIPSMode.patch http://svn.apache.org/r1590845 (javadoc fixes) - +1: kkolinko, markt + +1: kkolinko, markt, fhanik -1: * Defensive coding around some XML activities that are triggered by web applications and are therefore at potential risk of a memory leak. http://people.apache.org/~markt/patches/2014-04-25-memory-leak-tc6-v1.patch - +1: markt, kkolinko + +1: markt, kkolinko, fhanik -1: * Ensure TLD parser obtained from cache has correct value of blockExternal (r1590036 + r1590040 + r1590065) https://people.apache.org/~kkolinko/patches/2014-04-26_tc6_TldConfig.patch - +1: kkolinko, markt + +1: kkolinko, markt, fhanik -1: * Followup to r1589635 To simplify code and align it with TC7 8. (Discussed in Re:r1589635) http://svn.apache.org/r1589737 - +1: kkolinko, markt + +1: kkolinko, markt, fhanik -1: * Additional change missed in back-port to fix BZ 56334 http://people.apache.org/~markt/patches/2014-04-28-bug56334-tc6-v1.patch - +1: markt, kkolinko + +1: markt, kkolinko, fhanik -1: * Correct the handling of back-slash escaping in the EL parser and no longer @@ -99,12 +99,12 @@ PATCHES PROPOSED TO BACKPORT: escaping to take effect. http://svn.apache.org/r1590838 http://svn.apache.org/r1590912 - +1: markt, kkolinko + +1: markt, kkolinko, fhanik -1: * Additional fixes for BZ 56334 http://svn.apache.org/r1590848 - +1: kkolinko, markt + +1: kkolinko, markt, fhanik -1: kkolinko: I expect to prepare a more formal patch for this later. The merge is unlikely to complete cleanly without Mark's @@ -113,13 +113,13 @@ PATCHES PROPOSED TO BACKPORT: * Clean-up and add additional packages https://svn.apache.org/r1593262 https://svn.apache.org/r1593285 - +1: markt, kkolinko + +1: markt, kkolinko, fhanik -1: * Extend token protection to either access option in NamingContextListener https://svn.apache.org/r1593288 https://svn.apache.org/r1593371 - +1: markt + +1: markt, fhanik +1: kkolinko: Added r1593371 to proposal -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593564 - in /tomcat/trunk: java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/pool2/ webapps/docs/changelog.xml
Author: markt Date: Fri May 9 15:30:25 2014 New Revision: 1593564 URL: http://svn.apache.org/r1593564 Log: Better change log entry for DBCP changes Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed) tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed) tomcat/trunk/webapps/docs/changelog.xml Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri May 9 15:30:25 2014 @@ -0,0 +1 @@ +/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1593563 Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri May 9 15:30:25 2014 @@ -0,0 +1 @@ +/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1593563 Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1593564r1=1593563r2=1593564view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri May 9 15:30:25 2014 @@ -368,11 +368,15 @@ Update package renamed Apache Commons Codec to r1586336 to pick up some Javadoc fixes and some code clean up. (markt) /update - update + scode Switch to including Apache Commons DBCP via a package renamed svn copy rather than building from a source release for consistency with other Commons packages and to allow faster releases to fix DBCP related issues. (markt) + /scode + update +Update package renamed Apache Commons Pool2 and DBCP2 to r1593563 to +pick various bug fixes. (markt) /update /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593509 - in /tomcat/tc7.0.x/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:24:39 2014
New Revision: 1593509
URL: http://svn.apache.org/r1593509
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/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/package.html
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/util/package.html
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1593506
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
--
Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1593506
Merged
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:r1547758-1593495
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1593509r1=1593508r2=1593509view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java Fri
May 9 10:24:39 2014
@@ -511,15 +511,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 = {
@@ -529,7 +531,8 @@ public interface Constants {
PMGClass, Signature, StackMap,
RuntimeVisibleAnnotations, RuntimeInvisibleAnnotations,
RuntimeVisibleParameterAnnotations,
RuntimeInvisibleParameterAnnotations,
-AnnotationDefault,
[Bug 56526] New: New option to interrupt stuck threads
https://issues.apache.org/bugzilla/show_bug.cgi?id=56526 Bug ID: 56526 Summary: New option to interrupt stuck threads Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: slaur...@apache.org The StuckThreadDetectionValve is able to detect stuck threads. It can be improved to also interrupt such threads to try and unblock them in case they are just stuck in I/O or network calls. This would be more or less similar to apache httpd TimeOut directive or PHP max_execution_time (http://www.php.net/manual/en/info.configuration.php#ini.max-execution-time ) and would protect the tomcat server from slow or non-responding backend services and unproperly configured timeouts in the application. -- 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
[Tomcat Wiki] Update of PoweredBy by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The PoweredBy page has been changed by KonstantinKolinko: https://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=477rev2=478 Comment: Remove ubiquityhosting. They used Tomcat in 2007, but no more nowadays. (As reported to my @a.o address) 1. [[http://www.starhost.com.br/|Starhost - Hospedagem de Sites]]: Starhost - Hospedagem de Sites Brazilian webhost provides JSP/Servlets support using Tomcat 5.0, 5.5 and 6.0. 1. [[http://www.studioserver.com.br|Hospedagem de Sites STUDIOSERVER]]: Hospedagem de Sites STUDIOSERVER provides webhosting with support to JSP/Servlets by using Tomcat. 1. [[http://www.tehospedo.com.br|hospedagem de sites]]: hospedagem de sites Hospedagem de sites - TeHospedo. - 1. [[http://www.ubiquityhosting.com|Ubiquity Linux Hosting]] - Ubiquity uses Tomcat to power numerous sites subscribing to their Linux hosting, as well as parts of their own site. 1. [[http://www.webappcabaret.com/|WebAppCabaret]]: WebAppCabaret is the oldest JAVA Web hosting provider. Features include one-click installation of many versions of Tomcat. 1. [[http://www.webhost.uk.net/|WebHostUK LTD]]: UK Web Hosting WebHostUK LTD - Proud to be Apache Tomcat UK Web Hosting provider. 1. [[http://www.Webhost.US.Com/|Web Hosting US]]: US Web Hosting Web Hosting US - Proud to be one of the best Apache Tomcat US Web Hosting provider. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56472] All classes remain in memory after stop of web application, when LDAP was used.
https://issues.apache.org/bugzilla/show_bug.cgi?id=56472 --- Comment #9 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to Konstantin Kolinko from comment #1) 3. I think there is a bug in NamingContextListener.lifecycleEvent(..): If its processing of startup event fails, then its 'initialized' field remains to be 'false'. This causes its processing of stop event to exit immediately without proper cleanup. Is it what happened here? I fixed the 'initialized' field processing issue identified in the above comment. The fix will be in 8.0.6 and 7.0.54. -- 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 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/51 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] 1593288 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: r1594573 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: remm Date: Wed May 14 13:24:52 2014 New Revision: 1594573 URL: http://svn.apache.org/r1594573 Log: Vote. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1594573r1=1594572r2=1594573view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed May 14 13:24:52 2014 @@ -30,7 +30,7 @@ PATCHES PROPOSED TO BACKPORT: * Require RuntimePermission when introducing a new token. https://svn.apache.org/r1594230 - +1: kkolinko + +1: kkolinko, remm -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tomcat commit e-mails missing
cc: dev Hi! Where are svn commit e-mails for Apache Tomcat? The last one received by dev@tomcat.a.o list was on May 2.(r1592052) http://mail-archives.apache.org/mod_mbox/tomcat-dev/201405.mbox/browser There were no e-mails for commits on May 3, 7 or today (r1593009 and later) Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56448] Implement a robust solution for client initiated SSL renegotiation with NIO
https://issues.apache.org/bugzilla/show_bug.cgi?id=56448 --- Comment #2 from Mark Thomas ma...@apache.org --- NIO2 is failing intermittently on OSX. Seems fine on Linux and Windows so far. -- 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: r1593429 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: kkolinko Date: Thu May 8 21:49:41 2014 New Revision: 1593429 URL: http://svn.apache.org/r1593429 Log: Add note on mail server outage Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1593429r1=1593428r2=1593429view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Thu May 8 21:49:41 2014 @@ -224,6 +224,20 @@ project logo are trademarks of the Apach /div +h3 id=ASF_Mail_Server_Outage +span style=float: right;2014-05-08/span ASF Mail Server Outage/h3 +div class=text + +pThe ASF mail server has suffered hardware failures on May 7th and is +currently being repaired. As a result, e-mail delivery for ASF addresses is +stuck and the mailing lists are not functional. +/p + +pMore details and progress are available at +a href=https://blogs.apache.org/infra/entry/mail_outage;ASF Infrastructure Team blog/a. +/p + +/div h3 id=Tomcat_Connectors_1.2.40_Released span style=float: right;2014-04-15/span Tomcat Connectors 1.2.40 Released/h3 div class=text Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1593429r1=1593428r2=1593429view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Thu May 8 21:49:41 2014 @@ -37,6 +37,16 @@ project logo are trademarks of the Apach /section +section name=ASF Mail Server Outage rtext=2014-05-08 +pThe ASF mail server has suffered hardware failures on May 7th and is +currently being repaired. As a result, e-mail delivery for ASF addresses is +stuck and the mailing lists are not functional. +/p +pMore details and progress are available at +a href=https://blogs.apache.org/infra/entry/mail_outage;ASF Infrastructure Team blog/a. +/p +/section + section name=Tomcat Connectors 1.2.40 Released rtext=2014-04-15 p The Apache Tomcat Project is proud to announce the release of version 1.2.40 of - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1594715 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Author: markt
Date: Wed May 14 21:02:27 2014
New Revision: 1594715
URL: http://svn.apache.org/r1594715
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56516
Place declarations for all scripting variables marked with declare=true
at the start of the page so they are always visible to the entire page.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1594715r1=1594714r2=1594715view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Wed May 14
21:02:27 2014
@@ -351,7 +351,7 @@ class Generator {
page.visit(new TagHandlerPoolVisitor(tagHandlerPoolNames));
}
-private void declareTemporaryScriptingVars(Node.Nodes page)
+private void declareScriptingVars(Node.Nodes page)
throws JasperException {
class ScriptingVarVisitor extends Node.Visitor {
@@ -364,6 +364,13 @@ class Generator {
@Override
public void visit(Node.CustomTag n) throws JasperException {
+// Declare scripting variables so they are visible to the
entire
+// page.
+declareScriptingVars(n, VariableInfo.AT_BEGIN);
+declareScriptingVars(n, VariableInfo.AT_END);
+declareScriptingVars(n, VariableInfo.NESTED);
+
+// Declare temporary scripting variables
// XXX - Actually there is no need to declare those
// _jspx_ + varName + _ + nestingLevel variables when we
are
// inside a JspFragment.
@@ -414,6 +421,42 @@ class Generator {
visitBody(n);
}
+
+private void declareScriptingVars(Node.CustomTag n, int scope) {
+
+ListObject vec = n.getScriptingVars(scope);
+if (vec != null) {
+for (int i = 0; i vec.size(); i++) {
+Object elem = vec.get(i);
+if (elem instanceof VariableInfo) {
+VariableInfo varInfo = (VariableInfo) elem;
+if (varInfo.getDeclare()) {
+out.printin(varInfo.getClassName());
+out.print( );
+out.print(varInfo.getVarName());
+out.println( = null;);
+}
+} else {
+TagVariableInfo tagVarInfo = (TagVariableInfo)
elem;
+if (tagVarInfo.getDeclare()) {
+String varName = tagVarInfo.getNameGiven();
+if (varName == null) {
+varName =
n.getTagData().getAttributeString(
+tagVarInfo.getNameFromAttribute());
+} else if (tagVarInfo.getNameFromAttribute()
!= null) {
+// alias
+continue;
+}
+out.printin(tagVarInfo.getClassName());
+out.print( );
+out.print(varName);
+out.println( = null;);
+}
+}
+}
+}
+}
+
}
page.visit(new ScriptingVarVisitor());
@@ -667,7 +710,7 @@ class Generator {
out.printil(javax.servlet.jsp.PageContext _jspx_page_context =
null;);
out.println();
-declareTemporaryScriptingVars(page);
+declareScriptingVars(page);
out.println();
out.printil(try {);
@@ -2235,8 +2278,7 @@ class Generator {
out.println(n.getQName());
n.setBeginJavaLine(out.getJavaLine());
-// Declare AT_BEGIN scripting variables
-declareScriptingVars(n, VariableInfo.AT_BEGIN);
+// Save AT_BEGIN scripting variables
saveScriptingVars(n, VariableInfo.AT_BEGIN);
String tagHandlerClassName = tagHandlerClass.getCanonicalName();
@@ -2291,8 +2333,7 @@ class Generator {
out.println( != javax.servlet.jsp.tagext.Tag.SKIP_BODY) {);
out.pushIndent();
-// Declare NESTED scripting variables
-declareScriptingVars(n, VariableInfo.NESTED);
+// Save NESTED scripting variables
saveScriptingVars(n, VariableInfo.NESTED);
if (n.implementsBodyTag()) {
@@ -2479,9 +2520,8 @@ class Generator {
svn commit: r1594730 - in /tomcat/trunk: java/org/apache/catalina/authenticator/SpnegoAuthenticator.java webapps/docs/changelog.xml
Author: markt
Date: Wed May 14 21:32:52 2014
New Revision: 1594730
URL: http://svn.apache.org/r1594730
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56523
When using SPNEGO authentication, log the exceptions associated with failed
user logins at debug level rather than error level.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1594730r1=1594729r2=1594730view=diff
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
Wed May 14 21:32:52 2014
@@ -258,7 +258,14 @@ public class SpnegoAuthenticator extends
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
} catch (PrivilegedActionException e) {
-log.error(sm.getString(spnegoAuthenticator.serviceLoginFail), e);
+Throwable cause = e.getCause();
+if (cause instanceof GSSException) {
+if (log.isDebugEnabled()) {
+
log.debug(sm.getString(spnegoAuthenticator.serviceLoginFail), e);
+}
+} else {
+
log.error(sm.getString(spnegoAuthenticator.serviceLoginFail), e);
+}
response.setHeader(WWW-Authenticate, Negotiate);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1594730r1=1594729r2=1594730view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May 14 21:32:52 2014
@@ -45,6 +45,15 @@
issues to not pop up wrt. others).
--
section name=Tomcat 8.0.7 (markt)
+ subsection name=Catalina
+changelog
+ fix
+bug56523/bug: When using SPNEGO authentication, log the exceptions
+associated with failed user logins at debug level rather than error
+level. (markt)
+ /fix
+/changelog
+ /subsection
subsection name=Jasper
changelog
fix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593285 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml
Author: markt Date: Thu May 8 14:03:30 2014 New Revision: 1593285 URL: http://svn.apache.org/r1593285 Log: Update changelog Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1593284 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=1593285r1=1593284r2=1593285view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu May 8 14:03:30 2014 @@ -146,6 +146,16 @@ response sent to the client when directory listings is enabled. (violetagg) /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
svn commit: r1593261 - /tomcat/trunk/conf/catalina.properties
Author: markt Date: Thu May 8 13:07:38 2014 New Revision: 1593261 URL: http://svn.apache.org/r1593261 Log: +=o.a.naming Modified: tomcat/trunk/conf/catalina.properties Modified: tomcat/trunk/conf/catalina.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1593261r1=1593260r2=1593261view=diff == --- tomcat/trunk/conf/catalina.properties (original) +++ tomcat/trunk/conf/catalina.properties Thu May 8 13:07:38 2014 @@ -30,7 +30,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.jasper.,org.apache.tomcat. +package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\ +org.apache.jasper.,org.apache.naming.,org.apache.tomcat. # # - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56516] VariableInfo doesn't handle scope changes correctly
https://issues.apache.org/bugzilla/show_bug.cgi?id=56516 --- Comment #2 from Mark Thomas ma...@apache.org --- This has been fixed in 8.0.x for 8.0.7 onwards. Given the history of instability around changes in the this area I plan to give folks a chance to test and review this fix in 8.0.x before I back-port it to 7.0.x. -- 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: r1593286 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu May 8 14:04:02 2014 New Revision: 1593286 URL: http://svn.apache.org/r1593286 Log: Update 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=1593286r1=1593285r2=1593286view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 8 14:04:02 2014 @@ -110,8 +110,9 @@ 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 +* Clean-up and add additional packages + https://svn.apache.org/r1593262 + https://svn.apache.org/r1593285 +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593528 - in /tomcat/trunk: java/org/apache/tomcat/util/http/fileupload/ java/org/apache/tomcat/util/http/fileupload/disk/ java/org/apache/tomcat/util/http/fileupload/util/ webapps/docs/
Author: markt
Date: Fri May 9 12:26:40 2014
New Revision: 1593528
URL: http://svn.apache.org/r1593528
Log:
Update package renamed Apache Commons FileUpload to r1569132 to pick up some
small improvements (e.g. better codenull/code protection) and some code
clean up.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ (props changed)
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
tomcat/trunk/webapps/docs/changelog.xml
Propchange: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/
--
Merged
/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:r1565160-1569132
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?rev=1593528r1=1593527r2=1593528view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
Fri May 9 12:26:40 2014
@@ -802,10 +802,10 @@ public abstract class FileUploadBase {
MULTIPART_FORM_DATA, MULTIPART_MIXED, contentType));
}
-InputStream input = ctx.getInputStream();
final long requestSize = ((UploadContext) ctx).contentLength();
+InputStream input; // N.B. this is eventually closed in
MultipartStream processing
if (sizeMax = 0) {
if (requestSize != -1 requestSize sizeMax) {
throw new SizeLimitExceededException(String.format(
@@ -813,7 +813,8 @@ public abstract class FileUploadBase {
Long.valueOf(requestSize), Long.valueOf(sizeMax)),
requestSize, sizeMax);
}
-input = new LimitedInputStream(input, sizeMax) {
+// N.B. this is eventually closed in MultipartStream processing
+input = new LimitedInputStream(ctx.getInputStream(), sizeMax) {
@Override
protected void raiseError(long pSizeMax, long pCount)
throws IOException {
@@ -824,6 +825,8 @@ public abstract class FileUploadBase {
throw new FileUploadIOException(ex);
}
};
+} else {
+input = ctx.getInputStream();
}
String charEncoding = headerEncoding;
@@ -833,6 +836,7 @@ public abstract class FileUploadBase {
boundary = getBoundary(contentType);
if (boundary == null) {
+IOUtils.closeQuietly(input); // avoid possible resource leak
throw new FileUploadException(the request was rejected
because no multipart boundary was found);
}
@@ -840,9 +844,9 @@ public abstract class FileUploadBase {
try {
multi = new MultipartStream(input, boundary, notifier);
} catch (IllegalArgumentException iae) {
-throw new InvalidContentTypeException(String.format(
-The boundary specified in the %s header is too long,
-CONTENT_TYPE), iae);
+IOUtils.closeQuietly(input); // avoid possible resource leak
+throw new InvalidContentTypeException(
+String.format(The boundary specified in the %s header
is too long, CONTENT_TYPE), iae);
}
multi.setHeaderEncoding(charEncoding);
@@ -1034,6 +1038,15 @@ public abstract class FileUploadBase {
super(message);
}
+/**
+ * Constructs an codeInvalidContentTypeException/code with
+ * the specified detail message and cause.
+ *
+ * @param msg The detail message.
+ * @param cause the original cause
+ *
+ * @since 1.3.1
+ */
public InvalidContentTypeException(String msg, Throwable cause) {
super(msg, cause);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
URL:
svn commit: r1593571 - in /tomcat/trunk/java/org/apache/coyote: Request.java http11/AbstractNioInputBuffer.java http11/InternalAprInputBuffer.java http11/InternalInputBuffer.java spdy/SpdyProcessor.ja
Author: markt
Date: Fri May 9 16:22:18 2014
New Revision: 1593571
URL: http://svn.apache.org/r1593571
Log:
Remove unused code.
unparsedURIMB was written but never read.
Modified:
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractNioInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1593571r1=1593570r2=1593571view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Fri May 9 16:22:18 2014
@@ -82,7 +82,6 @@ public final class Request {
private final MessageBytes schemeMB = MessageBytes.newInstance();
private final MessageBytes methodMB = MessageBytes.newInstance();
-private final MessageBytes unparsedURIMB = MessageBytes.newInstance();
private final MessageBytes uriMB = MessageBytes.newInstance();
private final MessageBytes decodedUriMB = MessageBytes.newInstance();
private final MessageBytes queryMB = MessageBytes.newInstance();
@@ -208,10 +207,6 @@ public final class Request {
return methodMB;
}
-public MessageBytes unparsedURI() {
-return unparsedURIMB;
-}
-
public MessageBytes requestURI() {
return uriMB;
}
@@ -536,7 +531,6 @@ public final class Request {
cookies.recycle();
parameters.recycle();
-unparsedURIMB.recycle();
uriMB.recycle();
decodedUriMB.recycle();
queryMB.recycle();
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractNioInputBuffer.java?rev=1593571r1=1593570r2=1593571view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractNioInputBuffer.java Fri
May 9 16:22:18 2014
@@ -278,7 +278,6 @@ public abstract class AbstractNioInputBu
}
pos++;
}
-request.unparsedURI().setBytes(buf, parsingRequestLineStart, end -
parsingRequestLineStart);
if (parsingRequestLineQPos = 0) {
request.queryString().setBytes(buf, parsingRequestLineQPos + 1,
end - parsingRequestLineQPos -
1);
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1593571r1=1593570r2=1593571view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Fri
May 9 16:22:18 2014
@@ -240,7 +240,6 @@ public class InternalAprInputBuffer exte
}
-request.unparsedURI().setBytes(buf, start, end - start);
if (questionPos = 0) {
request.queryString().setBytes(buf, questionPos + 1,
end - questionPos - 1);
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=1593571r1=1593570r2=1593571view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java Fri May
9 16:22:18 2014
@@ -202,7 +202,6 @@ public class InternalInputBuffer extends
}
-request.unparsedURI().setBytes(buf, start, end - start);
if (questionPos = 0) {
request.queryString().setBytes(buf, questionPos + 1,
end - questionPos - 1);
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java?rev=1593571r1=1593570r2=1593571view=diff
==
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Fri May 9
16:22:18 2014
@@ -541,7 +541,6 @@ public class SpdyProcessorS extends Ab
throw new IOException(Name too long);
}
-
[Bug 56485] loadOnStartup
https://issues.apache.org/bugzilla/show_bug.cgi?id=56485 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #1 from Mark Thomas ma...@apache.org --- Tested with latest 8.0.x trunk. -- 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: r1594731 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/SpnegoAuthenticator.java webapps/docs/changelog.xml
Author: markt
Date: Wed May 14 21:34:31 2014
New Revision: 1594731
URL: http://svn.apache.org/r1594731
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56523
When using SPNEGO authentication, log the exceptions associated with failed
user logins at debug level rather than error level.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1594730
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1594731r1=1594730r2=1594731view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
Wed May 14 21:34:31 2014
@@ -262,7 +262,14 @@ public class SpnegoAuthenticator extends
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
} catch (PrivilegedActionException e) {
-log.error(sm.getString(spnegoAuthenticator.serviceLoginFail), e);
+Throwable cause = e.getCause();
+if (cause instanceof GSSException) {
+if (log.isDebugEnabled()) {
+
log.debug(sm.getString(spnegoAuthenticator.serviceLoginFail), e);
+}
+} else {
+
log.error(sm.getString(spnegoAuthenticator.serviceLoginFail), e);
+}
response.setHeader(WWW-Authenticate, Negotiate);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
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=1594731r1=1594730r2=1594731view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed May 14 21:34:31 2014
@@ -182,6 +182,11 @@
bug56501/bug: codeHttpServletRequest.getContextPath()/code
should return the undecoded context path used by the user agent.
(markt)
/fix
+ fix
+bug56523/bug: When using SPNEGO authentication, log the exceptions
+associated with failed user logins at debug level rather than error
+level. (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 56383] Securing ErrorReportValve [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Violeta Georgieva violet...@apache.org changed: What|Removed |Added CC||polina.gen...@gmail.com --- Comment #10 from Violeta Georgieva violet...@apache.org --- *** Bug 52751 has been marked as a duplicate of this bug. *** -- 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: r1593282 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt Date: Thu May 8 13:56:21 2014 New Revision: 1593282 URL: http://svn.apache.org/r1593282 Log: Retain the order the URLs were added in when calculating the result for getURLs() Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1593282r1=1593281r2=1593282view=diff == --- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Thu May 8 13:56:21 2014 @@ -49,7 +49,6 @@ import java.util.ConcurrentModificationE import java.util.Date; import java.util.Enumeration; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; @@ -426,7 +425,7 @@ public class WebappClassLoader extends U /** * Repositories managed by this class rather than the super class. */ -private SetURL localRepositories = new HashSet(); +private ListURL localRepositories = new ArrayList(); private volatile LifecycleState state = LifecycleState.NEW; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593273 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11Nio2Processor.java InternalNio2InputBuffer.java
Author: remm
Date: Thu May 8 13:27:56 2014
New Revision: 1593273
URL: http://svn.apache.org/r1593273
Log:
- Improve comet keepalive cleanup (if a read pending it is not possible to
interrupt it), and do the same for async.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
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=1593273r1=1593272r2=1593273view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Thu May
8 13:27:56 2014
@@ -132,9 +132,13 @@ public class Http11Nio2Processor extends
if (keepAlive) {
inputBuffer.nextRequest();
outputBuffer.nextRequest();
-// Following Comet processing, a read is still pending, so
-// keep the processor associated
-return SocketState.LONG;
+if (((InternalNio2InputBuffer) inputBuffer).isPending()) {
+// Following comet processing, a read is still pending, so
+// keep the processor associated
+return SocketState.LONG;
+} else {
+return SocketState.OPEN;
+}
} else {
return SocketState.CLOSED;
}
@@ -144,6 +148,18 @@ public class Http11Nio2Processor extends
}
@Override
+public SocketState asyncDispatch(SocketStatus status) {
+SocketState state = super.asyncDispatch(status);
+if (state == SocketState.OPEN ((InternalNio2InputBuffer)
inputBuffer).isPending()) {
+// Following async processing, a read is still pending, so
+// keep the processor associated
+return SocketState.LONG;
+} else {
+return state;
+}
+}
+
+@Override
protected void registerForEvent(boolean read, boolean write) {
if (read) {
((InternalNio2InputBuffer) inputBuffer).registerReadInterest();
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=1593273r1=1593272r2=1593273view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java Thu
May 8 13:27:56 2014
@@ -124,6 +124,10 @@ public class InternalNio2InputBuffer ext
interest = false;
}
+public boolean isPending() {
+return readPending;
+}
+
// -- Protected Methods
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56518] NIO async servlet limit latch leak
https://issues.apache.org/bugzilla/show_bug.cgi?id=56518 --- Comment #4 from Mark Thomas ma...@apache.org --- The fix works on 8.0.x but back-porting the changes to 7.0.x doesn't appear to address the problem on that platform. For reasons I don't yet fully understand, 8.0.x appears not to throw the ClosedByInterruptException. -- 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 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 OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- What filter mapping are you using? -- 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
