[Bug 57574] New: javax.el.ImportHandler.importPackage() does not work in Equinox OSGi

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57574

Bug ID: 57574
   Summary: javax.el.ImportHandler.importPackage() does not work
in Equinox OSGi
   Product: Tomcat 8
   Version: trunk
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: EL
  Assignee: dev@tomcat.apache.org
  Reporter: j...@mortbay.com

Created attachment 32462
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32462&action=edit
ImportHandler proposed patch

The code in javax.el.ImportHandler.importPackage(String name) tries to load a
package, first via java.lang.Package.getPackage(name), and if that fails, via
the thread context classloader getResource(name) instead.

The call to Package.getPackage(name) appears to return null under Equinox, not
sure about other osgi environments.

Unfortunately the call to the TCCL.getResource(name) also returns null, because
the name does not have a trailing '/'. Eg "javax/servlet" should be
"javax/servlet/".

The attached patch always adds a trailing '/' to the package name. The fix has
been tested on a recent version of Equinox. 

regards
Jan

-- 
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

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

[Bill Barker]

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-tc8.0.x-test-apr 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-tc8.0.x-test-apr :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/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.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 6 mins 55 secs
Command Line: /usr/lib/jvm/java-8-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.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150212-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150212/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150212.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150212-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 .openssl.path=/srv/gump/public/workspace/openssl/dest-20150212/bin/openssl 
-Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/wo

Re: Tagging 8.0.x

[Mark Thomas]

On 12/02/2015 07:39, Violeta Georgieva wrote:
> Hi Mark,
> 
> 2015-02-11 21:40 GMT+02:00 Mark Thomas :
>>
>> We've had a couple of important Coyote fixes since the last release so
>> I'm planning on tagging 8.0.x tomorrow.
>>
>> In my mind this is a slightly delayed beginning of Feb release. I plan
>> to get back to a roughly beginning of the month schedule next month.
> 
> Do we need Tomcat 7 release also?

It wouldn't hurt. The Coyote fixes are in 7.0.x as well. On the other
hand the bugs have been there for a while so waiting a little longer
wouldn't hurt either. Up to you I guess.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57574] javax.el.ImportHandler.importPackage() does not work in Equinox OSGi

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57574

--- Comment #1 from Mark Thomas  ---
So why isn't this a bug in Equinox? If you can point to a specification that
says the trailing / is required then we can add it but otherwise this is going
to get resolved as invalid.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1659043 - in /tomcat/trunk: java/org/apache/catalina/filters/CorsFilter.java test/org/apache/catalina/filters/TestCorsFilter.java

[Mark Thomas]

On 12/02/2015 01:16, Konstantin Kolinko wrote:
> 2015-02-11 22:18 GMT+03:00  :
>> Author: markt
>> Date: Wed Feb 11 19:18:46 2015
>> New Revision: 1659043
>>
>> URL: http://svn.apache.org/r1659043
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57534
>> CORS Filter should only look at media type component of content type
>>
>> Modified:
>> tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
>> tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
>>
>> Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1659043&r1=1659042&r2=1659043&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
>> +++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Wed Feb 11 
>> 19:18:46 2015
>> @@ -639,11 +639,10 @@ public final class CorsFilter implements
>>  } else if ("GET".equals(method) || 
>> "HEAD".equals(method)) {
>>  requestType = CORSRequestType.SIMPLE;
>>  } else if ("POST".equals(method)) {
>> -String contentType = request.getContentType();
>> -if (contentType != null) {
>> -contentType = contentType.toLowerCase().trim();
>> +String mediaType = 
>> getMediaType(request.getContentType());
>> +if (mediaType != null) {
>>  if (SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES
>> -.contains(contentType)) {
>> +.contains(mediaType)) {
>>  requestType = CORSRequestType.SIMPLE;
>>  } else {
>>  requestType = CORSRequestType.ACTUAL;
>> @@ -662,6 +661,23 @@ public final class CorsFilter implements
>>  }
>>
>>
>> +/*
>> + * Return the lower case, trimmed value of the media type from the 
>> content
>> + * type.
>> + */
>> +private String getMediaType(String contentType) {
>> +if (contentType == null) {
>> +return null;
>> +}
>> +String result = contentType.toLowerCase();
> 
> We usually use  Locale.ENGLISH  in such code.

We do. I'll fix that. Thanks for catching that.

Mark

> 
>> +int firstSemiColonIndex = result.indexOf(';');
>> +if (firstSemiColonIndex > -1) {
>> +result = result.substring(0, firstSemiColonIndex);
>> +}
>> +result = result.trim();
>> +return result;
>> +}
>> +
> 
> -
> 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

svn commit: r1659174 - /tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java

[markt]

Author: markt
Date: Thu Feb 12 09:23:46 2015
New Revision: 1659174

URL: http://svn.apache.org/r1659174
Log:
Make it obvious these fields are not included in serialization.
Strictly not necessary because of custom serialization/deserialization code but 
it makes it clearer and silences a FindBugs warning.

Modified:
tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=1659174&r1=1659173&r2=1659174&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java Thu Feb 
12 09:23:46 2015
@@ -173,13 +173,13 @@ public class GenericPrincipal implements
  * The JAAS LoginContext, if any, used to authenticate this Principal.
  * Kept so we can call logout().
  */
-protected final LoginContext loginContext;
+protected final transient LoginContext loginContext;
 
 
 /**
  * The user's delegated credentials.
  */
-protected GSSCredential gssCredential = null;
+protected transient GSSCredential gssCredential = null;
 
 @Override
 public GSSCredential getGssCredential() {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Tagging 8.0.x

[Violeta Georgieva]

2015-02-12 11:01 GMT+02:00 Mark Thomas :
>
> On 12/02/2015 07:39, Violeta Georgieva wrote:
> > Hi Mark,
> >
> > 2015-02-11 21:40 GMT+02:00 Mark Thomas :
> >>
> >> We've had a couple of important Coyote fixes since the last release so
> >> I'm planning on tagging 8.0.x tomorrow.
> >>
> >> In my mind this is a slightly delayed beginning of Feb release. I plan
> >> to get back to a roughly beginning of the month schedule next month.
> >
> > Do we need Tomcat 7 release also?
>
> It wouldn't hurt. The Coyote fixes are in 7.0.x as well. On the other
> hand the bugs have been there for a while so waiting a little longer
> wouldn't hurt either. Up to you I guess.

Thanks

> Mark
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

svn commit: r1659182 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

[markt]

Author: markt
Date: Thu Feb 12 09:40:01 2015
New Revision: 1659182

URL: http://svn.apache.org/r1659182
Log:
Update after refactoring

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=1659182&r1=1659181&r2=1659182&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Thu Feb 12 09:40:01 
2015
@@ -448,7 +448,7 @@
   
 
 
-
+
 
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659184 - /tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

[markt]

Author: markt
Date: Thu Feb 12 09:47:14 2015
New Revision: 1659184

URL: http://svn.apache.org/r1659184
Log:
Fix FindBugs warnings re possible Logger configuration loss

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1659184&r1=1659183&r2=1659184&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Feb 12 
09:47:14 2015
@@ -24,8 +24,10 @@ import java.net.URL;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.Stack;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -124,6 +126,13 @@ import org.apache.tomcat.util.descriptor
  * @author Costin Manolache
  */
 public class Tomcat {
+// Some logging implementations use weak references for loggers so there is
+// the possibility that logging configuration could be lost if GC runs just
+// after Loggers are configured but before they are used. The purpose of
+// this Sety is to retain strong references to explicitly configured 
loggers
+// so that configuration is not lost.
+private final Set pinnedLoggers = new HashSet<>();
+
 // Single engine, service, server, connector - few cases need more,
 // they can use server.xml
 protected Server server;
@@ -663,16 +672,20 @@ public class Tomcat {
  */
 public void setSilent(boolean silent) {
 for (String s : silences) {
+Logger logger = Logger.getLogger(s);
+pinnedLoggers.add(logger);
 if (silent) {
-Logger.getLogger(s).setLevel(Level.WARNING);
+logger.setLevel(Level.WARNING);
 } else {
-Logger.getLogger(s).setLevel(Level.INFO);
+logger.setLevel(Level.INFO);
 }
 }
 }
 
 private void silence(Host host, String ctx) {
-Logger.getLogger(getLoggerName(host, ctx)).setLevel(Level.WARNING);
+Logger logger = Logger.getLogger(getLoggerName(host, ctx));
+pinnedLoggers.add(logger);
+logger.setLevel(Level.WARNING);
 }
 
 private String getLoggerName(Host host, String ctx) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659188 - /tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java

[markt]

Author: markt
Date: Thu Feb 12 09:56:10 2015
New Revision: 1659188

URL: http://svn.apache.org/r1659188
Log:
Make OS user name case insensitive (as documented) and explicitly do conversion 
to lower case with the system's default Locale.

Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java?rev=1659188&r1=1659187&r2=1659188&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java Thu 
Feb 12 09:56:10 2015
@@ -18,6 +18,7 @@ package org.apache.catalina.security;
 
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.Set;
 
 import org.apache.catalina.Lifecycle;
@@ -70,7 +71,7 @@ public class SecurityListener implements
  * default, only root is prevented from running Tomcat. Calling this method
  * with null or the empty string will clear the list of users and
  * effectively disables this check. User names will always be checked in a
- * case insensitive manner.
+ * case insensitive manner using the system default Locale.
  *
  * @param userNameList  A comma separated list of operating system users 
not
  *  permitted to run Tomcat
@@ -82,7 +83,7 @@ public class SecurityListener implements
 String[] userNames = userNameList.split(",");
 for (String userName : userNames) {
 if (userName.length() > 0) {
-checkedOsUsers.add(userName);
+
checkedOsUsers.add(userName.toLowerCase(Locale.getDefault()));
 }
 }
 }
@@ -147,7 +148,7 @@ public class SecurityListener implements
 protected void checkOsUser() {
 String userName = System.getProperty("user.name");
 if (userName != null) {
-String userNameLC = userName.toLowerCase();
+String userNameLC = userName.toLowerCase(Locale.getDefault());
 
 if (checkedOsUsers.contains(userNameLC)) {
 // Have to throw Error to force start process to be aborted



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659189 - in /tomcat/trunk: java/org/apache/catalina/filters/ java/org/apache/tomcat/util/http/fileupload/util/mime/ java/org/apache/tomcat/websocket/ test/org/apache/catalina/filters/ te

[markt]

Author: markt
Date: Thu Feb 12 09:58:08 2015
New Revision: 1659189

URL: http://svn.apache.org/r1659189
Log:
Use an explicit Locale when converting to lower case.

Modified:
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1659189&r1=1659188&r2=1659189&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Thu Feb 12 
09:58:08 2015
@@ -24,6 +24,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 import javax.servlet.Filter;
@@ -321,9 +322,8 @@ public final class CorsFilter implements
 
 CORSRequestType requestType = checkRequestType(request);
 if (requestType != CORSRequestType.PRE_FLIGHT) {
-throw new IllegalArgumentException(
-sm.getString("corsFilter.wrongType1",
-CORSRequestType.PRE_FLIGHT.name().toLowerCase()));
+throw new 
IllegalArgumentException(sm.getString("corsFilter.wrongType1",
+
CORSRequestType.PRE_FLIGHT.name().toLowerCase(Locale.ENGLISH)));
 }
 
 final String origin = request
@@ -354,7 +354,7 @@ public final class CorsFilter implements
 String[] headers = accessControlRequestHeadersHeader.trim().split(
 ",");
 for (String header : headers) {
-accessControlRequestHeaders.add(header.trim().toLowerCase());
+
accessControlRequestHeaders.add(header.trim().toLowerCase(Locale.ENGLISH));
 }
 }
 
@@ -523,7 +523,7 @@ public final class CorsFilter implements
 request.getHeader(CorsFilter.REQUEST_HEADER_ORIGIN));
 request.setAttribute(
 CorsFilter.HTTP_REQUEST_ATTRIBUTE_REQUEST_TYPE,
-corsRequestType.name().toLowerCase());
+corsRequestType.name().toLowerCase(Locale.ENGLISH));
 break;
 case ACTUAL:
 request.setAttribute(
@@ -533,7 +533,7 @@ public final class CorsFilter implements
 request.getHeader(CorsFilter.REQUEST_HEADER_ORIGIN));
 request.setAttribute(
 CorsFilter.HTTP_REQUEST_ATTRIBUTE_REQUEST_TYPE,
-corsRequestType.name().toLowerCase());
+corsRequestType.name().toLowerCase(Locale.ENGLISH));
 break;
 case PRE_FLIGHT:
 request.setAttribute(
@@ -543,7 +543,7 @@ public final class CorsFilter implements
 request.getHeader(CorsFilter.REQUEST_HEADER_ORIGIN));
 request.setAttribute(
 CorsFilter.HTTP_REQUEST_ATTRIBUTE_REQUEST_TYPE,
-corsRequestType.name().toLowerCase());
+corsRequestType.name().toLowerCase(Locale.ENGLISH));
 String headers = request.getHeader(
 REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
 if (headers == null) {
@@ -669,7 +669,7 @@ public final class CorsFilter implements
 if (contentType == null) {
 return null;
 }
-String result = contentType.toLowerCase();
+String result = contentType.toLowerCase(Locale.ENGLISH);
 int firstSemiColonIndex = result.indexOf(';');
 if (firstSemiColonIndex > -1) {
 result = result.substring(0, firstSemiColonIndex);
@@ -746,7 +746,7 @@ public final class CorsFilter implements
 parseStringToSet(allowedHttpHeaders);
 Set lowerCaseHeaders = new HashSet<>();
 for (String header : setAllowedHttpHeaders) {
-String lowerCase = header.toLowerCase();
+String lowerCase = header.toLowerCase(Locale.ENGLISH);
 lowerCaseHeaders.add(lowerCase);
 }
 this.allowedHttpHeaders.clear();

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java?rev=1659189&r1=1659188&r2=1659189&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/

svn commit: r1659190 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/security/SecurityListener.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Feb 12 10:00:32 2015
New Revision: 1659190

URL: http://svn.apache.org/r1659190
Log:
Make OS user name case insensitive (as documented) and explicitly do conversion 
to lower case with the system's default Locale.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityListener.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 10:00:32 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java

Re: Hi

[Pravallika Peddi]

Hi Mark & Chris,
I implemented the suggestions and uploaded the patch with changes.
can you verify it?

https://issues.apache.org/bugzilla/show_bug.cgi?id=57021

Thanks,
VIN

On Wed, Feb 11, 2015 at 6:12 PM, Pravallika Peddi 
wrote:

> Thanks for your guidance in this Mark and Chris.
>
>  Hope my first fix will be accepted.
>
> On Wed, Feb 11, 2015 at 5:16 PM, Mark Thomas  wrote:
>
>> On 11/02/2015 11:32, Pravallika Peddi wrote:
>> > Hi Mark,
>> >
>> > I have created the patch file as you mentioned and attached it to the
>> bug
>> > report, i would like to confirm on one thing:
>> >
>> > I have added two new strings to the LocalStrings.properties file which
>> has
>> > Locale specific strings. Some one has to help to add the new strings to
>> the
>> > other Locale files like Japaneese, france, etc...
>>
>> Don't worry about those. They can be completed later.
>>
>> > Another query is:  When can i mark the issue as RESOLVED?
>>
>> You don't. A committer will mark this issue as fixed once they have
>> review and applied your patch.
>>
>> > and who will verify my patch to make sure it is working?
>>
>> This is the responsibility of the committer who commits the patch.
>>
>> > From my side i verified the fix.
>>
>> Great.
>>
>> One of the committers will look at this shortly.
>>
>> Mark
>>
>>
>> >
>> > On Wed, Feb 11, 2015 at 2:43 PM, Mark Thomas  wrote:
>> >
>> >> On 11/02/2015 06:25, Pravallika Peddi wrote:
>> >>> Hi Mark,
>> >>> Attached the fix details.
>> >>
>> >> Patches should be in diff -u format and attached to the bug report to
>> >> which they relate.
>> >>
>> >> Mark
>> >>
>> >>
>> >>> I have modified AprLifecycleListener.java and Library.java to fix the
>> >>> issue. Added a new file "LibraryNotFoundError.java" in
>> >>> "org.apache.tomcat.jni" package. Added two new strings in
>> >>> "LocalStrings.properties" file located in "org.apache.catalina.core"
>> >>> package. I do not know the other languages so did not add the new
>> >>> strings in other property files.
>> >>>
>> >>>
>> >>> I tested the fix and attached the log files as well.
>> >>> I provided the fix based on the comments provided in the issue.
>> >>>
>> >>> I did not implement the 3rd point(C) yet as i did not feel it so
>> >>> important. Let me know if it is required so that i can fix the third
>> >>> point too.
>> >>>
>> >>> Please validate the fix so that i can commit to svn.
>> >>>
>> >>> Thanks,
>> >>> VIN
>> >>>
>> >>> On Tue, Feb 10, 2015 at 5:15 PM, Pravallika Peddi
>> >>> mailto:reachme.va...@gmail.com>> wrote:
>> >>>
>> >>> Got you Mark.
>> >>> Now i am able to reproduce the problem by keeping I64 bit dll in
>> x64
>> >>> bit windows platform.
>> >>> I will fix it and let you know.
>> >>>
>> >>> Thanks,
>> >>> VIN
>> >>>
>> >>> On Tue, Feb 10, 2015 at 2:19 PM, Mark Thomas > >>> > wrote:
>> >>>
>> >>> On 10/02/2015 06:28, Pravallika Peddi wrote:
>> >>> > Thanks Chris for the information.
>> >>> >
>> >>> > Mark & Chris:
>> >>> > I have gone through one of the issues given by Mark:
>> >>> >
>> >>> > https://issues.apache.org/bugzilla/show_bug.cgi?id=57021
>> >>> >
>> >>> > and found that this issue is fixed already.
>> >>> >
>> >>> > Steps i performed:
>> >>> > 1) Download Tomcat 6.0 - 32 bit version and run it on 32-bit
>> >> Windows
>> >>> > platform. Tomcat Server started successfully using commands
>> >> mentioned in
>> >>> > issue. Stop the tomcat. Check the catalina.out folder and it
>> >> has no
>> >>> > error messages. Rename catalina.out file.
>> >>> >
>> >>> > 2) Download Tomcat 6.0-64 bit version and extract
>> tcnative-dll
>> >> and copy
>> >>> > it on to 32-bit Tomcat folder. Start the Tomcat Server and
>> >> check the
>> >>> > catalina.out file. It has proper error message "Feb 10, 2015
>> >> 11:42:54 AM
>> >>> > org.apache.catalina.core.AprLifecycleListener init
>> >>> > INFO: The APR based Apache Tomcat Native library which
>> allows
>> >> optimal
>> >>> > performance in production environments was not found on the
>> >>> > java.library.path:"
>> >>> >
>> >>> > and i did not observe any error in command line as mentioned
>> >> in the issue.
>> >>> >
>> >>> > I attached both the catalina.out files for your reference.
>> >>> > Even i checked the recent Trunk AppLifecycleListener.init()
>> >> java method
>> >>> > and did not find the source code that was mentioned in the
>> >> issue.
>> >>> >
>> >>> > Hence i feel the issue is fixed.
>> >>> > Please confirm so that i will close the issue.
>> >>>
>> >>> The issue is not fixed. Tomcat isn't finding the tc-native
>> >>> library so
>> >>> the error isn't triggering.
>> >>>
>> >>> Mark
>> >>>
>> >>>
>> >>  --

svn commit: r1659191 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/ java/org/apache/tomcat/util/http/fileupload/ java/org/apache/tomcat/util/http/fileupload/util/mime/ java/org/apach

[markt]

Author: markt
Date: Thu Feb 12 10:02:06 2015
New Revision: 1659191

URL: http://svn.apache.org/r1659191
Log:
Use an explicit Locale when converting to lower case.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/   (props 
changed)

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 10:02:06 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,165704

svn commit: r1659192 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/security/SecurityListener.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Feb 12 10:03:22 2015
New Revision: 1659192

URL: http://svn.apache.org/r1659192
Log:
Make OS user name case insensitive (as documented) and explicitly do conversion 
to lower case with the system's default Locale.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 10:03:22 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361

svn commit: r1659193 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/ java/org/apache/tomcat/util/http/fileupload/ java/org/apache/tomcat/util/http/fileupload/util/mime/ java/org/apach

[markt]

Author: markt
Date: Thu Feb 12 10:05:08 2015
New Revision: 1659193

URL: http://svn.apache.org/r1659193
Log:
Use an explicit Locale when converting to lower case.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/   (props 
changed)

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 10:05:08 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,135481

Re: Tagging 8.0.x

[Mark Thomas]

On 12/02/2015 09:26, Violeta Georgieva wrote:
> 2015-02-12 11:01 GMT+02:00 Mark Thomas :
>>
>> On 12/02/2015 07:39, Violeta Georgieva wrote:
>>> Hi Mark,
>>>
>>> 2015-02-11 21:40 GMT+02:00 Mark Thomas :

 We've had a couple of important Coyote fixes since the last release so
 I'm planning on tagging 8.0.x tomorrow.

 In my mind this is a slightly delayed beginning of Feb release. I plan
 to get back to a roughly beginning of the month schedule next month.
>>>
>>> Do we need Tomcat 7 release also?
>>
>> It wouldn't hurt. The Coyote fixes are in 7.0.x as well. On the other
>> hand the bugs have been there for a while so waiting a little longer
>> wouldn't hurt either. Up to you I guess.
> 
> Thanks

No problem. I'm going to hold off on tagging 8.0.x while I figure out
the cause of the Gump failures.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

[Bill Barker]

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-tc7.0.x-test-apr 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-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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-tc7.0.x-dbcp 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-7.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 5 mins 1 sec
Command Line: /usr/lib/jvm/java-8-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.13-SNAPSHOT.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150212-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150212-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150212/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150212.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dexecute.te
 st.nio=false -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150212.jar
 -Dtest.temp=output/test-tmp-APR 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/pub

svn commit: r1659216 - /tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

[markt]

Author: markt
Date: Thu Feb 12 10:42:41 2015
New Revision: 1659216

URL: http://svn.apache.org/r1659216
Log:
Dump the full access log if the wrong number of entries appear in the log

Modified:
tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1659216&r1=1659215&r2=1659216&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Thu 
Feb 12 10:42:41 2015
@@ -80,7 +80,12 @@ public class TesterAccessLogValve extend
 Thread.sleep(100);
 }
 
-assertEquals(count, entries.size());
+StringBuilder entriesLog = new StringBuilder();
+for (Entry entry : entries) {
+entriesLog.append(entry.toString());
+entriesLog.append(System.lineSeparator());
+}
+assertEquals(entriesLog.toString(), count, entries.size());
 for (int j = 0; j < count; j++) {
 Entry entry = entries.get(j);
 assertEquals(status, entry.getStatus());



-
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-apr (in module tomcat-trunk) failed

[Bill Barker]

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-apr 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-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/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.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 6 mins 27 secs
Command Line: /usr/lib/jvm/java-8-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.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150212-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150212/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150212.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150212-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 .openssl.path=/srv/gump/public/workspace/openssl/dest-20150212/bin/openssl 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.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-8-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/servlet-api.ja
 
r:/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-trunk/output/bu
 
ild/lib/

Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

[Rainer Jung]

Am 12.02.2015 um 08:55 schrieb Bill Barker:

The jvm crashes here:


 [junit] # C  [libcrypto.so.1.1.0+0x14fef9]  EVP_add_cipher+0x9


I wonder whether we really want to build and test against OpenSSL 
master. The 1.0.2 branch would be more stable. I think best would be 
building TC 8 and before against tcnative based on OpenSSL 1.0.2 and TC 
turnk against tcnative based on OpenSSL master.


Concerning the current failure: the gump make output of the OpenSSL 
build available under 
http://vmgump.apache.org/gump/public/openssl/openssl-make/gump_work/build_openssl_openssl-make.txt 
shows some warnings that might be related:


gcc -I.. -I../.. -I../modes -I../asn1 -I../evp -I../include 
-I../../include  -fPIC -DOPENSSL_PIC -DOPENSSL_USE_DEPRECATED 
-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H 
-Wa,--noexecstack -m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DOPENSSL_IA32_SSE2 
-DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m 
-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM 
-DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM   -c -o 
c_allc.o c_allc.c

c_allc.c: In function ‘OpenSSL_add_all_ciphers’:
c_allc.c:248:5: warning: implicit declaration of function 
‘EVP_camellia_128_ctr’ [-Wimplicit-function-declaration]

 EVP_add_cipher(EVP_camellia_128_ctr());
 ^
c_allc.c:248:5: warning: passing argument 1 of ‘EVP_add_cipher’ 
makes pointer from integer without a cast [enabled by default]

In file included from c_allc.c:61:0:
../../include/openssl/evp.h:953:5: note: expected ‘const struct 
EVP_CIPHER *’ but argument is of type ‘int’

 int EVP_add_cipher(const EVP_CIPHER *cipher);
 ^
c_allc.c:249:5: warning: implicit declaration of function 
‘EVP_camellia_192_ctr’ [-Wimplicit-function-declaration]

 EVP_add_cipher(EVP_camellia_192_ctr());
 ^
c_allc.c:249:5: warning: passing argument 1 of ‘EVP_add_cipher’ 
makes pointer from integer without a cast [enabled by default]

In file included from c_allc.c:61:0:
../../include/openssl/evp.h:953:5: note: expected ‘const struct 
EVP_CIPHER *’ but argument is of type ‘int’

 int EVP_add_cipher(const EVP_CIPHER *cipher);
 ^
c_allc.c:250:5: warning: implicit declaration of function 
‘EVP_camellia_256_ctr’ [-Wimplicit-function-declaration]

 EVP_add_cipher(EVP_camellia_256_ctr());
 ^
c_allc.c:250:5: warning: passing argument 1 of ‘EVP_add_cipher’ 
makes pointer from integer without a cast [enabled by default]

In file included from c_allc.c:61:0:
../../include/openssl/evp.h:953:5: note: expected ‘const struct 
EVP_CIPHER *’ but argument is of type ‘int’

 int EVP_add_cipher(const EVP_CIPHER *cipher);
 ^

The OpenSSL changelog contains:

commit dda8199922f9d52087d2c41b22a61eb4f9671385
Author: Andy Polyakov 
Date:   Wed Feb 11 20:30:13 2015 +0100

Add Camellia CTR mode.

Reviewed-by: Rich Salz 


which in turn contains the following change:

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index 174a419..7ae36d7 100644
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -245,5 +245,8 @@ void OpenSSL_add_all_ciphers(void)
 EVP_add_cipher(EVP_camellia_256_ofb());
 EVP_add_cipher_alias(SN_camellia_256_cbc, "CAMELLIA256");
 EVP_add_cipher_alias(SN_camellia_256_cbc, "camellia256");
+EVP_add_cipher(EVP_camellia_128_ctr());
+EVP_add_cipher(EVP_camellia_192_ctr());
+EVP_add_cipher(EVP_camellia_256_ctr());
 #endif
 }

Thos "_ctr" variants are missing in crypto/evp/evp.h. It's pretty likely 
this triggers the crash. I'll mail to OpenSSL.


Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659235 - in /tomcat/trunk: java/org/apache/tomcat/util/net/Nio2Endpoint.java test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java

[markt]

Author: markt
Date: Thu Feb 12 12:12:51 2015
New Revision: 1659235

URL: http://svn.apache.org/r1659235
Log:
Additional debug logging targeted at current Gump failures on trunk

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java

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=1659235&r1=1659234&r2=1659235&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Feb 12 
12:12:51 2015
@@ -929,6 +929,10 @@ public class Nio2Endpoint extends Abstra
 
 @Override
 public void reset(Nio2Channel channel, long soTimeout) {
+if (log.isDebugEnabled()) {
+log.debug("Calling [" + this + "].reset([" + channel + "],[" + 
soTimeout + "])",
+new Exception());
+}
 super.reset(channel, soTimeout);
 upgradeInit = false;
 sendfileData = null;

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1659235&r1=1659234&r2=1659235&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java 
Thu Feb 12 12:12:51 2015
@@ -20,6 +20,8 @@ import java.net.URI;
 import java.util.Queue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.websocket.ClientEndpointConfig;
 import javax.websocket.ContainerProvider;
@@ -41,9 +43,10 @@ import org.apache.tomcat.websocket.Teste
 
 public class TestWebSocketFrameClientSSL extends TomcatBaseTest {
 
-
 @Test
 public void testConnectToServerEndpoint() throws Exception {
+Logger logger = 
Logger.getLogger("org.apache.tomcat.util.net.Nio2Endpoint");
+logger.setLevel(Level.ALL);
 Tomcat tomcat = getTomcatInstance();
 // No file system docBase required
 Context ctx = tomcat.addContext("", null);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659237 - /tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

[schultz]

Author: schultz
Date: Thu Feb 12 12:20:46 2015
New Revision: 1659237

URL: http://svn.apache.org/r1659237
Log:
Fixed javadoc typo

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1659237&r1=1659236&r2=1659237&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Feb 12 
12:20:46 2015
@@ -129,7 +129,7 @@ public class Tomcat {
 // Some logging implementations use weak references for loggers so there is
 // the possibility that logging configuration could be lost if GC runs just
 // after Loggers are configured but before they are used. The purpose of
-// this Sety is to retain strong references to explicitly configured 
loggers
+// this Set is to retain strong references to explicitly configured loggers
 // so that configuration is not lost.
 private final Set pinnedLoggers = new HashSet<>();
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57021] Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL fails to load

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57021

--- Comment #9 from Christopher Schultz  ---
(In reply to VIN from comment #8)
> Created attachment 32460 [details]
> Updated patch with suggested comments
> 
> Please let me know if anything is missing.

The doc/*.html files should not be in the patch... they are auto-generated from
the xml files elsewhere.

In AprLifecycleListener near line 208, instead of catching Throwable and then
checking for LibraryNotFoundError and UnsatisfiedLinkError, why not add catch
clauses and leave the default action in catch(Throwable)? I think this will be
a better way to do things.

I'm not sure what the implications are, but the old (and default case) code
adds the log message to initInfoLogMessages while the new code performs logging
directly. Is there a reason to prefer one over the other?

-- 
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: r1659263 - in /tomcat/trunk: java/org/apache/naming/factory/BeanFactory.java test/org/apache/coyote/ajp/SimpleAjpClient.java test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 14:10:52 2015
New Revision: 1659263

URL: http://svn.apache.org/r1659263
Log:
Use an explicit Locale when converting to upper case. - followup to r1659193

Modified:
tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java

Modified: tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1659263&r1=1659262&r2=1659263&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java Thu Feb 12 
14:10:52 2015
@@ -25,6 +25,7 @@ import java.lang.reflect.Method;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.naming.Context;
@@ -170,7 +171,7 @@ public class BeanFactory
 param = param.substring(0, index).trim();
 } else {
 setterName = "set" +
- param.substring(0, 1).toUpperCase() +
+ param.substring(0, 
1).toUpperCase(Locale.ENGLISH) +
  param.substring(1);
 }
 try {

Modified: tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java?rev=1659263&r1=1659262&r2=1659263&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java (original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java Thu Feb 12 
14:10:52 2015
@@ -19,6 +19,7 @@ package org.apache.coyote.ajp;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.Socket;
+import java.util.Locale;
 
 import javax.net.SocketFactory;
 
@@ -64,7 +65,7 @@ public class SimpleAjpClient {
 }
 
 public void setMethod(String method) {
-method = method.toUpperCase();
+method = method.toUpperCase(Locale.ENGLISH);
 switch (method) {
 case "OPTIONS":
 this.method = 1;

Modified: tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1659263&r1=1659262&r2=1659263&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java Thu 
Feb 12 14:10:52 2015
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.ServletContext;
@@ -225,7 +226,7 @@ public class TestAbstractAjpProcessor ex
 
 for (String name: headers.keySet()) {
 value = headers.get(name);
-name = name.toUpperCase();
+name = name.toUpperCase(Locale.ENGLISH);
 switch (name) {
 case "ACCEPT":
 forwardMessage.addHeader(0xA001, value);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659266 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/naming/factory/BeanFactory.java test/org/apache/coyote/ajp/SimpleAjpClient.java test/org/apache/coyote/ajp/TestAbstractAjpProcessor.

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 14:13:16 2015
New Revision: 1659266

URL: http://svn.apache.org/r1659266
Log:
Use an explicit Locale when converting to upper case. - followup to r1659193
Merged r1659263 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java

tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 14:13:16 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659263

Modified: tomcat/tc8.0.x/trunk/jav

svn commit: r1659268 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/factory/BeanFactory.java test/org/apache/coyote/ajp/SimpleAjpClient.java test/org/apache/coyote/ajp/TestAbstractAjpProcessor.

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 14:14:56 2015
New Revision: 1659268

URL: http://svn.apache.org/r1659268
Log:
Use an explicit Locale when converting to upper case. - followup to r1659193
Merged r1659266 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java

tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 14:14:56 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,13

[Bug 57573] Host Header Internal IP Address Disclosure

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57573

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |INVALID

--- Comment #4 from Konstantin Kolinko  ---

> Via:1.1 ID-0001544136376125 uproxy-2

http://tomcat.apache.org/tomcat-6.0-doc/proxy-howto.html

Also AFAIK, 218.201.202.225 is a public IP address.

Support questions must be asked on the users mailing list.
Bugzilla is not a support forum.
http://tomcat.apache.org/bugreport.html#Bugzilla_is_not_a_support_forum

-- 
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 propchange: r1659045 - svn:log

[kkolinko]

Author: kkolinko
Revision: 1659045
Modified property: svn:log

Modified: svn:log at Thu Feb 12 15:07:12 2015
--
--- svn:log (original)
+++ svn:log Thu Feb 12 15:07:12 2015
@@ -0,0 +1,4 @@
+Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57534
+CORS Filter should only look at media type component of content type
+
+Merged r1659043 from tomcat/trunk.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn propchange: r1600984 - svn:log

[markt]

Author: markt
Revision: 1600984
Modified property: svn:log

Modified: svn:log at Thu Feb 12 15:38:07 2015
--
--- svn:log (original)
+++ svn:log Thu Feb 12 15:38:07 2015
@@ -1,2 +1,3 @@
 i18n for ChunkedInputFilter error message
 Add error flag to allow subsequent attempts at reading after an error to fail 
fast
+This is the fix for CVE-2014-0227


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn propchange: r1601333 - svn:log

[markt]

Author: markt
Revision: 1601333
Modified property: svn:log

Modified: svn:log at Thu Feb 12 15:38:41 2015
--
--- svn:log (original)
+++ svn:log Thu Feb 12 15:38:41 2015
@@ -1,3 +1,4 @@
 Clean-up
 i18n for ChunkedInputFilter error message
 Add error flag to allow subsequent attempts at reading after an error to fail 
fast
+This is the fix for CVE-2014-0227


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn propchange: r1603628 - svn:log

[markt]

Author: markt
Revision: 1603628
Modified property: svn:log

Modified: svn:log at Thu Feb 12 15:39:13 2015
--
--- svn:log (original)
+++ svn:log Thu Feb 12 15:39:13 2015
@@ -3,3 +3,4 @@ Improvements to ChunkedInputFilter
  - i18n for ChunkedInputFilter error message
  - Add error flag to allow subsequent attempts at reading after an error to
fail fast
+This is the fix for CVE-2014-0227


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57574] javax.el.ImportHandler.importPackage() does not work in Equinox OSGi

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57574

--- Comment #2 from Konstantin Kolinko  ---
This is some error-handling path in case if Package.getPackage(name) returned
null. Is there a valid reason for getPackage() method to return null? From the
comment in the code it looks that there is.

> String path = name.replace('.', '/');
> URL url = cl.getResource(path);

I think that both approaches (with and without terminating '/') are invalid.

I see no saying in ClassLoader.getResource() javadoc that this operation is
applicable to directories.  The support of ending '/' may be dependent on the
underlying file system. I.e.:

- I think a file system is likely to behave independently of the trailing
slash.

- I think a JAR is likely to expect a trailing '/' if it was packed with
explicit archive entries for directories. If there are no such entries in the
archive then it is likely to return false 'null' answers.


I propose to postpone the check until one actually tries to locate the class.
It is for performance's sake, like it is already done with
ImportHandler.importClass() method.

-- 
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: r1659293 - /tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java

[markt]

Author: markt
Date: Thu Feb 12 15:57:35 2015
New Revision: 1659293

URL: http://svn.apache.org/r1659293
Log:
Delay closing the connection until maxSwallowSize bytes have been read. This 
gives the client a chance to read the response. See 
http://httpd.apache.org/docs/2.0/misc/fin_wait_2.html#appendix

Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java?rev=1659293&r1=1659292&r2=1659293&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
Thu Feb 12 15:57:35 2015
@@ -147,21 +147,25 @@ public class IdentityInputFilter impleme
 }
 
 
-/**
- * End the current request.
- */
 @Override
-public long end()  throws IOException {
+public long end() throws IOException {
 
-if (maxSwallowSize > -1 && remaining > maxSwallowSize) {
-throw new IOException(sm.getString("inputFilter.maxSwallow"));
-}
+final boolean maxSwallowSizeExceeded = (maxSwallowSize > -1 && 
remaining > maxSwallowSize);
+long swallowed = 0;
 
 // Consume extra bytes.
 while (remaining > 0) {
+
 int nread = buffer.doRead(endChunk, null);
 if (nread > 0 ) {
+swallowed += nread;
 remaining = remaining - nread;
+if (maxSwallowSizeExceeded && swallowed > maxSwallowSize) {
+// Note: We do not fail early so the client has a chance to
+// read the response before the connection is closed. See:
+// 
http://httpd.apache.org/docs/2.0/misc/fin_wait_2.html#appendix
+throw new 
IOException(sm.getString("inputFilter.maxSwallow"));
+}
 } else { // errors are handled higher up.
 remaining = 0;
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659294 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/http11/filters/IdentityInputFilter.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Feb 12 15:59:26 2015
New Revision: 1659294

URL: http://svn.apache.org/r1659294
Log:
Delay closing the connection until maxSwallowSize bytes have been read. This 
gives the client a chance to read the response. See 
http://httpd.apache.org/docs/2.0/misc/fin_wait_2.html#appendix

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 15:59:26 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659263
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659263,1659293

Modified: 
tomcat/tc8.0.x/t

svn commit: r1659295 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/filters/IdentityInputFilter.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Feb 12 16:00:03 2015
New Revision: 1659295

URL: http://svn.apache.org/r1659295
Log:
Delay closing the connection until maxSwallowSize bytes have been read. This 
gives the client a chance to read the response. See 
http://httpd.apache.org/docs/2.0/misc/fin_wait_2.html#appendix

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 16:00:03 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,136

svn commit: r1659296 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Feb 12 16:08:33 2015
New Revision: 1659296

URL: http://svn.apache.org/r1659296
Log:
Update 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=1659296&r1=1659295&r2=1659296&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 12 16:08:33 2015
@@ -35,7 +35,7 @@ PATCHES PROPOSED TO BACKPORT:
   -1:
 
 * Add support for maxSwallowSize to Tomcat 6
-  
http://people.apache.org/~markt/patches/2015-02-06-maxSwallowSize-tc6-v1.patch
+  
http://people.apache.org/~markt/patches/2015-02-06-maxSwallowSize-tc6-v2.patch
   +1: markt
   -1:
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659299 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java

[remm]

Author: remm
Date: Thu Feb 12 16:10:31 2015
New Revision: 1659299

URL: http://svn.apache.org/r1659299
Log:
Guard against a NPE I see in the test CI logs.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1659299&r1=1659298&r2=1659299&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Thu Feb 
12 16:10:31 2015
@@ -110,10 +110,13 @@ public class Http11Nio2Protocol extends
  */
 @Override
 public void release(SocketWrapperBase socket) {
-Processor processor = connections.remove(socket.getSocket());
-if (processor != null) {
-processor.recycle();
-recycledProcessors.push(processor);
+Nio2Channel channel = socket.getSocket();
+if (channel != null) {
+Processor processor = connections.remove(channel);
+if (processor != null) {
+processor.recycle();
+recycledProcessors.push(processor);
+}
 }
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659304 - /tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 16:26:03 2015
New Revision: 1659304

URL: http://svn.apache.org/r1659304
Log:
Simplify code.

Remove @Deprecate marker added in r895423:
That method is declared by both javax.servlet.jsp.el.FunctionMapper and by 
javax.el.FunctionMapper.
The javax.el.* one is not deprecated.

Modified:
tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java

Modified: 
tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java?rev=1659304&r1=1659303&r2=1659304&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java 
Thu Feb 12 16:26:03 2015
@@ -18,16 +18,10 @@
 package org.apache.jasper.runtime;
 
 import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.HashMap;
 
 import javax.servlet.jsp.el.FunctionMapper;
 
-import org.apache.jasper.security.SecurityUtil;
-
 /**
  * Maps EL functions to their Java method counterparts. Keeps the actual Method
  * objects protected so that JSP pages can't indirectly do reflection.
@@ -57,25 +51,12 @@ public final class ProtectedFunctionMapp
 
 /**
  * Generated Servlet and Tag Handler implementations call this method to
- * retrieve an instance of the ProtectedFunctionMapper. This is necessary
- * since generated code does not have access to create instances of classes
- * in this package.
+ * retrieve an instance of the ProtectedFunctionMapper.
  *
  * @return A new protected function mapper.
  */
 public static ProtectedFunctionMapper getInstance() {
-ProtectedFunctionMapper funcMapper;
-if (SecurityUtil.isPackageProtectionEnabled()) {
-funcMapper = AccessController.doPrivileged(
-new PrivilegedAction() {
-@Override
-public ProtectedFunctionMapper run() {
-return new ProtectedFunctionMapper();
-}
-});
-} else {
-funcMapper = new ProtectedFunctionMapper();
-}
+ProtectedFunctionMapper funcMapper = new ProtectedFunctionMapper();
 funcMapper.fnmap = new HashMap<>();
 return funcMapper;
 }
@@ -104,28 +85,12 @@ public final class ProtectedFunctionMapp
 return;
 }
 java.lang.reflect.Method method;
-if (SecurityUtil.isPackageProtectionEnabled()) {
-try {
-method = AccessController.doPrivileged(
-new PrivilegedExceptionAction() {
-@Override
-public Method run() throws Exception {
-return c.getDeclaredMethod(methodName, args);
-}
-});
-} catch (PrivilegedActionException ex) {
-throw new RuntimeException(
-"Invalid function mapping - no such method: "
-+ ex.getException().getMessage());
-}
-} else {
-try {
-method = c.getDeclaredMethod(methodName, args);
-} catch (NoSuchMethodException e) {
-throw new RuntimeException(
-"Invalid function mapping - no such method: "
-+ e.getMessage());
-}
+try {
+method = c.getMethod(methodName, args);
+} catch (NoSuchMethodException e) {
+throw new RuntimeException(
+"Invalid function mapping - no such method: "
++ e.getMessage());
 }
 
 this.fnmap.put(fnQName, method);
@@ -150,46 +115,17 @@ public final class ProtectedFunctionMapp
 public static ProtectedFunctionMapper getMapForFunction(String fnQName,
 final Class c, final String methodName, final Class[] args) {
 java.lang.reflect.Method method = null;
-ProtectedFunctionMapper funcMapper;
-if (SecurityUtil.isPackageProtectionEnabled()) {
-funcMapper = AccessController.doPrivileged(
-new PrivilegedAction() {
-@Override
-public ProtectedFunctionMapper run() {
-return new ProtectedFunctionMapper();
-}
-});
-// Skip if null values were passed in. They indicate a function
-// added via a lambda or ImportHandler; nether of which need to be
-// pla

svn commit: r1659306 - /tomcat/trunk/java/org/apache/tomcat/jni/Library.java

[markt]

Author: markt
Date: Thu Feb 12 16:29:43 2015
New Revision: 1659306

URL: http://svn.apache.org/r1659306
Log:
Clean-up prior to applying a patch

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Library.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1659306&r1=1659305&r2=1659306&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Thu Feb 12 16:29:43 
2015
@@ -32,17 +32,14 @@ public final class Library {
  */
 private static Library _instance = null;
 
-private Library()
-throws Exception
-{
+private Library() throws Exception {
 boolean loaded = false;
 StringBuilder err = new StringBuilder();
 for (int i = 0; i < NAMES.length; i++) {
 try {
 System.loadLibrary(NAMES[i]);
 loaded = true;
-}
-catch (Throwable t) {
+} catch (Throwable t) {
 if (t instanceof ThreadDeath) {
 throw (ThreadDeath) t;
 }
@@ -58,12 +55,14 @@ public final class Library {
 t.printStackTrace();
 }
 }
-if ( i > 0)
+if (i > 0) {
 err.append(", ");
+}
 err.append(t.getMessage());
 }
-if (loaded)
+if (loaded) {
 break;
+}
 }
 if (!loaded) {
 err.append('(');



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659308 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/runtime/ProtectedFunctionMapper.java webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 16:31:27 2015
New Revision: 1659308

URL: http://svn.apache.org/r1659308
Log:
Simplify code.

Remove @Deprecate marker added in r895423:
That method is declared by both javax.servlet.jsp.el.FunctionMapper and by 
javax.el.FunctionMapper.
The javax.el.* one is not deprecated.

Merged r1659304 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 16:31:27 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659263,1659293
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659

svn commit: r1659307 - /tomcat/trunk/java/org/apache/tomcat/jni/Library.java

[markt]

Author: markt
Date: Thu Feb 12 16:31:04 2015
New Revision: 1659307

URL: http://svn.apache.org/r1659307
Log:
More clean-up

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Library.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1659307&r1=1659306&r2=1659307&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Thu Feb 12 16:31:04 
2015
@@ -49,7 +49,7 @@ public final class Library {
 String name = System.mapLibraryName(NAMES[i]);
 String path = System.getProperty("java.library.path");
 String [] paths = path.split(File.pathSeparator);
-for (int j=0; j

svn commit: r1659310 - /tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 16:39:55 2015
New Revision: 1659310

URL: http://svn.apache.org/r1659310
Log:
Suppress deprecation warnings.

Remove @Deprecate marker added in r895423:
That method is declared by both javax.servlet.jsp.el.FunctionMapper and by 
javax.el.FunctionMapper.
The javax.el.* one is not deprecated.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java?rev=1659310&r1=1659309&r2=1659310&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
 Thu Feb 12 16:39:55 2015
@@ -35,6 +35,7 @@ import org.apache.jasper.security.Securi
  * @author Mark Roth
  * @author Kin-man Chung
  */
+@SuppressWarnings("deprecation") // Have to support old JSP EL API
 public final class ProtectedFunctionMapper extends javax.el.FunctionMapper
 implements FunctionMapper {
 
@@ -191,7 +192,6 @@ public final class ProtectedFunctionMapp
  * @return the result of the method mapping. Null means no entry found.
  */
 @Override
-@Deprecated
 public Method resolveFunction(String prefix, String localName) {
 if (this.fnmap != null) {
 return this.fnmap.get(prefix + ":" + localName);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659313 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/runtime/ProtectedFunctionMapper.java webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 16:48:21 2015
New Revision: 1659313

URL: http://svn.apache.org/r1659313
Log:
Simplify code.
Merged r1659308 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 16:48:21 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266,1659294
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,136

Re: svn commit: r1659296 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Konstantin Kolinko]

2015-02-12 19:08 GMT+03:00  :
> Author: markt
> Date: Thu Feb 12 16:08:33 2015
> New Revision: 1659296
>
> URL: http://svn.apache.org/r1659296
> Log:
> Update 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=1659296&r1=1659295&r2=1659296&view=diff
> ==
> --- tomcat/tc6.0.x/trunk/STATUS.txt (original)
> +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 12 16:08:33 2015
> @@ -35,7 +35,7 @@ PATCHES PROPOSED TO BACKPORT:
>-1:
>
>  * Add support for maxSwallowSize to Tomcat 6
> -  
> http://people.apache.org/~markt/patches/2015-02-06-maxSwallowSize-tc6-v1.patch
> +  
> http://people.apache.org/~markt/patches/2015-02-06-maxSwallowSize-tc6-v2.patch


There is no such file at p.a.o.
BTW, today is 2015-02-12.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659321 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 17:08:03 2015
New Revision: 1659321

URL: http://svn.apache.org/r1659321
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=1659321&r1=1659320&r2=1659321&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 12 17:08:03 2015
@@ -62,6 +62,11 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko
   -1:
 
+* Simplify code in ProtectedFunctionMapper class of Jasper runtime.
+  
https://people.apache.org/~kkolinko/patches/2015-02-12_tc6_ProtectedFunctionMapper.patch
+  +1: kkolinko
+  -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

Re: svn commit: r1659296 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Rainer Jung]

Am 12.02.2015 um 17:55 schrieb Konstantin Kolinko:

2015-02-12 19:08 GMT+03:00  :

Author: markt
Date: Thu Feb 12 16:08:33 2015
New Revision: 1659296

URL: http://svn.apache.org/r1659296
Log:
Update 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=1659296&r1=1659295&r2=1659296&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 12 16:08:33 2015
@@ -35,7 +35,7 @@ PATCHES PROPOSED TO BACKPORT:
-1:

  * Add support for maxSwallowSize to Tomcat 6
-  
http://people.apache.org/~markt/patches/2015-02-06-maxSwallowSize-tc6-v1.patch
+  
http://people.apache.org/~markt/patches/2015-02-06-maxSwallowSize-tc6-v2.patch



There is no such file at p.a.o.
BTW, today is 2015-02-12.


I guess it is

http://people.apache.org/~markt/patches/2015-02-08-bug57544-tc6-v2.patch

Looks like having the right content, just the wrong file name.

Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659350 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Feb 12 18:28:33 2015
New Revision: 1659350

URL: http://svn.apache.org/r1659350
Log:
Fix name

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=1659350&r1=1659349&r2=1659350&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 12 18:28:33 2015
@@ -35,7 +35,7 @@ PATCHES PROPOSED TO BACKPORT:
   -1:
 
 * Add support for maxSwallowSize to Tomcat 6
-  
http://people.apache.org/~markt/patches/2015-02-06-maxSwallowSize-tc6-v2.patch
+  
http://people.apache.org/~markt/patches/2015-02-12-maxSwallowSize-tc6-v2.patch
   +1: markt
   -1:
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1659296 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Mark Thomas]

On 12/02/2015 17:29, Rainer Jung wrote:
> Am 12.02.2015 um 17:55 schrieb Konstantin Kolinko:
>> 2015-02-12 19:08 GMT+03:00  :
>>> Author: markt
>>> Date: Thu Feb 12 16:08:33 2015
>>> New Revision: 1659296
>>>
>>> URL: http://svn.apache.org/r1659296
>>> Log:
>>> Update 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=1659296&r1=1659295&r2=1659296&view=diff
>>>
>>> ==
>>>
>>> --- tomcat/tc6.0.x/trunk/STATUS.txt (original)
>>> +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 12 16:08:33 2015
>>> @@ -35,7 +35,7 @@ PATCHES PROPOSED TO BACKPORT:
>>> -1:
>>>
>>>   * Add support for maxSwallowSize to Tomcat 6
>>> - 
>>> http://people.apache.org/~markt/patches/2015-02-06-maxSwallowSize-tc6-v1.patch
>>>
>>> + 
>>> http://people.apache.org/~markt/patches/2015-02-06-maxSwallowSize-tc6-v2.patch
>>>
>>
>>
>> There is no such file at p.a.o.
>> BTW, today is 2015-02-12.
> 
> I guess it is
> 
> http://people.apache.org/~markt/patches/2015-02-08-bug57544-tc6-v2.patch
> 
> Looks like having the right content, just the wrong file name.

Sorry. My bad. It has been a long week...

All fixed now.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

[Rainer Jung]

Am 12.02.2015 um 11:48 schrieb Rainer Jung:

Am 12.02.2015 um 08:55 schrieb Bill Barker:

The jvm crashes here:


 [junit] # C  [libcrypto.so.1.1.0+0x14fef9]  EVP_add_cipher+0x9


I wonder whether we really want to build and test against OpenSSL
master. The 1.0.2 branch would be more stable. I think best would be
building TC 8 and before against tcnative based on OpenSSL 1.0.2 and TC
turnk against tcnative based on OpenSSL master.


I found no way to configure gump to build from a git branch instead of 
master ...



Concerning the current failure: the gump make output of the OpenSSL
build available under
http://vmgump.apache.org/gump/public/openssl/openssl-make/gump_work/build_openssl_openssl-make.txt
shows some warnings that might be related:


The OpenSSL folks have fixed this

https://github.com/openssl/openssl/commit/2b8f33a5741e5c6eab5053140a79673bf972bc13

I also added "make test" to the Gump OpenSSL build. It currently fails

http://vmgump.apache.org/gump/public/openssl/openssl-make-test/gump_work/build_openssl_openssl-make-test.html

The above change for the build wasn't committed to git when the last run 
happened, but the failure in "make test" could well be something else.


If it fails again for the next run, I will remove "make test" again to 
at least let the build succeed.


Regards,

Rainer


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

[Stefan Bodewig]

On 2015-02-12, Rainer Jung wrote:

> Am 12.02.2015 um 11:48 schrieb Rainer Jung:
>> Am 12.02.2015 um 08:55 schrieb Bill Barker:

>> The jvm crashes here:

>>>  [junit] # C  [libcrypto.so.1.1.0+0x14fef9]  EVP_add_cipher+0x9

>> I wonder whether we really want to build and test against OpenSSL
>> master. The 1.0.2 branch would be more stable. I think best would be
>> building TC 8 and before against tcnative based on OpenSSL 1.0.2 and TC
>> turnk against tcnative based on OpenSSL master.

> I found no way to configure gump to build from a git branch instead of
> master ...

The  element inside  supports a branch attribute.  It's
just not documented (yet).

Stefan

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

[Stefan Bodewig]

On 2015-02-12, Stefan Bodewig wrote:

> The  element inside  supports a branch attribute.  It's
> just not documented (yet).

Oh, it even is http://gump.apache.org/metadata/module.html#git :-)

Cheers

Stefan

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

[Rainer Jung]

Am 12.02.2015 um 20:37 schrieb Stefan Bodewig:

On 2015-02-12, Stefan Bodewig wrote:


The  element inside  supports a branch attribute.  It's
just not documented (yet).


Oh, it even is http://gump.apache.org/metadata/module.html#git :-)


Very nice. Moving forward to using it :)

Regards,

Rainer


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57021] Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL fails to load

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57021

--- Comment #10 from Mark Thomas  ---
Some further feedback

1. Indents should be with 4 spaces not tabs.

2. In LibraryNotFoundError libraryName is better than nameOfLibrary

3. Improvement B requested name*s* of the libraries, not just one.

4. The patch always throws an Exception on the first name. There is never a
chance to check the second name.

5. Improvement A is not addressed.

6. Javadoc for LibraryNotFoundError adds no value. Yes, neither does much of
the Javadoc in that package but that is not a reason to continue in the same
direction.

7. Log messages inr AprLifecycleListener.init should not be made directly to
the logger. Check the svn history for that file to find out why.

In applying and reviewing the patch I have fixed the various issues so I should
be committing this fairly soon.

Don't be concerned about how much has been changed. The first patch I offered
was unrecognisable by the time Bill had finished with it. Your first patch is a
lot better than my first 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

svn commit: r1659382 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/Library.java

[markt]

Author: markt
Date: Thu Feb 12 19:59:10 2015
New Revision: 1659382

URL: http://svn.apache.org/r1659382
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57021
Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL 
fails to load.
Based on a patch by Pravallika Peddi.

Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/jni/Library.java

Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1659382&r1=1659381&r2=1659382&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Thu 
Feb 12 19:59:10 2015
@@ -29,6 +29,7 @@ import org.apache.catalina.LifecycleList
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.jni.Library;
+import org.apache.tomcat.jni.LibraryNotFoundError;
 import org.apache.tomcat.jni.SSL;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.res.StringManager;
@@ -193,23 +194,27 @@ public class AprLifecycleListener
 aprInitialized = true;
 
 try {
-String methodName = "initialize";
-Class paramTypes[] = new Class[1];
-paramTypes[0] = String.class;
-Object paramValues[] = new Object[1];
-paramValues[0] = null;
-Class clazz = Class.forName("org.apache.tomcat.jni.Library");
-Method method = clazz.getMethod(methodName, paramTypes);
-method.invoke(null, paramValues);
-major = clazz.getField("TCN_MAJOR_VERSION").getInt(null);
-minor = clazz.getField("TCN_MINOR_VERSION").getInt(null);
-patch = clazz.getField("TCN_PATCH_VERSION").getInt(null);
+Library.initialize(null);
+major = Library.TCN_MAJOR_VERSION;
+minor = Library.TCN_MINOR_VERSION;
+patch = Library.TCN_PATCH_VERSION;
 apver = major * 1000 + minor * 100 + patch;
+} catch (LibraryNotFoundError lnfe) {
+// Library not on path
+if (log.isDebugEnabled()) {
+
initInfoLogMessages.add(sm.getString("aprListener.aprInitDebug",
+lnfe.getLibraryNames(), 
System.getProperty("java.library.path"),
+lnfe.getMessage()));
+} else {
+initInfoLogMessages.add(sm.getString("aprListener.aprInit",
+System.getProperty("java.library.path")));
+}
+return;
 } catch (Throwable t) {
+// Library present but failed to load
 t = ExceptionUtils.unwrapInvocationTargetException(t);
 ExceptionUtils.handleThrowable(t);
-initInfoLogMessages.add(sm.getString("aprListener.aprInit",
-System.getProperty("java.library.path")));
+initInfoLogMessages.add(sm.getString("aprListener.aprInitError", 
t.getMessage()));
 return;
 }
 if (apver < rqver) {

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1659382&r1=1659381&r2=1659382&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Feb 
12 19:59:10 2015
@@ -51,6 +51,8 @@ applicationServletRegistration.setServle
 applicationServletRegistration.setServletSecurity.ise=Security constraints 
can't be added to servlet [{0}] deployed to context with name [{1}] as the 
context has already been initialised
 applicationSessionCookieConfig.ise=Property {0} can not be added to 
SessionCookieConfig for context {1} as the context has been initialised
 aprListener.aprInit=The APR based Apache Tomcat Native library which allows 
optimal performance in production environments was not found on the 
java.library.path: {0}
+aprListener.aprInitDebug=The APR based Apache Tomcat Native library could not 
be found using names [{0}] on the java.library.path [{1}]. The errors reported 
were [{2}]
+aprListener.aprInitError=The APR based Apache Tomcat Native library failed to 
load. The error reported was [{0}]
 aprListener.tcnInvalid=An incompatible version {0} of the APR based Apache 
Tomcat Native library is installed, while Tomcat requires version {1}
 aprListener.tcnVersion=An older version {0} of the APR based Apache Tomcat 
Native library is installed, while Tomcat recommends a min

svn commit: r1659383 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/jni/Library.java

[markt]

Author: markt
Date: Thu Feb 12 20:00:39 2015
New Revision: 1659383

URL: http://svn.apache.org/r1659383
Log:
Clean up

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 20:00:39 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659263,1659293,1659304
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659263,1659293,1659304,1659306-1659307

Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1659383&r1=1659382&r2=1659383&view=diff
=

svn commit: r1659384 - /tomcat/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java

[markt]

Author: markt
Date: Thu Feb 12 20:01:54 2015
New Revision: 1659384

URL: http://svn.apache.org/r1659384
Log:
Add new file missed in r1659382

Added:
tomcat/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java   (with 
props)

Added: tomcat/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java?rev=1659384&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java (added)
+++ tomcat/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java Thu Feb 
12 20:01:54 2015
@@ -0,0 +1,40 @@
+/*
+ * 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.jni;
+
+public class LibraryNotFoundError extends UnsatisfiedLinkError {
+
+private static final long serialVersionUID = 1L;
+
+private final String libraryNames;
+
+/**
+ *
+ * @param libraryNames A list of the file names of the native libraries 
that
+ * failed to load
+ * @param errors A list of the error messages received when trying to load
+ *   each of the libraries
+ */
+public LibraryNotFoundError(String libraryNames, String errors){
+super(errors);
+this.libraryNames = libraryNames;
+}
+
+public String getLibraryNames(){
+return libraryNames;
+}
+}

Propchange: tomcat/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java
--
svn:eol-style = native



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659386 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/tomcat/jni/ webapps/docs/

[markt]

Author: markt
Date: Thu Feb 12 20:03:29 2015
New Revision: 1659386

URL: http://svn.apache.org/r1659386
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57021
Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL 
fails to load.
Based on a patch by Pravallika Peddi.

Added:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java
  - copied unchanged from r1659384, 
tomcat/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 20:03:29 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659263,1659293,1659304,1659306-1659307
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087

svn commit: r1659387 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/jni/Library.java

[markt]

Author: markt
Date: Thu Feb 12 20:04:02 2015
New Revision: 1659387

URL: http://svn.apache.org/r1659387
Log:
Clean-up

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 20:04:02 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266,1659294,1659308
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,

svn commit: r1659388 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/tomcat/jni/ webapps/docs/

[markt]

Author: markt
Date: Thu Feb 12 20:04:53 2015
New Revision: 1659388

URL: http://svn.apache.org/r1659388
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57021
Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL 
fails to load.
Based on a patch by Pravallika Peddi.

Added:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java
  - copied unchanged from r1659386, 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/LibraryNotFoundError.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 20:04:53 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266,1659294,1659308,1659383
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,135

[Bug 57021] Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL fails to load

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57021

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #11 from Mark Thomas  ---
This has been fixed in trunk, 8.0.x (for 8.0.19 onwards) and 7.0.x (for 7.0.60
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 49785] Enabling TLS for JNDIRealm

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49785

Felix Schumacher  changed:

   What|Removed |Added

  Attachment #32448|0   |1
is obsolete||

--- Comment #4 from Felix Schumacher  ---
Created attachment 32465
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32465&action=edit
Enable starttls for JNDIRealm

Basically the same as the last patch, but now with documentation and the
possibility to specify a SSLSocketFactory.

-- 
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 49785] Enabling TLS for JNDIRealm

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49785

--- Comment #5 from Felix Schumacher  ---
(In reply to Christopher Schultz from comment #2)
> The default connection factory is com.sun.jndi.ldap.LdapCtxFactory which
> claims to support both SSL and STARTTLS:
> http://docs.oracle.com/javase/1.4.2/docs/guide/jndi/jndi-ldap.html#SSL
> 
> Am I missing something?

SSL is used automatically, when ldaps:// is specified as the protocol, but for
StartTLS you have to code a little bit to enable it.

-- 
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: r1659416 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 21:40:00 2015
New Revision: 1659416

URL: http://svn.apache.org/r1659416
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=1659416&r1=1659415&r2=1659416&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 12 21:40:00 2015
@@ -36,7 +36,7 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Add support for maxSwallowSize to Tomcat 6
   
http://people.apache.org/~markt/patches/2015-02-12-maxSwallowSize-tc6-v2.patch
-  +1: markt
+  +1: markt, kkolinko
   -1:
 
 * Backport some Jasper clean-up that might provide a marginal performance



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659423 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 22:16:10 2015
New Revision: 1659423

URL: http://svn.apache.org/r1659423
Log:
Amend patch 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=1659423&r1=1659422&r2=1659423&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 12 22:16:10 2015
@@ -45,6 +45,12 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt, kkolinko
   -1:
 
+  Additional change from r1645644 is needed:
+  Otherwise it logs a SEVERE message at startup
+  
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java?r1=1645644&r2=1645643&pathrev=1645644
+  +1: kkolinko
+  -1:
+
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57544
   Avoid potential infinite loop. Chances are this is only triggered by code
   (WebSocket, non-blocking, async) that isn't in 6.0.x but better to clean it 
up



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659424 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/valves/TesterAccessLogValve.java

[markt]

Author: markt
Date: Thu Feb 12 22:21:10 2015
New Revision: 1659424

URL: http://svn.apache.org/r1659424
Log:
Dump the full access log if the wrong number of entries appear in the log

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 22:21:10 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659263,1659293,1659304,1659306-1659307,1659382,1659384
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384

Modified: 
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
URL: 
http://svn.a

svn commit: r1659427 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 22:46:54 2015
New Revision: 1659427

URL: http://svn.apache.org/r1659427
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=57021
Fix compilation errors with Java 6

Java 6 does not like when the code throws a Throwable but it is not declared as 
thrown by the method. Java 7 is fine though.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1659427&r1=1659426&r2=1659427&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java Thu Feb 12 
22:46:54 2015
@@ -32,7 +32,7 @@ public final class Library {
  */
 private static Library _instance = null;
 
-private Library() throws Exception {
+private Library() throws Throwable {
 boolean loaded = false;
 String path = System.getProperty("java.library.path");
 String [] paths = path.split(File.pathSeparator);
@@ -41,7 +41,9 @@ public final class Library {
 try {
 System.loadLibrary(NAMES[i]);
 loaded = true;
-} catch (ThreadDeath | VirtualMachineError t) {
+} catch (ThreadDeath t) {
+throw t;
+} catch (VirtualMachineError t) {
 throw t;
 } catch (Throwable t) {
 String name = System.mapLibraryName(NAMES[i]);
@@ -164,7 +166,7 @@ public final class Library {
  * @param libraryName the name of the library to load
  */
 public static boolean initialize(String libraryName)
-throws Exception
+throws Throwable
 {
 if (_instance == null) {
 if (libraryName == null)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57021] Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL fails to load

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57021

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

--- Comment #12 from Konstantin Kolinko  ---
Adding debug and error messages to initInfoLogMessages list results in them
being printed at INFO level. It is hard to discern them from other INFO
messages.

I think that in those cases they should just be logged immediately, without
postponing the logging.

I'll update the fix.

-- 
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: r1659428 - /tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 23:05:38 2015
New Revision: 1659428

URL: http://svn.apache.org/r1659428
Log:
Further fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=57021
Log debug and error messages immediately and add stacktraces to them.

Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java

Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1659428&r1=1659427&r2=1659428&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Thu 
Feb 12 23:05:38 2015
@@ -202,19 +202,18 @@ public class AprLifecycleListener
 } catch (LibraryNotFoundError lnfe) {
 // Library not on path
 if (log.isDebugEnabled()) {
-
initInfoLogMessages.add(sm.getString("aprListener.aprInitDebug",
+log.debug(sm.getString("aprListener.aprInitDebug",
 lnfe.getLibraryNames(), 
System.getProperty("java.library.path"),
-lnfe.getMessage()));
-} else {
-initInfoLogMessages.add(sm.getString("aprListener.aprInit",
-System.getProperty("java.library.path")));
+lnfe.getMessage()), lnfe);
 }
+initInfoLogMessages.add(sm.getString("aprListener.aprInit",
+System.getProperty("java.library.path")));
 return;
 } catch (Throwable t) {
 // Library present but failed to load
 t = ExceptionUtils.unwrapInvocationTargetException(t);
 ExceptionUtils.handleThrowable(t);
-initInfoLogMessages.add(sm.getString("aprListener.aprInitError", 
t.getMessage()));
+log.warn(sm.getString("aprListener.aprInitError", t.getMessage()), 
t);
 return;
 }
 if (apver < rqver) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57021] Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL fails to load

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57021

--- Comment #13 from Mark Thomas  ---
Those messages are postponed to avoid them appearing before the version info
etc.

I viewed logging them at INFO as less bad than logging them before the version
info. The ideal would be to track the level along with the message in the
postponed logging.

-- 
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: r1659429 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 23:10:56 2015
New Revision: 1659429

URL: http://svn.apache.org/r1659429
Log:
Further fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=57021
Log debug and error messages immediately and add stacktraces to them.

Merged r1659428 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 23:10:56 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,

Re: Tagging 8.0.x

[Mark Thomas]

On 12/02/2015 10:06, Mark Thomas wrote:

> No problem. I'm going to hold off on tagging 8.0.x while I figure out
> the cause of the Gump failures.

I'm making progress with this but I haven't got to the root cause yet.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659431 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Feb 12 23:13:59 2015
New Revision: 1659431

URL: http://svn.apache.org/r1659431
Log:
Further fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=57021
Log debug and error messages immediately and add stacktraces to them.

Merged r1659429 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 23:13:59 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266,1659294,1659308,1659383,1659386
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059

[Bug 57021] Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL fails to load

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57021

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

--- Comment #14 from Konstantin Kolinko  ---
(In reply to Mark Thomas from comment #13)

Version info is just some information. I think that error messages (and debug
ones) are more helpful when they are timely. I agree that it can be a matter of
taste, though.


Updated the fix in r1659427,-28,-29, r1659431 (for 8.0.19 onwards, 7.0.60
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: r1659440 - in /tomcat/site/trunk: docs/security-8.html xdocs/security-8.xml

[kkolinko]

Author: kkolinko
Date: Fri Feb 13 00:10:49 2015
New Revision: 1659440

URL: http://svn.apache.org/r1659440
Log:
Add two more revisions to the list related to CVE-2014-0227.
Tomcat 7, 6 patches include those changes.

Modified:
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/xdocs/security-8.xml

Modified: tomcat/site/trunk/docs/security-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1659440&r1=1659439&r2=1659440&view=diff
==
--- tomcat/site/trunk/docs/security-8.html (original)
+++ tomcat/site/trunk/docs/security-8.html Fri Feb 13 00:10:49 2015
@@ -284,7 +284,9 @@
that caused Tomcat to read part of the request body as a new 
request.
 
 
-This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=1600984";>1600984 and
+This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=1600984";>1600984,
+   http://svn.apache.org/viewvc?view=rev&rev=1601329";>1601329,
+   http://svn.apache.org/viewvc?view=rev&rev=1601330";>1601330 and
http://svn.apache.org/viewvc?view=rev&rev=1601332";>1601332.
 
 

Modified: tomcat/site/trunk/xdocs/security-8.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-8.xml?rev=1659440&r1=1659439&r2=1659440&view=diff
==
--- tomcat/site/trunk/xdocs/security-8.xml (original)
+++ tomcat/site/trunk/xdocs/security-8.xml Fri Feb 13 00:10:49 2015
@@ -58,7 +58,9 @@
 It was possible to craft a malformed chunk as part of a chunked request
that caused Tomcat to read part of the request body as a new 
request.
 
-This was fixed in revisions 1600984 and
+This was fixed in revisions 1600984,
+   1601329,
+   1601330 and
1601332.
 
 This issue was identified by the Tomcat security team on 30 May 2014



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659441 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Fri Feb 13 00:15:26 2015
New Revision: 1659441

URL: http://svn.apache.org/r1659441
Log:
Add CVE-2014-0227 to changelog

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1659441&r1=1659440&r2=1659441&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Feb 13 00:15:26 2015
@@ -216,6 +216,7 @@
   
 
   
+Fix CVE-2014-0227:
 Various improvements to ChunkedInputFilter including clean-up, i18n for
 error messages and adding an error flag to allow subsequent attempts at
 reading after an error to fail fast. (markt)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659443 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Fri Feb 13 00:20:16 2015
New Revision: 1659443

URL: http://svn.apache.org/r1659443
Log:
Add CVE-2014-0227 to changelog

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=1659443&r1=1659442&r2=1659443&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Feb 13 00:20:16 2015
@@ -1142,6 +1142,12 @@
 chain of "elseif"s. (kkolinko)
   
   
+Fix CVE-2014-0227:
+Various improvements to ChunkedInputFilter including clean-up, i18n for
+error messages and adding an error flag to allow subsequent attempts at
+reading after an error to fail fast. (markt)
+  
+  
 If request contains an unrecognized Expect header, respond with error
 417 (Expectation Failed), according to RFC2616 chapter 14.20. (markt)
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1659444 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Fri Feb 13 00:22:08 2015
New Revision: 1659444

URL: http://svn.apache.org/r1659444
Log:
Add CVE-2014-0227 to changelog

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1659444&r1=1659443&r2=1659444&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Fri Feb 13 00:22:08 2015
@@ -1922,6 +1922,12 @@
 connectors. (kkolinko)
   
   
+Fix CVE-2014-0227:
+Various improvements to ChunkedInputFilter including clean-up, i18n for
+error messages and adding an error flag to allow subsequent attempts at
+reading after an error to fail fast. (markt)
+  
+  
 If request contains an unrecognized Expect header, respond with error
 417 (Expectation Failed), according to RFC2616 chapter 14.20. (markt)
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57574] javax.el.ImportHandler.importPackage() does not work in Equinox OSGi

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57574

--- Comment #3 from Jan Bartel  ---
The behaviour of Package.getPackage(name) is to use the classloader of the
caller of the package to try and retrieve the package info. In osgi-land the
classloader of the caller may not be allowed to see that package because of
strict osgi rules about class visbility. The caller was loaded from the
javax.el bundle or the jasper bundle. Neither of those bundles can possibly
have manifest dependencies on the packages that will be dynamically loaded by
the jsp being compiled.

As far as the trailing '/' is concerned, I think Konstantin is on-the-money as
the bundles are probably packed jars and I can see code in the Equinox impl
that uses ZipFile/ZipEntry to look into the bundle, and IIRC those methods tend
to like a trailing '/' to signify a directory.

regards
Jan

-- 
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

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

[Bill Barker]

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-tc8.0.x-test-nio2 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-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/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.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 26 mins 39 secs
Command Line: /usr/lib/jvm/java-8-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.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150213-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150213.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150213-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20150213/bin/opens
 sl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
 
ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat

[Bug 57581] New: request.getBytesRead() should be long

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57581

Bug ID: 57581
   Summary: request.getBytesRead() should be long
   Product: Tomcat 7
   Version: unspecified
  Hardware: PC
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Servlet & JSP API
  Assignee: dev@tomcat.apache.org
  Reporter: neo...@naver.com

Class org.apache.coyote.Request has bytesRead variable's return type is int.

When file upload (grater than 2 GB), it returns negative value.

Return type should be change to long.

This bug affected all version of tomcat 6, 7, 8, 9.

-

* AS-IS

private int bytesRead=0;

public int getBytesRead() {
   return bytesRead;
}

* TO-BE

private long bytesRead=0;

public long getBytesRead() {
   return bytesRead;
}

-- 
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 57021] Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL fails to load

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57021

--- Comment #15 from VIN  ---
(In reply to Christopher Schultz from comment #9)
> (In reply to VIN from comment #8)
> > Created attachment 32460 [details]
> > Updated patch with suggested comments
> > 
> > Please let me know if anything is missing.
> 
> The doc/*.html files should not be in the patch... they are auto-generated
> from the xml files elsewhere.
  Hi Chris,

  I generated the Javadoc from Eclipse which generated those many HTML files. I
was not aware that we should not be putting all those files into patch. Can you
help explain me on what is the best approach to generate the java doc and what
files need to be uploaded in generated files?



> In AprLifecycleListener near line 208, instead of catching Throwable and
> then checking for LibraryNotFoundError and UnsatisfiedLinkError, why not add
> catch clauses and leave the default action in catch(Throwable)? I think this
> will be a better way to do things.

   I have gone through multiple links to understand between catching an
exception vs catching Throwable and my findings are:

When we catch Exception, all sub classes of exception will be caught but ERRORS
will not be part of them. (ERRORS are serious problems like MemoryOutOfBound
where JVM may need to shutdown).

Throwable is super class of all Exceptions and Errors and when we catch
Throwable all the Errors also will be caught.

But from JAVA Doc:
An Error is a subclass of Throwable that indicates serious problems that a
reasonable application should not try to catch. Most such errors are abnormal
conditions. The ThreadDeath error, though a "normal" condition, is also a
subclass of Error because most applications should not try to catch it.

It means applications should not try to catch Throwable.

I have seen many places in our Tomcat application, catching the Throwable. In
this regard, can you help me to understand why do we use Throwable and where
can it be used in general?

> 
> I'm not sure what the implications are, but the old (and default case) code
> adds the log message to initInfoLogMessages while the new code performs
> logging directly. Is there a reason to prefer one over the other?

The initInfoLogMessages holds only the INFO messages, but as per the bug
request we need to log the exception as warning. Hence i did not add it to
initInfoLogMessages.

-- 
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 57021] Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL fails to load

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57021

--- Comment #16 from VIN  ---
(In reply to Mark Thomas from comment #10)
> Some further feedback
> 
> 1. Indents should be with 4 spaces not tabs.
 Hi Mark,
 I changed the code using Eclipse editor which by default adds tab as
indent. Next time on wards i will open the changed code in notepad and check
the indents.

> 
> 2. In LibraryNotFoundError libraryName is better than nameOfLibrary
 Sure, Thanks.
> 
> 3. Improvement B requested name*s* of the libraries, not just one.
 As per the enhancement mentioned in the request, Tomcat code should not
try to load the second library when the first library failed to load. So I
thought there is no point in maintaining array of library names.

Please correct me if my understanding is wrong.

> 
> 4. The patch always throws an Exception on the first name. There is never a
> chance to check the second name.

 As per the enhancement mentioned in request, code should not try load the
second library. That's why I intentionally returned the exception (throw t;).

Please correct me if my understanding is wrong.


> 
> 5. Improvement A is not addressed.
  A. Treat the case when "fd.exists()" as fatal and rethrow original
exception.
 I throw the original exception back to AprLifeCycleListener.java as
mentioned. 

 In Library.java, i am throwing this and in AprLifecycleListener.java, I
logged this exception as warning. Forgot to mark it as Fatal :)

 throw new LibraryNotFoundError(name, err.toString()); 

> 
> 6. Javadoc for LibraryNotFoundError adds no value. Yes, neither does much of
> the Javadoc in that package but that is not a reason to continue in the same
> direction.
> 
> 7. Log messages inr AprLifecycleListener.init should not be made directly to
> the logger. Check the svn history for that file to find out why.

   Sure, I will check. I found only initInfoLogMessages variable in
AprLifecycleListener.java, did not find the Fatal or Warning variable so i felt
no other way than directly print to the log file by log.warn().

> 
> In applying and reviewing the patch I have fixed the various issues so I
> should be committing this fairly soon.
> 
> Don't be concerned about how much has been changed. The first patch I
> offered was unrecognisable by the time Bill had finished with it. Your first
> patch is a lot better than my first patch.


  Do we have any guidelines document so that i can go through and follow
accordingly?

Thanks so much for your time :)

-- 
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 57021] Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL fails to load

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57021

--- Comment #17 from VIN  ---
(In reply to VIN from comment #16)
> (In reply to Mark Thomas from comment #10)
> > Some further feedback
> > 
> > 1. Indents should be with 4 spaces not tabs.
>  Hi Mark,
>  I changed the code using Eclipse editor which by default adds tab as
> indent. Next time on wards i will open the changed code in notepad and check
> the indents.
> 
> > 
> > 2. In LibraryNotFoundError libraryName is better than nameOfLibrary
>  Sure, Thanks.
> > 
> > 3. Improvement B requested name*s* of the libraries, not just one.
>  As per the enhancement mentioned in the request, Tomcat code should not
> try to load the second library when the first library failed to load. So I
> thought there is no point in maintaining array of library names.
> 
> Please correct me if my understanding is wrong.
> 
> > 
> > 4. The patch always throws an Exception on the first name. There is never a
> > chance to check the second name.
>
>  As per the enhancement mentioned in request, code should not try load
> the second library. That's why I intentionally returned the exception (throw
> t;).
> 
> Please correct me if my understanding is wrong.
>  
> 
> > 
> > 5. Improvement A is not addressed.
>   A. Treat the case when "fd.exists()" as fatal and rethrow original
> exception.
>  I throw the original exception back to AprLifeCycleListener.java as
> mentioned. 
>  
>  In Library.java, i am throwing this and in AprLifecycleListener.java, I
> logged this exception as warning. Forgot to mark it as Fatal :)
> 
>  throw new LibraryNotFoundError(name, err.toString()); 
> 
> > 
> > 6. Javadoc for LibraryNotFoundError adds no value. Yes, neither does much of
> > the Javadoc in that package but that is not a reason to continue in the same
> > direction.
> > 
> > 7. Log messages inr AprLifecycleListener.init should not be made directly to
> > the logger. Check the svn history for that file to find out why.
> 
>Sure, I will check. I found only initInfoLogMessages variable in
> AprLifecycleListener.java, did not find the Fatal or Warning variable so i
> felt no other way than directly print to the log file by log.warn().
> 
> > 
> > In applying and reviewing the patch I have fixed the various issues so I
> > should be committing this fairly soon.
> > 
> > Don't be concerned about how much has been changed. The first patch I
> > offered was unrecognisable by the time Bill had finished with it. Your first
> > patch is a lot better than my first patch.
> 
> 
>   Do we have any guidelines document so that i can go through and follow
> accordingly?
> 
> Thanks so much for your time :)


I have gone through the fixed code. It is nice and simple. One query is:  In
AprLifecycleListener.java, the LibraryNotFound exception is added to
initInfiLogMessages variable. I suspect it would print the error as INFO.

-- 
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