Re: [VOTE] Release Apache Tomcat 7.0.56

[jean-frederic clere]

On 09/28/2014 02:34 PM, Violeta Georgieva wrote:

[X] Stable - go ahead and release as 7.0.56 Stable


My tests against the tag are all passing.

Cheers

Jean-Frederic


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

[Bug 56397] Establish parallel Maven-based build process

[bugzilla]

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

Pierre Viret  changed:

   What|Removed |Added

  Attachment #32016|0   |1
is obsolete||
  Attachment #32017|0   |1
is obsolete||
  Attachment #32044|0   |1
is obsolete||

--- Comment #21 from Pierre Viret  ---
Created attachment 32072
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32072&action=edit
Patch for tomcat-maven-layout created with "svn diff -x -u"

New version of the patch. As the first patch was not committed yet this one can
be committed directly. I hope there won't be any issue with the svn:externals
because for now I get strange errors when I try to "svn update" the
tomcat-maven-layout directory.
I've mainly worked on tomcat-examples: this project generates the examples for
the tomcat instance (exactly like what ant creates in
output/build/webapps/examples). My next step will be to finish the
implementation of the apache-tomcat project, which generates the whole working
instance (output/build). I think that I will have some time today to do it.

With this actual implementation, no special configuration of the IDE is
necessary: simply open the master project in NetBeans and you can build & work
with all components immediately. I have not tested it with eclipse for now.

-- 
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: r1628603 - in /tomcat/maven-plugin/branches/tc8.x: ./ common-tomcat-maven-plugin/ tomcat-maven-archetype/ tomcat-maven-plugin-it/ tomcat6-maven-plugin/ tomcat7-maven-plugin/ tomcat7-war-ru

[olamy]

Author: olamy
Date: Wed Oct  1 05:31:10 2014
New Revision: 1628603

URL: http://svn.apache.org/r1628603
Log:
bump version to 3.0-SNAPSHOT

Modified:
tomcat/maven-plugin/branches/tc8.x/common-tomcat-maven-plugin/pom.xml
tomcat/maven-plugin/branches/tc8.x/pom.xml
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-archetype/pom.xml
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/pom.xml
tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/pom.xml
tomcat/maven-plugin/branches/tc8.x/tomcat7-war-runner/pom.xml
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/pom.xml

tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/pom.xml

Modified: tomcat/maven-plugin/branches/tc8.x/common-tomcat-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/common-tomcat-maven-plugin/pom.xml?rev=1628603&r1=1628602&r2=1628603&view=diff
==
--- tomcat/maven-plugin/branches/tc8.x/common-tomcat-maven-plugin/pom.xml 
(original)
+++ tomcat/maven-plugin/branches/tc8.x/common-tomcat-maven-plugin/pom.xml Wed 
Oct  1 05:31:10 2014
@@ -24,7 +24,7 @@
   
 tomcat-maven-plugin
 org.apache.tomcat.maven
-2.3-SNAPSHOT
+3.0-SNAPSHOT
   
   common-tomcat-maven-plugin
   Apache Tomcat Maven Plugin :: Common API

Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/pom.xml?rev=1628603&r1=1628602&r2=1628603&view=diff
==
--- tomcat/maven-plugin/branches/tc8.x/pom.xml (original)
+++ tomcat/maven-plugin/branches/tc8.x/pom.xml Wed Oct  1 05:31:10 2014
@@ -32,7 +32,7 @@
   tomcat-maven-plugin
   pom
   Apache Tomcat Maven Plugin
-  2.3-SNAPSHOT
+  3.0-SNAPSHOT
   The Tomcat Maven Plugin provides goals to manipulate WAR 
projects within the Tomcat servlet
 container.
   

Modified: tomcat/maven-plugin/branches/tc8.x/tomcat-maven-archetype/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat-maven-archetype/pom.xml?rev=1628603&r1=1628602&r2=1628603&view=diff
==
--- tomcat/maven-plugin/branches/tc8.x/tomcat-maven-archetype/pom.xml (original)
+++ tomcat/maven-plugin/branches/tc8.x/tomcat-maven-archetype/pom.xml Wed Oct  
1 05:31:10 2014
@@ -23,7 +23,7 @@
   
 org.apache.tomcat.maven
 tomcat-maven-plugin
-2.3-SNAPSHOT
+3.0-SNAPSHOT
 ../pom.xml
   
 

Modified: tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/pom.xml?rev=1628603&r1=1628602&r2=1628603&view=diff
==
--- tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/pom.xml (original)
+++ tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/pom.xml Wed Oct  
1 05:31:10 2014
@@ -22,7 +22,7 @@
   
 org.apache.tomcat.maven
 tomcat-maven-plugin
-2.3-SNAPSHOT
+3.0-SNAPSHOT
   
   4.0.0
 

Modified: tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/pom.xml?rev=1628603&r1=1628602&r2=1628603&view=diff
==
--- tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/pom.xml Wed Oct  1 
05:31:10 2014
@@ -21,7 +21,7 @@
   
 org.apache.tomcat.maven
 tomcat-maven-plugin
-2.3-SNAPSHOT
+3.0-SNAPSHOT
 ../pom.xml
   
 

Modified: tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/pom.xml?rev=1628603&r1=1628602&r2=1628603&view=diff
==
--- tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/pom.xml Wed Oct  1 
05:31:10 2014
@@ -23,7 +23,7 @@
   
 tomcat-maven-plugin
 org.apache.tomcat.maven
-2.3-SNAPSHOT
+3.0-SNAPSHOT
   
   tomcat7-maven-plugin
   maven-plugin

Modified: tomcat/maven-plugin/branches/tc8.x/tomcat7-war-runner/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat7-war-runner/pom.xml?rev=1628603&r1=1628602&r2=1628603&view=diff
==
--- tomcat/maven-plugin/branches/tc8.x/tomcat7-war-runner/pom.xml (original)
+++ tomca

svn commit: r1628592 - in /tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run: AbstractRunMojo.java RunMojo.java

[olamy]

Author: olamy
Date: Wed Oct  1 04:02:59 2014
New Revision: 1628592

URL: http://svn.apache.org/r1628592
Log:
minot formatting

Modified:

tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java

tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java

Modified: 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java?rev=1628592&r1=1628591&r2=1628592&view=diff
==
--- 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
 (original)
+++ 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
 Wed Oct  1 04:02:59 2014
@@ -734,7 +734,7 @@ public abstract class AbstractRunMojo
 // normally this one only but just in case ...
 if ( jarScanner instanceof StandardJarScanner )
 {
-( (StandardJarScanner) jarScanner ).setScanAllDirectories( 
jarScanAllDirectories );
+( StandardJarScanner.class.cast( jarScanner ) 
).setScanAllDirectories( jarScanAllDirectories );
 }
 
 return context;
@@ -886,7 +886,6 @@ public abstract class AbstractRunMojo
 else
 {
 webappLoader = new WebappLoader( getTomcatClassLoader() );
-//webappLoader.setLoaderClass( 
MavenWebappClassLoader.class.getName() );
 }
 }
 else
@@ -900,7 +899,6 @@ public abstract class AbstractRunMojo
 else
 {
 webappLoader = new WebappLoader( 
Thread.currentThread().getContextClassLoader() );
-//webappLoader.setLoaderClass( 
MavenWebappClassLoader.class.getName() );
 }
 }
 return webappLoader;

Modified: 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java?rev=1628592&r1=1628591&r2=1628592&view=diff
==
--- 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
 (original)
+++ 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
 Wed Oct  1 04:02:59 2014
@@ -372,8 +372,6 @@ public class RunMojo
 }
 }
 
-
-
 if ( url == null )
 {
 return new EmptyResource( this, getPath() );



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

svn commit: r1628591 - in /tomcat/maven-plugin/branches/tc8.x: pom.xml tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java tomcat8-maven-plugin/src/main/java/org/

[olamy]

Author: olamy
Date: Wed Oct  1 04:02:49 2014
New Revision: 1628591

URL: http://svn.apache.org/r1628591
Log:
minor updates

Modified:
tomcat/maven-plugin/branches/tc8.x/pom.xml

tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java

tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java

Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/pom.xml?rev=1628591&r1=1628590&r2=1628591&view=diff
==
--- tomcat/maven-plugin/branches/tc8.x/pom.xml (original)
+++ tomcat/maven-plugin/branches/tc8.x/pom.xml Wed Oct  1 04:02:49 2014
@@ -625,12 +625,12 @@
   
 org.apache.maven.shared
 maven-verifier
-1.4
+1.5
   
   
 org.apache.httpcomponents
 httpclient
-4.3.1
+4.3.5
   
   
 org.slf4j
@@ -645,12 +645,12 @@
   
 org.apache.logging.log4j
 log4j-core
-2.0-beta9
+2.0.1
   
   
 org.apache.logging.log4j
 log4j-slf4j-impl
-2.0-beta9
+2.0.1
   
 
   

Modified: 
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java?rev=1628591&r1=1628590&r2=1628591&view=diff
==
--- 
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
 (original)
+++ 
tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
 Wed Oct  1 04:02:49 2014
@@ -22,12 +22,12 @@ package org.apache.tomcat.maven.it;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ResponseHandler;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpHead;
 import org.apache.http.impl.client.BasicResponseHandler;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
@@ -67,7 +67,7 @@ public abstract class AbstractWarProject
 /**
  * HttpClient to use to connect to the deployed web-application.
  */
-private DefaultHttpClient httpClient;
+private CloseableHttpClient httpClient;
 
 /**
  * Helper for Maven-Integration-Tests.
@@ -83,11 +83,8 @@ public abstract class AbstractWarProject
 public void setUp()
 throws Exception
 {
-httpClient = new DefaultHttpClient();
 
-final HttpParams params = httpClient.getParams();
-HttpConnectionParams.setConnectionTimeout( params, getTimeout() );
-HttpConnectionParams.setSoTimeout( params, getTimeout() );
+httpClient = HttpClientBuilder.create().build();
 
 webappHome = ResourceExtractor.simpleExtractResources( getClass(), "/" 
+ getWarArtifactId() );
 verifier = new Verifier( webappHome.getAbsolutePath() );
@@ -105,7 +102,7 @@ public abstract class AbstractWarProject
 public void tearDown()
 throws Exception
 {
-httpClient.getConnectionManager().shutdown();
+httpClient.close();
 verifier.resetStreams();
 verifier.deleteArtifact( "org.apache.tomcat.maven.it", 
getWarArtifactId(), "1.0-SNAPSHOT", "war" );
 }
@@ -198,6 +195,8 @@ public abstract class AbstractWarProject
 throws IOException
 {
 HttpGet httpGet = new HttpGet( getWebappUrl() );
+httpGet.setConfig(
+RequestConfig.custom().setSocketTimeout( getTimeout() 
).setConnectTimeout( getTimeout() ).build() );
 ResponseHandler responseHandler = new BasicResponseHandler();
 return httpClient.execute( httpGet, responseHandler );
 }

Modified: 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java?rev=1628591&r1=1628590&r2=1628591&view=diff
==
--- 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/m

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/501

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1628541
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot




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

svn commit: r1628576 - /tomcat/trunk/webapps/docs/windows-auth-howto.xml

[kkolinko]

Author: kkolinko
Date: Tue Sep 30 23:44:42 2014
New Revision: 1628576

URL: http://svn.apache.org/r1628576
Log:
Update link to GSS-API tutorial, Java 5 -> Java 7.
Add direct link to its troubleshooting page (it is useful, but it is not listed 
on its index page).

Modified:
tomcat/trunk/webapps/docs/windows-auth-howto.xml

Modified: tomcat/trunk/webapps/docs/windows-auth-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-auth-howto.xml?rev=1628576&r1=1628575&r2=1628576&view=diff
==
--- tomcat/trunk/webapps/docs/windows-auth-howto.xml (original)
+++ tomcat/trunk/webapps/docs/windows-auth-howto.xml Tue Sep 30 23:44:42 2014
@@ -228,8 +228,10 @@ com.sun.security.jgss.krb5.accept {
   IIS and Kerberos
   http://spnego.sourceforge.net/index.html";>
   SPNEGO project at SourceForge
-  http://docs.oracle.com/javase/1.5.0/docs/guide/security/jgss/tutorials/index.html";>
-  Oracle JGSS tutorial
+  http://docs.oracle.com/javase/7/docs/technotes/guides/security/jgss/tutorials/index.html";>
+  Oracle Java GSS-API tutorial (Java 7)
+  http://docs.oracle.com/javase/7/docs/technotes/guides/security/jgss/tutorials/Troubleshooting.html";>
+  Oracle Java GSS-API tutorial - Troubleshooting (Java 7)
   https://cwiki.apache.org/GMOxDOC21/using-spengo-in-geronimo.html#UsingSpengoingeronimo-SettinguptheActiveDirectoryDomainController";>
   Geronimo configuration for Windows authentication
   http://blogs.msdn.com/b/openspecification/archive/2010/11/17/encryption-type-selection-in-kerberos-exchanges.aspx";>



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

Re: [VOTE] Release Apache Tomcat 7.0.56

[Konstantin Kolinko]

2014-09-28 16:34 GMT+04:00 Violeta Georgieva :
> The proposed Apache Tomcat 7.0.56 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.56/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1023/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_56/
>
> The proposed 7.0.56 release is:
> [ ] Broken - do not release

[x] Stable - go ahead and release as 7.0.56 Stable

Tested on Windows 7 with 32-bit JDKs a) 6u45, b) 6u45+7u67.

I encountered an occasional failure in a websocket test -> filed as BZ
57047. From the circumstances where it happened I think it is a
variant of expected behaviour, but I am not quite familiar with
websocket code so another look is appreciated.

All the other tests in testsuite are OK.

Smoke testing is OK.


Best regards,
Konstantin Kolinko

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

[Bug 57047] New: Occasional failure in TestWsWebSocketContainer.testSmallTextBufferClientTextMessage test

[bugzilla]

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

Bug ID: 57047
   Summary: Occasional failure in
TestWsWebSocketContainer.testSmallTextBufferClientText
Message test
   Product: Tomcat 7
   Version: trunk
  Hardware: PC
Status: NEW
  Severity: minor
  Priority: P2
 Component: WebSocket
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com

This is a rare minor issue that I encountered when testing 7.0.56 release
candidate.

Platform: Windows 7, 32-bit JDK 6u45 + 7u67.

I encountered it when running the whole testsuite. After that I did ~50 runs in
a loop of this specific test with all 3 connectors with

test.entry=org.apache.tomcat.websocket.TestWsWebSocketContainer
test.entry.methods=testSmallTextBufferClientTextMessage

The issue reproduced 2 times with NIO, 1 time with APR and 1 time with BIO -
all from 50x3 connectors runs.

Stacktraces are the same (it is websocket client's stacktrace, it does not
depend on server side). This one is from running with NIO:

[[[
Testcase: testSmallTextBufferClientTextMessage took 2,587 sec
Caused an ERROR
java.util.concurrent.ExecutionException: java.io.IOException: Unable to write
the complete message as the WebSocket connection has been closed
java.io.IOException: java.util.concurrent.ExecutionException:
java.io.IOException: Unable to write the complete message as the WebSocket
connection has been closed
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendPartialString(WsRemoteEndpointImplBase.java:229)
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendString(WsRemoteEndpointImplBase.java:172)
at
org.apache.tomcat.websocket.WsRemoteEndpointBasic.sendText(WsRemoteEndpointBasic.java:37)
at
org.apache.tomcat.websocket.TestWsWebSocketContainer.doBufferTest(TestWsWebSocketContainer.java:256)
at
org.apache.tomcat.websocket.TestWsWebSocketContainer.testSmallTextBufferClientTextMessage(TestWsWebSocketContainer.java:156)
Caused by: java.util.concurrent.ExecutionException: java.io.IOException: Unable
to write the complete message as the WebSocket connection has been closed
at
org.apache.tomcat.websocket.FutureToSendHandler.get(FutureToSendHandler.java:102)
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendPartialString(WsRemoteEndpointImplBase.java:224)
Caused by: java.io.IOException: Unable to write the complete message as the
WebSocket connection has been closed
at org.apache.tomcat.websocket.WsSession.doClose(WsSession.java:447)
at org.apache.tomcat.websocket.WsSession.close(WsSession.java:418)
at org.apache.tomcat.websocket.WsFrameClient.close(WsFrameClient.java:86)
at
org.apache.tomcat.websocket.WsFrameClient.access$300(WsFrameClient.java:26)
at
org.apache.tomcat.websocket.WsFrameClient$WsFrameClientCompletionHandler.completed(WsFrameClient.java:115)
at
org.apache.tomcat.websocket.WsFrameClient$WsFrameClientCompletionHandler.completed(WsFrameClient.java:100)
at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126)
at sun.nio.ch.Invoker$2.run(Invoker.java:218)
at
sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
]]]

(The stack traces look a bit confusing, because they span Future and different
threads. The main one is at the top, in
"WsRemoteEndpointImplBase.sendPartialString()").

My assessment
==
I think that this is a variant of expected behaviour.

The test case testSmallTextBufferClientTextMessage is essentially a call to
{
 doBufferTest(true, false, true, false);
}
where 4th argument is pass:=false. It is expected to fail.

-- 
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: r1628481 - /tomcat/tc6.0.x/trunk/build.properties.default

[jean-frederic clere]

On 09/30/2014 06:56 PM, Konstantin Kolinko wrote:

2014-09-30 20:16 GMT+04:00  :

Author: jfclere
Date: Tue Sep 30 16:16:13 2014
New Revision: 1628481

URL: http://svn.apache.org/r1628481
Log:
Ready for 6.0.43 :D

Modified:
 tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1628481&r1=1628480&r2=1628481&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Sep 30 16:16:13 2014
@@ -25,9 +25,9 @@
  # - Version Control Flags -
  version.major=6
  version.minor=0
-version.build=42
+version.build=43
  version.patch=0
-version.suffix=
+version.suffix=-dev



This needs bump in res/maven/mvn.properties.default   as well.
http://svn.apache.org/r1594943


Fixed thanks

Cheers

Jean-Frederic

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

svn commit: r1628551 - /tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default

[jfclere]

Author: jfclere
Date: Tue Sep 30 21:29:46 2014
New Revision: 1628551

URL: http://svn.apache.org/r1628551
Log:
bump in res/maven/mvn.properties.default too (thanks Konstantin).

Modified:
tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default

Modified: tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default?rev=1628551&r1=1628550&r2=1628551&view=diff
==
--- tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default Tue Sep 30 21:29:46 
2014
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=6.0.42
+maven.asf.release.deploy.version=6.0.43
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib



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

Re: [VOTE] Release Apache Tomcat 6.0.42

[jean-frederic clere]

On 09/30/2014 10:54 PM, Konstantin Kolinko wrote:

2014-10-01 0:48 GMT+04:00 jean-frederic clere :

The proposed Apache Tomcat 6.0.42 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.42/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1023/


The above staging repository contains 7.0.56, not 6.0.42.


Oops I press send before finishing.

https://repository.apache.org/content/repositories/orgapachetomcat-1024/ 
is the right place.



Cheers

Jean-Frederic

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

Re: [VOTE] Release Apache Tomcat 6.0.42

[Konstantin Kolinko]

2014-10-01 0:48 GMT+04:00 jean-frederic clere :
> The proposed Apache Tomcat 6.0.42 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.42/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1023/

The above staging repository contains 7.0.56, not 6.0.42.


> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_42/
>
> The proposed 6.0.42 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 6.0.42 Stable
>
> Regards
>
> Cheers
>
> Jean-Frederic
>
> -
> 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

[VOTE] Release Apache Tomcat 6.0.42

[jean-frederic clere]

The proposed Apache Tomcat 6.0.42 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.42/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1023/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_42/

The proposed 6.0.42 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 6.0.42 Stable

Regards

Cheers

Jean-Frederic

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

svn commit: r6697 - in /dev/tomcat/tomcat-6/v6.0.42: ./ bin/ bin/extras/ src/

[jfclere]

Author: jfclere
Date: Tue Sep 30 20:46:23 2014
New Revision: 6697

Log:
Stage 6.0.42RC

Added:
dev/tomcat/tomcat-6/v6.0.42/
dev/tomcat/tomcat-6/v6.0.42/KEYS
dev/tomcat/tomcat-6/v6.0.42/README.html
dev/tomcat/tomcat-6/v6.0.42/RELEASE-NOTES
dev/tomcat/tomcat-6/v6.0.42/bin/
dev/tomcat/tomcat-6/v6.0.42/bin/README.html
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-deployer.tar.gz.asc   
(with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-deployer.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-deployer.zip   (with 
props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-deployer.zip.asc   
(with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-deployer.zip.md5
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-fulldocs.tar.gz.asc   
(with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-fulldocs.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-windows-i64.zip   
(with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-windows-i64.zip.asc   
(with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-windows-i64.zip.md5
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-windows-x64.zip   
(with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-windows-x64.zip.asc   
(with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-windows-x64.zip.md5
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-windows-x86.zip   
(with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-windows-x86.zip.asc   
(with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42-windows-x86.zip.md5
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42.exe   (with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42.exe.asc   (with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42.exe.md5
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42.tar.gz   (with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42.tar.gz.asc   (with 
props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42.zip   (with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42.zip.asc   (with props)
dev/tomcat/tomcat-6/v6.0.42/bin/apache-tomcat-6.0.42.zip.md5
dev/tomcat/tomcat-6/v6.0.42/bin/extras/
dev/tomcat/tomcat-6/v6.0.42/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-6/v6.0.42/bin/extras/catalina-jmx-remote.jar.asc   (with 
props)
dev/tomcat/tomcat-6/v6.0.42/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-6/v6.0.42/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-6/v6.0.42/bin/extras/catalina-ws.jar.asc   (with props)
dev/tomcat/tomcat-6/v6.0.42/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-6/v6.0.42/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-6/v6.0.42/bin/extras/tomcat-juli-adapters.jar.asc   (with 
props)
dev/tomcat/tomcat-6/v6.0.42/bin/extras/tomcat-juli-adapters.jar.md5
dev/tomcat/tomcat-6/v6.0.42/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-6/v6.0.42/bin/extras/tomcat-juli.jar.asc   (with props)
dev/tomcat/tomcat-6/v6.0.42/bin/extras/tomcat-juli.jar.md5
dev/tomcat/tomcat-6/v6.0.42/src/
dev/tomcat/tomcat-6/v6.0.42/src/apache-tomcat-6.0.42-src.tar.gz   (with 
props)
dev/tomcat/tomcat-6/v6.0.42/src/apache-tomcat-6.0.42-src.tar.gz.asc   (with 
props)
dev/tomcat/tomcat-6/v6.0.42/src/apache-tomcat-6.0.42-src.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.42/src/apache-tomcat-6.0.42-src.zip   (with props)
dev/tomcat/tomcat-6/v6.0.42/src/apache-tomcat-6.0.42-src.zip.asc   (with 
props)
dev/tomcat/tomcat-6/v6.0.42/src/apache-tomcat-6.0.42-src.zip.md5

Added: dev/tomcat/tomcat-6/v6.0.42/KEYS
==
--- dev/tomcat/tomcat-6/v6.0.42/KEYS (added)
+++ dev/tomcat/tomcat-6/v6.0.42/KEYS Tue Sep 30 20:46:23 2014
@@ -0,0 +1,572 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers: 
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25

svn commit: r1628543 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/windows-auth-howto.xml

[markt]

Author: markt
Date: Tue Sep 30 20:11:35 2014
New Revision: 1628543

URL: http://svn.apache.org/r1628543
Log:
Update docs as automatically setting the system property 
javax.security.auth.useSubjectCredsOnly was removed since it broke SPNEGO on 
IBM JREs.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1628541

Modified: tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml?rev=1628543&r1=1628542&r2=1628543&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/windows-auth-howto.xml Tue Sep 30 
20:11:35 2014
@@ -172,9 +172,6 @@ com.sun.security.jgss.krb5.accept {
   the JVM being used. The name of the login configuration must match the
   value used by the authentication
   valve.
-  The system property javax.security.auth.useSubjectCredsOnly
-  is automatically set to the required value of false if a web application is
-  configured to use the SPNEGO authentication method.
   
   The SPNEGO authenticator will work with any 
   Realm but if used with the JNDI Realm, by default the JNDI Realm will use



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

svn commit: r1628541 - /tomcat/trunk/webapps/docs/windows-auth-howto.xml

[markt]

Author: markt
Date: Tue Sep 30 20:10:18 2014
New Revision: 1628541

URL: http://svn.apache.org/r1628541
Log:
Update docs as automatically setting the system property 
javax.security.auth.useSubjectCredsOnly was removed since it broke SPNEGO on 
IBM JREs.

Modified:
tomcat/trunk/webapps/docs/windows-auth-howto.xml

Modified: tomcat/trunk/webapps/docs/windows-auth-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-auth-howto.xml?rev=1628541&r1=1628540&r2=1628541&view=diff
==
--- tomcat/trunk/webapps/docs/windows-auth-howto.xml (original)
+++ tomcat/trunk/webapps/docs/windows-auth-howto.xml Tue Sep 30 20:10:18 2014
@@ -172,9 +172,6 @@ com.sun.security.jgss.krb5.accept {
   the JVM being used. The name of the login configuration must match the
   value used by the authentication
   valve.
-  The system property javax.security.auth.useSubjectCredsOnly
-  is automatically set to the required value of false if a web application is
-  configured to use the SPNEGO authentication method.
   
   The SPNEGO authenticator will work with any 
   Realm but if used with the JNDI Realm, by default the JNDI Realm will use



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

svn commit: r1628538 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Sep 30 20:05:30 2014
New Revision: 1628538

URL: http://svn.apache.org/r1628538
Log:
Correct a couple of NPEs in the JNDI Realm that could be triggered with when 
not specifying a roleBase and enabling roleSearchAsUser.

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

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1628524

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1628538&r1=1628537&r2=1628538&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Sep 
30 20:05:30 2014
@@ -1297,6 +1297,13 @@ public class JNDIRealm extends RealmBase
 user = getUserBySearch(context, username, attrIds);
 }
 
+if (userPassword == null && credentials != null) {
+// The password is available. Insert it since it may be required 
for
+// role searches.
+return new User(user.getUserName(), user.getDN(), credentials,
+user.getRoles(), user.getUserRoleId());
+}
+
 return user;
 }
 
@@ -1725,6 +1732,8 @@ public class JNDIRealm extends RealmBase
 nameParts[i] = name.get(i);
 }
 base = roleBaseFormat.format(nameParts);
+} else {
+base = "";
 }
 
 // Perform the configured search and process the results

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=1628538&r1=1628537&r2=1628538&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 20:05:30 2014
@@ -63,6 +63,10 @@
 the JNDI Realm using delegated credentials with recent Oracle JREs.
 (markt)
   
+  
+Correct a couple of NPEs in the JNDI Realm that could be triggered with
+when not specifying a roleBase and enabling roleSearchAsUser. (markt)
+  
 
   
   



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

[Bug 57022] Tomcat Spnego authentication against Active Directory fails with Java 8

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #9 from Mark Thomas  ---
I'll update the 7.0.x docs to remove that comment.

-- 
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 57022] Tomcat Spnego authentication against Active Directory fails with Java 8

[bugzilla]

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

--- Comment #8 from Mark Thomas  ---
This has now been fixed in 7.0.x for 7.0.57 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: r1628534 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/SpnegoAuthenticator.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Sep 30 20:02:20 2014
New Revision: 1628534

URL: http://svn.apache.org/r1628534
Log:
Ensure SPNEGO authentication continues to work with the JNDI Realm using 
delegated credentials with recent Oracle JREs.

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1628517

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1628534&r1=1628533&r2=1628534&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
 Tue Sep 30 20:02:20 2014
@@ -19,6 +19,7 @@ package org.apache.catalina.authenticato
 import java.io.File;
 import java.io.IOException;
 import java.security.Principal;
+import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.regex.Pattern;
@@ -30,6 +31,7 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.catalina.Globals;
 import org.apache.catalina.LifecycleException;
+import org.apache.catalina.Realm;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.deploy.LoginConfig;
 import org.apache.catalina.startup.Bootstrap;
@@ -221,6 +223,9 @@ public class SpnegoAuthenticator extends
 HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 return false;
 }
+
+Subject subject = lc.getSubject();
+
 // Assume the GSSContext is stateless
 // TODO: Confirm this assumption
 final GSSManager manager = GSSManager.getInstance();
@@ -241,7 +246,7 @@ public class SpnegoAuthenticator extends
 GSSCredential.ACCEPT_ONLY);
 }
 };
-gssContext = manager.createContext(Subject.doAs(lc.getSubject(), 
action));
+gssContext = manager.createContext(Subject.doAs(subject, action));
 
 outToken = Subject.doAs(lc.getSubject(), new 
AcceptAction(gssContext, decoded));
 
@@ -256,8 +261,9 @@ public class SpnegoAuthenticator extends
 return false;
 }
 
-principal = context.getRealm().authenticate(gssContext,
-isStoreDelegatedCredential());
+principal = Subject.doAs(subject, new AuthenticateAction(
+context.getRealm(), gssContext, storeDelegatedCredential));
+
 } catch (GSSException e) {
 if (log.isDebugEnabled()) {
 
log.debug(sm.getString("spnegoAuthenticator.ticketValidateFail"), e);
@@ -339,4 +345,24 @@ public class SpnegoAuthenticator extends
 0, decoded.length);
 }
 }
+
+
+private static class AuthenticateAction implements 
PrivilegedAction {
+
+private final Realm realm;
+private final GSSContext gssContext;
+private final boolean storeDelegatedCredential;
+
+public AuthenticateAction(Realm realm, GSSContext gssContext,
+boolean storeDelegatedCredential) {
+this.realm = realm;
+this.gssContext = gssContext;
+this.storeDelegatedCredential = storeDelegatedCredential;
+}
+
+@Override
+public Principal run() {
+return realm.authenticate(gssContext, storeDelegatedCredential);
+}
+}
 }

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=1628534&r1=1628533&r2=1628534&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 20:02:20 2014
@@ -56,6 +56,15 @@
   issues to not "pop up" wrt. others).
 -->
 
+  
+
+  
+57022: Ensure SPNEGO authentication continues to work with
+the JNDI Realm using delegated credentials with recent Oracle JREs.
+(markt)
+  
+
+  
   
 
   



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

svn commit: r1628532 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java

[markt]

Author: markt
Date: Tue Sep 30 20:00:05 2014
New Revision: 1628532

URL: http://svn.apache.org/r1628532
Log:
Cosmetic changes only to align with trunk to aid trunk/7.0.x diffs

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1628532&r1=1628531&r2=1628532&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
 Tue Sep 30 20:00:05 2014
@@ -138,27 +138,31 @@ public class SpnegoAuthenticator extends
 Principal principal = request.getUserPrincipal();
 String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
 if (principal != null) {
-if (log.isDebugEnabled())
+if (log.isDebugEnabled()) {
 log.debug("Already authenticated '" + principal.getName() + 
"'");
+}
 // Associate the session with any existing SSO session
-if (ssoId != null)
+if (ssoId != null) {
 associate(ssoId, request.getSessionInternal(true));
+}
 return true;
 }
 
 // Is there an SSO session against which we can try to reauthenticate?
 if (ssoId != null) {
-if (log.isDebugEnabled())
+if (log.isDebugEnabled()) {
 log.debug("SSO Id " + ssoId + " set; attempting " +
   "reauthentication");
+}
 /* Try to reauthenticate using data cached by SSO.  If this fails,
either the original SSO logon was of DIGEST or SSL (which
we can't reauthenticate ourselves because there is no
cached username and password), or the realm denied
the user's reauthentication for some reason.
In either case we have to prompt the user for a logon */
-if (reauthenticateFromSSO(ssoId, request))
+if (reauthenticateFromSSO(ssoId, request)) {
 return true;
+}
 }
 
 MessageBytes authorization = 



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

[Bug 57022] Tomcat Spnego authentication against Active Directory fails with Java 8

[bugzilla]

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

--- Comment #7 from Detelin Yordanov  ---
Thanks Mark,
   The patch I tested with that proved to work was similar, I have not done any
tests with IBM JDK though. Should the following note in "Windows Auth How-to"
be removed then:

"The system property javax.security.auth.useSubjectCredsOnly is automatically
set to the required value of false if a web application is configured to use
the SPNEGO authentication method."

Detelin

-- 
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: r1628524 - in /tomcat/trunk: java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Sep 30 19:48:42 2014
New Revision: 1628524

URL: http://svn.apache.org/r1628524
Log:
Correct a couple of NPEs in the JNDI Realm that could be triggered with when 
not specifying a roleBase and enabling roleSearchAsUser.

Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1628524&r1=1628523&r2=1628524&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Sep 30 
19:48:42 2014
@@ -1280,6 +1280,13 @@ public class JNDIRealm extends RealmBase
 user = getUserBySearch(context, username, attrIds);
 }
 
+if (userPassword == null && credentials != null) {
+// The password is available. Insert it since it may be required 
for
+// role searches.
+return new User(user.getUserName(), user.getDN(), credentials,
+user.getRoles(), user.getUserRoleId());
+}
+
 return user;
 }
 
@@ -1708,6 +1715,8 @@ public class JNDIRealm extends RealmBase
 nameParts[i] = name.get(i);
 }
 base = roleBaseFormat.format(nameParts);
+} else {
+base = "";
 }
 
 // Perform the configured search and process the results

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1628524&r1=1628523&r2=1628524&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Sep 30 19:48:42 2014
@@ -90,6 +90,10 @@
 it in the web application class loader to set the correct code base for
 resources loaded from JARs and WARs. (markt)
   
+  
+Correct a couple of NPEs in the JNDI Realm that could be triggered with
+when not specifying a roleBase and enabling roleSearchAsUser. (markt)
+  
 
   
   



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

[Bug 57022] Tomcat Spnego authentication against Active Directory fails with Java 8

[bugzilla]

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

--- Comment #6 from Mark Thomas  ---
I've done a little svn archeology.

Originally, the SPNEGO authenticate did call Realm.authenticate using
Subject.doAs(). That was removed as it wasn't necessary early in the SPNEGO
development.

I have just restored this behaviour.

At one point Tomcat automatically set
javax.security.auth.useSubjectCredsOnly=false but this was removed to enable
SPNEGO to work with IBM JREs.

This fix has been made to 8.0.x and will be included in 8.0.15 onwards.

It still needs to be back-ported to 7.0.x

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

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

svn commit: r1628517 - in /tomcat/trunk: java/org/apache/catalina/authenticator/SpnegoAuthenticator.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Sep 30 19:15:33 2014
New Revision: 1628517

URL: http://svn.apache.org/r1628517
Log:
Ensure SPNEGO authentication continues to work with the JNDI Realm using 
delegated credentials with recent Oracle JREs.

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1628517&r1=1628516&r2=1628517&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java 
Tue Sep 30 19:15:33 2014
@@ -19,6 +19,7 @@ package org.apache.catalina.authenticato
 import java.io.File;
 import java.io.IOException;
 import java.security.Principal;
+import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.regex.Pattern;
@@ -30,6 +31,7 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.catalina.Globals;
 import org.apache.catalina.LifecycleException;
+import org.apache.catalina.Realm;
 import org.apache.catalina.connector.Request;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -213,6 +215,9 @@ public class SpnegoAuthenticator extends
 HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 return false;
 }
+
+Subject subject = lc.getSubject();
+
 // Assume the GSSContext is stateless
 // TODO: Confirm this assumption
 final GSSManager manager = GSSManager.getInstance();
@@ -233,7 +238,7 @@ public class SpnegoAuthenticator extends
 GSSCredential.ACCEPT_ONLY);
 }
 };
-gssContext = manager.createContext(Subject.doAs(lc.getSubject(), 
action));
+gssContext = manager.createContext(Subject.doAs(subject, action));
 
 outToken = Subject.doAs(lc.getSubject(), new 
AcceptAction(gssContext, decoded));
 
@@ -248,8 +253,9 @@ public class SpnegoAuthenticator extends
 return false;
 }
 
-principal = context.getRealm().authenticate(gssContext,
-isStoreDelegatedCredential());
+principal = Subject.doAs(subject, new AuthenticateAction(
+context.getRealm(), gssContext, storeDelegatedCredential));
+
 } catch (GSSException e) {
 if (log.isDebugEnabled()) {
 
log.debug(sm.getString("spnegoAuthenticator.ticketValidateFail"), e);
@@ -331,4 +337,24 @@ public class SpnegoAuthenticator extends
 0, decoded.length);
 }
 }
+
+
+private static class AuthenticateAction implements 
PrivilegedAction {
+
+private final Realm realm;
+private final GSSContext gssContext;
+private final boolean storeDelegatedCredential;
+
+public AuthenticateAction(Realm realm, GSSContext gssContext,
+boolean storeDelegatedCredential) {
+this.realm = realm;
+this.gssContext = gssContext;
+this.storeDelegatedCredential = storeDelegatedCredential;
+}
+
+@Override
+public Principal run() {
+return realm.authenticate(gssContext, storeDelegatedCredential);
+}
+}
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1628517&r1=1628516&r2=1628517&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Sep 30 19:15:33 2014
@@ -76,6 +76,11 @@
 name only cookies. (markt)
   
   
+57022: Ensure SPNEGO authentication continues to work with
+the JNDI Realm using delegated credentials with recent Oracle JREs.
+(markt)
+  
+  
 57027: Add additional validation for stored credentials used
 by Realms when the credential is stored using hex encoding. (markt)
   



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

Re: svn commit: r1628481 - /tomcat/tc6.0.x/trunk/build.properties.default

[Konstantin Kolinko]

2014-09-30 20:16 GMT+04:00  :
> Author: jfclere
> Date: Tue Sep 30 16:16:13 2014
> New Revision: 1628481
>
> URL: http://svn.apache.org/r1628481
> Log:
> Ready for 6.0.43 :D
>
> Modified:
> tomcat/tc6.0.x/trunk/build.properties.default
>
> Modified: tomcat/tc6.0.x/trunk/build.properties.default
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1628481&r1=1628480&r2=1628481&view=diff
> ==
> --- tomcat/tc6.0.x/trunk/build.properties.default (original)
> +++ tomcat/tc6.0.x/trunk/build.properties.default Tue Sep 30 16:16:13 2014
> @@ -25,9 +25,9 @@
>  # - Version Control Flags -
>  version.major=6
>  version.minor=0
> -version.build=42
> +version.build=43
>  version.patch=0
> -version.suffix=
> +version.suffix=-dev


This needs bump in res/maven/mvn.properties.default   as well.
http://svn.apache.org/r1594943

Best regards,
Konstantin Kolinko

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

Re: Time for 6.0.42

[jean-frederic clere]

On 09/30/2014 01:16 PM, jean-frederic clere wrote:

Hi,

I plan to tag a  6.0.42 later today, objections?


Status looks good now I will tag and process to the vote.

Cheers

Jean-Frederic

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

svn commit: r1628481 - /tomcat/tc6.0.x/trunk/build.properties.default

[jfclere]

Author: jfclere
Date: Tue Sep 30 16:16:13 2014
New Revision: 1628481

URL: http://svn.apache.org/r1628481
Log:
Ready for 6.0.43 :D

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1628481&r1=1628480&r2=1628481&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Sep 30 16:16:13 2014
@@ -25,9 +25,9 @@
 # - Version Control Flags -
 version.major=6
 version.minor=0
-version.build=42
+version.build=43
 version.patch=0
-version.suffix=
+version.suffix=-dev
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,



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

svn commit: r1628478 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_42/

[jfclere]

Author: jfclere
Date: Tue Sep 30 16:15:02 2014
New Revision: 1628478

URL: http://svn.apache.org/r1628478
Log:
Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 
6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 
6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 
6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 
6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 6.0.42Tag 
6.0.42Tag 6.0.42

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_42/   (props changed)
  - copied from r1628477, tomcat/tc6.0.x/trunk/

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_42/
--
--- svn:ignore (added)
+++ svn:ignore Tue Sep 30 16:15:02 2014
@@ -0,0 +1,5 @@
+.*
+output
+build.properties
+work
+logs

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_42/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Sep 30 16:15:02 2014
@@ -0,0 +1,2 @@
+/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1354866,1371298,1371302,1371620,1402110,1413553,1413557,1413563,1430083,1438415,1447013,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627469
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,948057,95
 
0164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865

svn commit: r1628475 - /tomcat/tc6.0.x/trunk/build.properties.default

[jfclere]

Author: jfclere
Date: Tue Sep 30 16:13:01 2014
New Revision: 1628475

URL: http://svn.apache.org/r1628475
Log:
ready for 6.0.42

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1628475&r1=1628474&r2=1628475&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Sep 30 16:13:01 2014
@@ -27,7 +27,7 @@ version.major=6
 version.minor=0
 version.build=42
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,



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

Re: digest.bat (RealmBase.main()) is broken in current Tomcat 8 trunk. Tomcat 8.0.14 is OK.

[Konstantin Kolinko]

2014-09-29 14:43 GMT+04:00 Mark Thomas :
> On 27/09/2014 15:52, Konstantin Kolinko wrote:
>> Hi!
>>
>> 1). If I run any of the following:
>> digest.bat -a foo
>> digest.bat -a md5 foo
>>
()

>> 4) The current javadoc for RealmBase.main() says that algorithm (-a)
>> is not required and "If not specified a default of SHA-512 will be
>> used."
>>
>> I wonder whether that is justified.
>
> That is what is currently implemented. Happy to discuss changes but
> SHA-512 doesn't seem unreasonable to me.


I think there is a contradiction between -a  and -h
 keys:
1)  If -h is used I think it shall default to whatever default
algorithm the credential handler implements.
2) Custom credential handler implementations may lack setAlgorithm() method.

I think that one of (-a, -h) is required, with no default for either.
The old code had no default for algorithm.

> String encoding = "UTF-8";

I think it shall use system encoding, because the value is passed on
the command line and is not read from file etc.

The old code used system encoding by default. The system encoding is
what the system uses, so it is reasonable.

Note the following text (I am linking to Tomcat 7 docs),
-> Realms and AAA -> Common Features -> Digested passwords

http://tomcat.apache.org/tomcat-7.0-doc/realm-howto.html#Digested_Passwords

[quote]
Non-ASCII usernames and/or passwords are supported using

CATALINA_HOME/bin/digest.[bat|sh] -a {algorithm} -e {encoding} {input}

but care is required to ensure that the non-ASCII input is correctly
passed to the digester. The digester returns {input}:{digest}. If the
input appears corrupted in the return, the digest will be invalid.
[/quote]

BTW,  That chapter in realm-howto in Tomcat 8 needs an update for the
new features of digest.sh / RealmBase.main().

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: r1628445 - /tomcat/trunk/res/tomcat.nsi

[kpreisser]

Author: kpreisser
Date: Tue Sep 30 14:09:12 2014
New Revision: 1628445

URL: http://svn.apache.org/r1628445
Log:
Tomcat 8 needs Java 7 or later.

Modified:
tomcat/trunk/res/tomcat.nsi

Modified: tomcat/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1628445&r1=1628444&r2=1628445&view=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Tue Sep 30 14:09:12 2014
@@ -103,7 +103,7 @@ Var ServiceInstallLog
   LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
   LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
 
-  LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java 
SE 6.0 or later JRE installed on your system."
+  LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java 
SE 7.0 or later JRE installed on your system."
   LangString TEXT_CONF_LABEL_PORT_SHUTDOWN ${LANG_ENGLISH} "Server Shutdown 
Port"
   LangString TEXT_CONF_LABEL_PORT_HTTP ${LANG_ENGLISH} "HTTP/1.1 Connector 
Port"
   LangString TEXT_CONF_LABEL_PORT_AJP ${LANG_ENGLISH} "AJP/1.3 Connector Port"



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

svn commit: r1628435 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt bin/setclasspath.bat bin/setclasspath.sh webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Sep 30 13:23:25 2014
New Revision: 1628435

URL: http://svn.apache.org/r1628435
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56829
Add the ability for users to define their own values for _RUNJAVA and _RUNJDB.
Based on a patch by Neeme Praks.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/setclasspath.bat
tomcat/tc6.0.x/trunk/bin/setclasspath.sh
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
  Merged /tomcat/trunk:r1617362,1617365,1617383
  Merged /tomcat/tc7.0.x/trunk:r1617364,1617374,1617433,1617457

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628435&r1=1628434&r2=1628435&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 13:23:25 2014
@@ -57,16 +57,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56829
-  Add the ability for users to define their own values for _RUNJAVA and 
_RUNJDB.
-  Based on a patch by Neeme Praks.
-  http://svn.apache.org/r1617364 (the actual fix)
-  http://svn.apache.org/r1617374 (fix typo in changelog)
-  http://svn.apache.org/r1617433 (copy/paste error)
-  http://svn.apache.org/r1617457 (comments)
-  +1: markt, kkolinko, remm
-  -1:
-
 * Be more strict with executable filename on Windows (s/java/java.exe/).
   http://svn.apache.org/r1617458
   +1: kkolinko, remm, markt

Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?rev=1628435&r1=1628434&r2=1628435&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Tue Sep 30 13:23:25 2014
@@ -65,11 +65,18 @@ rem Set the default -Djava.endorsed.dirs
 set "JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed"
 :gotEndorseddir
 
+rem Don't override _RUNJAVA if the user has set it previously
+if not "%_RUNJAVA%" == "" goto gotRunJava
 rem Set standard command for invoking Java.
-rem Note that NT requires a window name argument when using start.
-rem Also note the quoting as JAVA_HOME may contain spaces.
+rem Also note the quoting as JRE_HOME may contain spaces.
 set _RUNJAVA="%JRE_HOME%\bin\java"
+:gotRunJava
+
+rem Don't override _RUNJDB if the user has set it previously
+rem Also note the quoting as JAVA_HOME may contain spaces.
+if not "%_RUNJDB%" == "" goto gotRunJdb
 set _RUNJDB="%JAVA_HOME%\bin\jdb"
+:gotRunJdb
 
 goto end
 

Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.sh
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.sh?rev=1628435&r1=1628434&r2=1628435&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/setclasspath.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/setclasspath.sh Tue Sep 30 13:23:25 2014
@@ -110,8 +110,12 @@ if [ `uname -s` = "Darwin" ]; then
   fi
 fi
 
-# Set standard commands for invoking Java.
-_RUNJAVA="$JRE_HOME"/bin/java
-if [ "$os400" != "true" ]; then
-  _RUNJDB="$JAVA_HOME"/bin/jdb
+# Set standard commands for invoking Java, if not already set.
+if [ -z "$_RUNJAVA" ]; then
+  _RUNJAVA="$JRE_HOME"/bin/java
 fi
+if [ "$os400" != "true" ]; then
+  if [ -z "$_RUNJDB" ]; then
+_RUNJDB="$JAVA_HOME"/bin/jdb
+  fi
+fi
\ No newline at end of file

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=1628435&r1=1628434&r2=1628435&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 13:23:25 2014
@@ -106,6 +106,11 @@
   56606: When creating tomcat-users.xml in the
   Windows Installer, use the new attribute name for the name of the user.
   (markt)
+  
+56829: Add the ability for users to define their own values
+for _RUNJAVA and _RUNJDB. Based on a patch by
+Neeme Praks. (markt)
+  
 
   
 



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

[Bug 56829] do not override _RUNJAVA and _RUNJDB environment variables if already defined

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
This has been fixed in 6.0.x for 6.0.42 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: r1628437 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt bin/setclasspath.bat webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Sep 30 13:26:10 2014
New Revision: 1628437

URL: http://svn.apache.org/r1628437
Log:
Be more strict with executable filename on Windows (s/java/java.exe/).

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/setclasspath.bat
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
  Merged /tomcat/trunk:r1617456
  Merged /tomcat/tc7.0.x/trunk:r1617458

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628437&r1=1628436&r2=1628437&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 13:26:10 2014
@@ -57,11 +57,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko
   -1:
 
-* Be more strict with executable filename on Windows (s/java/java.exe/).
-  http://svn.apache.org/r1617458
-  +1: kkolinko, remm, markt
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43001
   Enable the JspC Ant task to set the JspC option mappedFile.
 

Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?rev=1628437&r1=1628436&r2=1628437&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Tue Sep 30 13:26:10 2014
@@ -69,13 +69,13 @@ rem Don't override _RUNJAVA if the user 
 if not "%_RUNJAVA%" == "" goto gotRunJava
 rem Set standard command for invoking Java.
 rem Also note the quoting as JRE_HOME may contain spaces.
-set _RUNJAVA="%JRE_HOME%\bin\java"
+set _RUNJAVA="%JRE_HOME%\bin\java.exe"
 :gotRunJava
 
 rem Don't override _RUNJDB if the user has set it previously
 rem Also note the quoting as JAVA_HOME may contain spaces.
 if not "%_RUNJDB%" == "" goto gotRunJdb
-set _RUNJDB="%JAVA_HOME%\bin\jdb"
+set _RUNJDB="%JAVA_HOME%\bin\jdb.exe"
 :gotRunJdb
 
 goto end

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=1628437&r1=1628436&r2=1628437&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 13:26:10 2014
@@ -110,8 +110,9 @@
   
   
 56829: Add the ability for users to define their own values
-for _RUNJAVA and _RUNJDB. Based on a patch by
-Neeme Praks. (markt)
+for _RUNJAVA and _RUNJDB environment
+variables. Be more strict with executable filename on Windows
+(s/java/java.exe/). Based on a patch by Neeme Praks. (markt/kkolinko)
   
 
   



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

svn commit: r1628442 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/JDTCompiler.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Sep 30 13:31:45 2014
New Revision: 1628442

URL: http://svn.apache.org/r1628442
Log:
Fix a potential resource leak in JDTCompiler when checking whether a resource 
is a package. Reported by Coverity Scan.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
  Merged /tomcat/trunk:r1626579
  Merged /tomcat/tc7.0.x/trunk:r1626579,1627469

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628442&r1=1628441&r2=1628442&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 13:31:45 2014
@@ -92,15 +92,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* Fix a potential resource leak in JDTCompiler when checking wether
-  a resource is a package. Reported by Coverity Scan.
-
-  Motivation: An obvious issue that is easy to fix.
-
-  http://svn.apache.org/r1627469
-  +1: kkolinko, remm, markt
-  -1:
-
 * For https://issues.apache.org/bugzilla/show_bug.cgi?id=56079
   Switch to the signed versions of Apache Commons Daemon 1.0.15 binaries.
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1628442&r1=1628441&r2=1628442&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Tue 
Sep 30 13:31:45 2014
@@ -234,9 +234,18 @@ public class JDTCompiler extends org.apa
 return false;
 }
 String resourceName = result.replace('.', '/') + ".class";
-InputStream is = 
-classLoader.getResourceAsStream(resourceName);
-return is == null;
+InputStream is = null;
+try {
+is = classLoader.getResourceAsStream(resourceName);
+return is == null;
+} finally {
+if (is != null) {
+try {
+is.close();
+} catch (IOException e) {
+}
+}
+}
 }
 
 public boolean isPackage(char[][] parentPackageName, 

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=1628442&r1=1628441&r2=1628442&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 13:31:45 2014
@@ -103,6 +103,10 @@
 if { ... } for alternative branches in the JSP parser.
 (kkolinko)
   
+  
+Fix a potential resource leak in JDTCompiler when checking wether
+a resource is a package. Reported by Coverity Scan. (fschumacher)
+  
 
   
   



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

[Bug 43001] JspC lacks setMappedFile and setDie for use in Ant task

[bugzilla]

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

--- Comment #3 from Mark Thomas  ---
This has been fixed in 6.0.x and will be included in 6.0.42 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: r1628440 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/JspC.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Sep 30 13:28:33 2014
New Revision: 1628440

URL: http://svn.apache.org/r1628440
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43001
Enable the JspC Ant task to set the JspC option mappedFile.

Motivation: A really simple fix. The mappedFile option has different default 
(false) in JspC vs. EmbeddedServletOptions, and there was no way to configure 
it in an Ant task.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
  Merged /tomcat/trunk:r1623392,1624247
  Merged /tomcat/tc7.0.x/trunk:r1624249

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628440&r1=1628439&r2=1628440&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 13:28:33 2014
@@ -57,17 +57,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43001
-  Enable the JspC Ant task to set the JspC option mappedFile.
-
-  Motivation: A really simple fix. The mappedFile option has different
-  default (false) in JspC vs. EmbeddedServletOptions, and there was no way
-  to configure it in an Ant task.
-
-  http://svn.apache.org/r1624249
-  +1: kkolinko, remm, markt
-  -1:
-
 * Update documented minimum Ant version to use at build time to be 1.8.0
 
   Motivation: Align documentation with code.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1628440&r1=1628439&r2=1628440&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java Tue Sep 30 13:28:33 
2014
@@ -477,6 +477,10 @@ public class JspC extends Task implement
 return mappedFile;
 }
 
+public void setMappedFile(boolean b) {
+mappedFile = b;
+}
+
 /**
  * @deprecated Removed in Tomcat 7
  */

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=1628440&r1=1628439&r2=1628440&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 13:28:33 2014
@@ -78,6 +78,10 @@
   
 
   
+43001: Enable the JspC Ant task to set the JspC option
+mappedFile. (kkolinko)
+  
+  
 56334: Fix a regression in EL parsing when quoted string
 follows a whitespace. (markt)
   



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

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

[markt]

Author: markt
Date: Tue Sep 30 13:23:53 2014
New Revision: 1628436

URL: http://svn.apache.org/r1628436
Log:
Correct 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=1628436&r1=1628435&r2=1628436&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 13:23:53 2014
@@ -103,9 +103,11 @@
   
   
 
-  56606: When creating tomcat-users.xml in the
-  Windows Installer, use the new attribute name for the name of the user.
-  (markt)
+  
+56606: When creating tomcat-users.xml in the
+Windows Installer, use the new attribute name for the name of the user.
+(markt)
+  
   
 56829: Add the ability for users to define their own values
 for _RUNJAVA and _RUNJDB. Based on a patch by



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

[Bug 56334] Double Backslash Escaping in Attributes

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #22 from Mark Thomas  ---
This has been fixed in 6.0.x for 6.0.42 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: r1628430 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/ELParser.java test/org/apache/jasper/compiler/TestELParser.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Sep 30 13:13:30 2014
New Revision: 1628430

URL: http://svn.apache.org/r1628430
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334#c15
Fix a regression in EL parsing when quoted string follows a whitespace.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628430&r1=1628429&r2=1628430&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 13:13:30 2014
@@ -28,12 +28,6 @@ None
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334#c15
-  Fix a regression in EL parsing when quoted string follows a whitespace.
-  
http://people.apache.org/~markt/patches/2014-06-18-bug56334%23c15-tc6-v1.patch
-  +1: markt, kkolinko, remm
-  -1:
-
 * Assert that MappingData object is empty before performing mapping work.
   It is backport of r1604663
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1628430&r1=1628429&r2=1628430&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java Tue Sep 
30 13:13:30 2014
@@ -291,30 +291,34 @@ public class ELParser {
 int len = input.length();
 char quote = 0;
 int lastAppend = 0;
-
-if (len > 1) {
+int start = 0;
+int end = len;
+
+// Look to see if the value is quoted
+String trimmed = input.trim();
+int trimmedLen = trimmed.length();
+if (trimmedLen > 1) {
 // Might be quoted
-quote = input.charAt(0);
+quote = trimmed.charAt(0);
 if (quote == '\'' || quote == '\"') {
-if (input.charAt(len - 1) != quote) {
+if (trimmed.charAt(trimmedLen - 1) != quote) {
 throw new IllegalArgumentException(Localizer.getMessage(
 
"org.apache.jasper.compiler.ELParser.invalidQuotesForStringLiteral",
 input));
 }
-lastAppend = 1;
-len--;
+start = input.indexOf(quote) + 1;
+end = start + trimmedLen - 2;
 } else {
 quote = 0;
 }
 }
 
 StringBuilder output = null;
-for (int i = lastAppend; i < len; i++) {
+for (int i = start; i < end; i++) {
 char ch = input.charAt(i);
 if (ch == '\\' || ch == quote) {
 if (output == null) {
 output = new StringBuilder(len + 20);
-output.append(quote);
 }
 output.append(input.substring(lastAppend, i));
 lastAppend = i + 1;
@@ -326,9 +330,6 @@ public class ELParser {
 return input;
 } else {
 output.append(input.substring(lastAppend, len));
-if (quote != 0) {
-output.append(quote);
-}
 return output.toString();
 }
 }

Modified: tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.java?rev=1628430&r1=1628429&r2=1628430&view=diff
==
--- tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.java 
(original)
+++ tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.java Tue 
Sep 30 13:13:30 2014
@@ -92,6 +92,12 @@ public class TestELParser {
 
 
 @Test
+public void testFunction05() throws JasperException {
+doTestParser("${do:it(x, 'y',z)}", null);
+}
+
+
+@Test
 public void testCompound01() throws JasperException {
 doTestParser("1${'foo'}1", "1foo1");
 }

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=1628430&r1=1628429&r2=1628430&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 13:13:30 2014
@@ -78,6 +78,10 @@
   
 
   
+56334: Fix a regression in EL parsi

[Bug 56606] Tomcat Installer: old attribute generated in tomcat-users.xml instead of the new one

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #4 from Mark Thomas  ---
This has been fixed in 6.0.x for 6.0.42 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: r1628428 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/tomcat.nsi webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Sep 30 13:10:02 2014
New Revision: 1628428

URL: http://svn.apache.org/r1628428
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56606
User new attribute name for username

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628428&r1=1628427&r2=1628428&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 13:10:02 2014
@@ -28,12 +28,6 @@ None
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56606
-  User new attribute name for username
-  http://people.apache.org/~markt/patches/2014-06-10-user-username-tc6-v1.patch
-  +1: markt, kkolinko, remm
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334#c15
   Fix a regression in EL parsing when quoted string follows a whitespace.
   
http://people.apache.org/~markt/patches/2014-06-18-bug56334%23c15-tc6-v1.patch

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=1628428&r1=1628427&r2=1628428&view=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Tue Sep 30 13:10:02 2014
@@ -936,7 +936,7 @@ Function configure
 Push $TomcatAdminRoles
 Call xmlEscape
 Pop $R3
-StrCpy $R5 '$\r$\n'
+StrCpy $R5 '$\r$\n'
 DetailPrint 'Admin user added: "$TomcatAdminUsername"'
   ${EndIf}
 

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=1628428&r1=1628427&r2=1628428&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 13:10:02 2014
@@ -97,6 +97,13 @@
   
 
   
+  
+
+  56606: When creating tomcat-users.xml in the
+  Windows Installer, use the new attribute name for the name of the user.
+  (markt)
+
+  
 
 
   



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

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

[markt]

Author: markt
Date: Tue Sep 30 13:02:05 2014
New Revision: 1628426

URL: http://svn.apache.org/r1628426
Log:
Votes

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628426&r1=1628425&r2=1628426&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 13:02:05 2014
@@ -81,7 +81,7 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Be more strict with executable filename on Windows (s/java/java.exe/).
   http://svn.apache.org/r1617458
-  +1: kkolinko, remm
+  +1: kkolinko, remm, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43001
@@ -92,7 +92,7 @@ PATCHES PROPOSED TO BACKPORT:
   to configure it in an Ant task.
 
   http://svn.apache.org/r1624249
-  +1: kkolinko, remm
+  +1: kkolinko, remm, markt
   -1:
 
 * Update documented minimum Ant version to use at build time to be 1.8.0
@@ -114,7 +114,7 @@ PATCHES PROPOSED TO BACKPORT:
   - Builds successfully with Ant 1.8.0.
 
   https://people.apache.org/~kkolinko/patches/2014-09-22_tc6_Ant180.patch
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56988
@@ -127,7 +127,7 @@ PATCHES PROPOSED TO BACKPORT:
   may run in different environments, e.g. Buildbot.
 
   https://issues.apache.org/bugzilla/attachment.cgi?id=32041
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix a potential resource leak in JDTCompiler when checking wether
@@ -136,7 +136,7 @@ PATCHES PROPOSED TO BACKPORT:
   Motivation: An obvious issue that is easy to fix.
 
   http://svn.apache.org/r1627469
-  +1: kkolinko, remm
+  +1: kkolinko, remm, markt
   -1:
 
 * For https://issues.apache.org/bugzilla/show_bug.cgi?id=56079
@@ -146,7 +146,7 @@ PATCHES PROPOSED TO BACKPORT:
   them. I do not envision any drawbacks.
 
   http://svn.apache.org/r1627420
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 



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

Re: svn commit: r1628197 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/loader/ java/org/apache/catalina/webresources/ webapps/docs/

[Mark Thomas]

On 30/09/2014 13:34, Konstantin Kolinko wrote:
> 2014-09-29 18:42 GMT+04:00  :
>> Author: markt
>> Date: Mon Sep 29 14:42:11 2014
>> New Revision: 1628197



> 1. On the previous line it is "jar:war:" with a trailing ":",  so I
> guess it had to be s/"jar"/"jar:"/ here.



> 2. s/Cose/Code/

Both fixed. Thanks.

Mark

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

svn commit: r1628424 - in /tomcat/trunk: java/org/apache/catalina/webresources/JarWarResource.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Sep 30 12:52:34 2014
New Revision: 1628424

URL: http://svn.apache.org/r1628424
Log:
Review of r1628197 by kkolinko.

Modified:
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java?rev=1628424&r1=1628423&r2=1628424&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java Tue 
Sep 30 12:52:34 2014
@@ -41,7 +41,7 @@ public class JarWarResource extends Abst
 String baseUrl, JarEntry jarEntry, String archivePath,
 String internalPath, Manifest manifest) {
 super(root, webAppPath, base, "jar:war:" + baseUrl + "^/" + 
archivePath,
-jarEntry, internalPath, manifest, "jar" + baseUrl + "!/" + 
archivePath);
+jarEntry, internalPath, manifest, "jar:" + baseUrl + "!/" + 
archivePath);
 this.archivePath = archivePath;
 }
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1628424&r1=1628423&r2=1628424&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Sep 30 12:52:34 2014
@@ -80,7 +80,7 @@
 by Realms when the credential is stored using hex encoding. (markt)
   
   
-57038: Add a WebResource.getCoseBase() method,
+57038: Add a WebResource.getCodeBase() method,
 implement for all WebResource implementations and then use
 it in the web application class loader to set the correct code base for
 resources loaded from JARs and WARs. (markt)



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

[Bug 57022] Tomcat Spnego authentication against Active Directory fails with Java 8

[bugzilla]

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

--- Comment #5 from Mark Thomas  ---
A short update.

I can reproduce this with Tomcat 8 and both the latest Java 7 and Java 8
releases.

I have a patch that fixes this but it currently depends on an internal Sun API.
I am looking at ways to work around that.

-- 
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: r1628197 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/loader/ java/org/apache/catalina/webresources/ webapps/docs/

[Konstantin Kolinko]

2014-09-29 18:42 GMT+04:00  :
> Author: markt
> Date: Mon Sep 29 14:42:11 2014
> New Revision: 1628197
>
> URL: http://svn.apache.org/r1628197
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57038
> Add a WebResource.getCoseBase() method, implement for all WebResource 
> implementations and then use it in the web application class loader to set 
> the correct code base for  resources loaded from JARs and WARs.
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/WebResource.java
> tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
> 
> tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
> tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
> tomcat/trunk/java/org/apache/catalina/webresources/EmptyResource.java
> tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
> tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
> tomcat/trunk/java/org/apache/catalina/webresources/JarResourceRoot.java
> tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
> tomcat/trunk/webapps/docs/changelog.xml



> Modified: 
> tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java?rev=1628197&r1=1628196&r2=1628197&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java 
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java 
> Mon Sep 29 14:42:11 2014
> @@ -41,7 +41,7 @@ public class JarWarResource extends Abst
>  String baseUrl, JarEntry jarEntry, String archivePath,
>  String internalPath, Manifest manifest) {
>  super(root, webAppPath, base, "jar:war:" + baseUrl + "^/" + 
> archivePath,
> -jarEntry, internalPath, manifest);
> +jarEntry, internalPath, manifest, "jar" + baseUrl + "!/" + 
> archivePath);


1. On the previous line it is "jar:war:" with a trailing ":",  so I
guess it had to be s/"jar"/"jar:"/ here.

>  this.archivePath = archivePath;
>  }
>
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1628197&r1=1628196&r2=1628197&view=diff
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 29 14:42:11 2014
> @@ -75,6 +75,12 @@
>  to allow equals characters in cookie values but is configured to 
> allow
>  name only cookies. (markt)
>
> +  
> +57038: Add a WebResource.getCoseBase() 
> method,

2. s/Cose/Code/


> +implement for all WebResource implementations and then 
> use
> +it in the web application class loader to set the correct code base 
> for
> +resources loaded from JARs and WARs. (markt)
> +  



Best regards,
Konstantin Kolinko

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

Re: svn commit: r1628366 - in /tomcat/trunk: java/org/apache/tomcat/util/http/CookieSupport.java java/org/apache/tomcat/util/http/LegacyCookieProcessor.java test/org/apache/tomcat/util/http/TestCookie

[Konstantin Kolinko]

2014-09-30 11:41 GMT+04:00  :
> Author: markt
> Date: Tue Sep 30 07:41:57 2014
> New Revision: 1628366
>
> URL: http://svn.apache.org/r1628366
> Log:
> Make FWD_SLASH_IS_SEPARATOR configurable per context
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
> tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
> tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java
> tomcat/trunk/webapps/docs/config/cookie-processor.xml


> Modified: tomcat/trunk/webapps/docs/config/cookie-processor.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cookie-processor.xml?rev=1628366&r1=1628365&r2=1628366&view=diff
> ==
> --- tomcat/trunk/webapps/docs/config/cookie-processor.xml (original)
> +++ tomcat/trunk/webapps/docs/config/cookie-processor.xml Tue Sep 30 07:41:57 
> 2014
> @@ -147,6 +147,17 @@
>  system property.
>
>
> +  
> +If this is true Tomcat will treat the forward slash
> +character ('/') as an HTTP separator when processing 
> cookie
> +headers. If 
> org.apache.catalina.STRICT_SERVLET_COMPLIANCE
> +is set to true, the default of this setting will be
> +true, else the default value will be false.
> +This default may be overridden by setting the
> +
> org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR
> +system property.
> +  

Maybe there is a way to rephrase the above description.

I think that for a casual reader "will treat the forward slash .. as
an HTTP separator"  does not say much useful. I mean, what "treats as
HTTP separator" means here?

There is another attribute, "allowHttpSepsInV0" that says more on this
issue. Maybe at least add a reference to that attribute.


Best regards,
Konstantin Kolinko




> +
>
>  If this is true Tomcat will ensure that cookie
>  processing does not modify cookie header returned by
> @@ -179,7 +190,8 @@
>  cookie parser. In particular:
>
>  
> -  The '=' is always permitted in a cookie value.
> +  The '=' and '/' characters are always
> +  permitted in a cookie value.
>Name only cookies are always permitted.
>The cookie header is always preserved.
>  
>

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

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/497

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1628365
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot




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

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

[remm]

Author: remm
Date: Tue Sep 30 11:21:37 2014
New Revision: 1628397

URL: http://svn.apache.org/r1628397
Log:
Votes

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628397&r1=1628396&r2=1628397&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 11:21:37 2014
@@ -31,13 +31,13 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56606
   User new attribute name for username
   http://people.apache.org/~markt/patches/2014-06-10-user-username-tc6-v1.patch
-  +1: markt, kkolinko
+  +1: markt, kkolinko, remm
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334#c15
   Fix a regression in EL parsing when quoted string follows a whitespace.
   
http://people.apache.org/~markt/patches/2014-06-18-bug56334%23c15-tc6-v1.patch
-  +1: markt, kkolinko
+  +1: markt, kkolinko, remm
   -1:
 
 * Assert that MappingData object is empty before performing mapping work.
@@ -76,12 +76,12 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/r1617374 (fix typo in changelog)
   http://svn.apache.org/r1617433 (copy/paste error)
   http://svn.apache.org/r1617457 (comments)
-  +1: markt, kkolinko
+  +1: markt, kkolinko, remm
   -1:
 
 * Be more strict with executable filename on Windows (s/java/java.exe/).
   http://svn.apache.org/r1617458
-  +1: kkolinko
+  +1: kkolinko, remm
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43001
@@ -92,7 +92,7 @@ PATCHES PROPOSED TO BACKPORT:
   to configure it in an Ant task.
 
   http://svn.apache.org/r1624249
-  +1: kkolinko
+  +1: kkolinko, remm
   -1:
 
 * Update documented minimum Ant version to use at build time to be 1.8.0
@@ -136,7 +136,7 @@ PATCHES PROPOSED TO BACKPORT:
   Motivation: An obvious issue that is easy to fix.
 
   http://svn.apache.org/r1627469
-  +1: kkolinko
+  +1: kkolinko, remm
   -1:
 
 * For https://issues.apache.org/bugzilla/show_bug.cgi?id=56079



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

Time for 6.0.42

[jean-frederic clere]

Hi,

I plan to tag a  6.0.42 later today, objections?

Cheers

Jean-Frederic

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

R: Session lost in Tomcat 5.5.36

[Diego Ruotolo]

Thanks Konstantin,

I will unsubscribe from this list and try to post this question to user's
list.

Best regards,

Diego


> -Messaggio originale-
> Da: Konstantin Kolinko [mailto:knst.koli...@gmail.com]
> Inviato: martedì 30 settembre 2014 12:46
> A: Tomcat Developers List
> Oggetto: Re: Session lost in Tomcat 5.5.36
>
> 2014-09-30 14:06 GMT+04:00 Diego Ruotolo :
> > Hi everybody,
> >
> >
> >
> > Working on my company webapp I notice the following problem:
> sometimes
> > the jsession cookie is lost, and therefore my whole http session is
> > lost.
> >
> >
> >
> > The context is:
> >
> > - Tomcat v. 5.5.36
> >
> >- JDK 1.5.0
> >
> > - O.S. Windows
> >
> > - Client: Internet Explorer 8
> >
> >
> >
> > Here is my use case:
> >
> > -  I made a POST request to a servlet of my webapp
> >
> > -  While processing this request, I create a new http session
> >
> > -  Processing of the request will process a velocity template as
> > last step
> >
> > -  This velocity template contains 3 calls to 3 different
> > servlets
> > of my webapp, these 3 calls are made through an HTTP GET
> >
> > -  While processing one of these 3 requests, Tomcat does not
> > append
> > jsessionid parameter to the requested URL: I have debugged Tomcat
> > classes therefore I am sure of this
> >
> >
> >
> > This problem does not occur always, but just sometimes. While
> > debugging Tomcat classes, I noticed that Tomcat starts 3 threads to
> > manage the 3 GET requests of the velocity template, so maybe it is a
> concurrency problem.
> >
> > Finally, I noticed that this problem does not happen if I set the
> > Windows registry key HKCU\Software\Microsoft\Internet Explorer\Main –
> > TabProcGrowth to 0 or 1, which forces Internet Explorer to use one
> > process for all tabs, not one process for single tab (which is the
> > default).
> >
> >
> >
> > Do I miss some configuration settings? Do I have to set some
> > particular parameter / cookie in the first response (or in the velocity
> template) ?
> >
> > If you need more details please tell me.
> >
> >
> >
> > I have sent this question to the dev list since I don’t know if this
> > is a Tomcat bug, but if you tell me this is the wrong list I will
> > unsubscribe and post this question to the user list.
> >
>
> 1. Such questions shall be asked on the users' list. (Support is provided
> not
> exclusively by Tomcat devs but mainly by your fellow users. The users list
> has
> more subscribers than dev one).
>
> 2. Beware that Tomcat 5.5 has reached it end of life and is no longer
> supported.
> http://tomcat.apache.org/tomcat-55-eol.html
>
> Best regards,
> Konstantin Kolinko
>
> -
> 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

Re: Session lost in Tomcat 5.5.36

[Konstantin Kolinko]

2014-09-30 14:06 GMT+04:00 Diego Ruotolo :
> Hi everybody,
>
>
>
> Working on my company webapp I notice the following problem: sometimes the
> jsession cookie is lost, and therefore my whole http session is lost.
>
>
>
> The context is:
>
> - Tomcat v. 5.5.36
>
>- JDK 1.5.0
>
> - O.S. Windows
>
> - Client: Internet Explorer 8
>
>
>
> Here is my use case:
>
> -  I made a POST request to a servlet of my webapp
>
> -  While processing this request, I create a new http session
>
> -  Processing of the request will process a velocity template as
> last step
>
> -  This velocity template contains 3 calls to 3 different servlets
> of my webapp, these 3 calls are made through an HTTP GET
>
> -  While processing one of these 3 requests, Tomcat does not append
> jsessionid parameter to the requested URL: I have debugged Tomcat classes
> therefore I am sure of this
>
>
>
> This problem does not occur always, but just sometimes. While debugging
> Tomcat classes, I noticed that Tomcat starts 3 threads to manage the 3 GET
> requests of the velocity template, so maybe it is a concurrency problem.
>
> Finally, I noticed that this problem does not happen if I set the Windows
> registry key HKCU\Software\Microsoft\Internet Explorer\Main – TabProcGrowth
> to 0 or 1, which forces Internet Explorer to use one process for all tabs,
> not one process for single tab (which is the default).
>
>
>
> Do I miss some configuration settings? Do I have to set some particular
> parameter / cookie in the first response (or in the velocity template) ?
>
> If you need more details please tell me.
>
>
>
> I have sent this question to the dev list since I don’t know if this is a
> Tomcat bug, but if you tell me this is the wrong list I will unsubscribe
> and post this question to the user list.
>

1. Such questions shall be asked on the users' list. (Support is
provided not exclusively by Tomcat devs but mainly by your fellow
users. The users list has more subscribers than dev one).

2. Beware that Tomcat 5.5 has reached it end of life and is no longer supported.
http://tomcat.apache.org/tomcat-55-eol.html

Best regards,
Konstantin Kolinko

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

Session lost in Tomcat 5.5.36

[Diego Ruotolo]

Hi everybody,



Working on my company webapp I notice the following problem: sometimes the
jsession cookie is lost, and therefore my whole http session is lost.



The context is:

- Tomcat v. 5.5.36

   - JDK 1.5.0

- O.S. Windows

- Client: Internet Explorer 8



Here is my use case:

-  I made a POST request to a servlet of my webapp

-  While processing this request, I create a new http session

-  Processing of the request will process a velocity template as
last step

-  This velocity template contains 3 calls to 3 different servlets
of my webapp, these 3 calls are made through an HTTP GET

-  While processing one of these 3 requests, Tomcat does not append
jsessionid parameter to the requested URL: I have debugged Tomcat classes
therefore I am sure of this



This problem does not occur always, but just sometimes. While debugging
Tomcat classes, I noticed that Tomcat starts 3 threads to manage the 3 GET
requests of the velocity template, so maybe it is a concurrency problem.

Finally, I noticed that this problem does not happen if I set the Windows
registry key HKCU\Software\Microsoft\Internet Explorer\Main – TabProcGrowth
to 0 or 1, which forces Internet Explorer to use one process for all tabs,
not one process for single tab (which is the default).



Do I miss some configuration settings? Do I have to set some particular
parameter / cookie in the first response (or in the velocity template) ?

If you need more details please tell me.



I have sent this question to the dev list since I don’t know if this is a
Tomcat bug, but if you tell me this is the wrong list I will unsubscribe
and post this question to the user list.



Thanks in advice,



Kind regards



Diego

[Bug 56871] Apparent corruption of Servlet InputStreams

[bugzilla]

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

--- Comment #12 from Ciaran  ---
I appreciate the effort, thank you.  I wish I could preserve my physical
environment in some manner to isolate this further, but my testing in
virtualised environments has had the same results as you :/

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

Early Access builds for JDK 9 b32 and JDK 8u40 b07 are available on java.net

[Rory O'Donnell Oracle, Dublin Ireland]

Hi Mladen/Mark,

Early Access build for JDK 9 b32   is 
available on java.net, summary of changes are listed here 



Early Access build for JDK 8u40 b07  
is available on java.net, summary of changes are listed here. 



Rgds,Rory

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

[Bug 56989] Classes being loaded from wrong web app.

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #6 from Mark Thomas  ---
A week has passed since my last comment with no response.

Since no further information has been provided, this issue is being closed as
invalid on the basis that the most likely cause is duplicate classes present
int he class loader hierarchy.

If you are able to repeat this issue on a clean install of the latest stable
Tomcat 7 (or later) release then feel free to re-open this issue and provide
the steps to reproduce 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

[Bug 56871] Apparent corruption of Servlet InputStreams

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #11 from Mark Thomas  ---
After multiple extended tests (~60 mins) on multiple platforms both physical
and virtual no Tomcat committer has been able to repeat this issue. I am
therefore closing this as WORKSFORME.

If you are able to repeat this issue, please feel free to re-open and provide
the necessary steps to repeat this from a clean install of the the latest
stable Tomcat 7 (or later) release.

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

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

[jira] [Updated] (MTOMCAT-283) Tomcat7Runner does not use tomcat-users.xml when used without a server.xml

[Pasi Niemi (JIRA)]

 [ 
https://issues.apache.org/jira/browse/MTOMCAT-283?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Pasi Niemi updated MTOMCAT-283:
---
Attachment: tomcat-maven-plugin-use-tomcat-users-xml-in-war-exec.diff

Patch to add:

1) tomcatUsers File property and handling in AbstractExecWarMojo
2) tomcatUsersPath option for Tomcat7RunnerCli
3) tomcat-users.xml handling for Tomcat7Runner

> Tomcat7Runner does not use tomcat-users.xml when used without a server.xml
> --
>
> Key: MTOMCAT-283
> URL: https://issues.apache.org/jira/browse/MTOMCAT-283
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.2
> Environment: any
>Reporter: Pasi Niemi
>Assignee: Olivier Lamy (*$^¨%`£)
> Attachments: tomcat-maven-plugin-use-tomcat-users-xml-in-war-exec.diff
>
>
> Tomcat7Runner does not use a tomcat-users.xml even though one is extracted 
> into the conf directory from the executable jar file. Also the exec-war-only 
> mojo lacks the configuration for the file, even though the same configuration 
> exists for RunWarMojo.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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

[jira] [Commented] (MTOMCAT-283) Tomcat7Runner does not use tomcat-users.xml when used without a server.xml

[Pasi Niemi (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-283?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14153007#comment-14153007
 ] 

Pasi Niemi commented on MTOMCAT-283:


Background to this issue is that we are deploying tomcats as executable jars 
and developers are using the maven plugin to do local testing. We assumed that 
the functionality in both would be the same and since tomcat-users.xml worked 
in the maven run plugin, we thought the same should work in the executable jar.

So steps to reproduce would be:
1. make a tomcat executable jar with a war that has a requirement for a role
2. include said role and a user on tomcat-users.xml and provide that on the 
classpath (either in the jar or externally)
3. Try to login with the credentials in tomcata-users.xml

We will propose a patch to make the two different functionalities more in line 
with eachother - ok?

> Tomcat7Runner does not use tomcat-users.xml when used without a server.xml
> --
>
> Key: MTOMCAT-283
> URL: https://issues.apache.org/jira/browse/MTOMCAT-283
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.2
> Environment: any
>Reporter: Pasi Niemi
>Assignee: Olivier Lamy (*$^¨%`£)
>
> Tomcat7Runner does not use a tomcat-users.xml even though one is extracted 
> into the conf directory from the executable jar file. Also the exec-war-only 
> mojo lacks the configuration for the file, even though the same configuration 
> exists for RunWarMojo.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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

[jira] [Commented] (MTOMCAT-283) Tomcat7Runner does not use tomcat-users.xml when used without a server.xml

[Konstantin Kolinko (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-283?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14152998#comment-14152998
 ] 

Konstantin Kolinko commented on MTOMCAT-283:


1. Steps to reproduce = ?

2. Why do you think it should have used it? Do you have UserDatabaseRealm and 
UserDatabase configured?

> Tomcat7Runner does not use tomcat-users.xml when used without a server.xml
> --
>
> Key: MTOMCAT-283
> URL: https://issues.apache.org/jira/browse/MTOMCAT-283
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.2
> Environment: any
>Reporter: Pasi Niemi
>Assignee: Olivier Lamy (*$^¨%`£)
>
> Tomcat7Runner does not use a tomcat-users.xml even though one is extracted 
> into the conf directory from the executable jar file. Also the exec-war-only 
> mojo lacks the configuration for the file, even though the same configuration 
> exists for RunWarMojo.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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

[jira] [Created] (MTOMCAT-283) Tomcat7Runner does not use tomcat-users.xml when used without a server.xml

[Pasi Niemi (JIRA)]

Pasi Niemi created MTOMCAT-283:
--

 Summary: Tomcat7Runner does not use tomcat-users.xml when used 
without a server.xml
 Key: MTOMCAT-283
 URL: https://issues.apache.org/jira/browse/MTOMCAT-283
 Project: Apache Tomcat Maven Plugin
  Issue Type: Bug
  Components: tomcat7
Affects Versions: 2.2
 Environment: any
Reporter: Pasi Niemi
Assignee: Olivier Lamy (*$^¨%`£)


Tomcat7Runner does not use a tomcat-users.xml even though one is extracted into 
the conf directory from the executable jar file. Also the exec-war-only mojo 
lacks the configuration for the file, even though the same configuration exists 
for RunWarMojo.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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

[jira] [Updated] (MTOMCAT-282) Support for version of deployed web application

[Andrey Utkin (JIRA)]

 [ 
https://issues.apache.org/jira/browse/MTOMCAT-282?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Andrey Utkin updated MTOMCAT-282:
-
Attachment: tomcat-maven-plugin-trunk_version_support_2.patch

Please see [^tomcat-maven-plugin-trunk_version_support_2.patch] 
This patch touch tomcat6 mojo because of API change in TomcatManager. 
If you think it is not good, I can add new API in TomcatManager instead of 
change.

> Support for version of deployed web application
> ---
>
> Key: MTOMCAT-282
> URL: https://issues.apache.org/jira/browse/MTOMCAT-282
> Project: Apache Tomcat Maven Plugin
>  Issue Type: New Feature
>  Components: tomcat6, tomcat7
>Reporter: Andrey Utkin
>Assignee: Olivier Lamy (*$^¨%`£)
> Fix For: 2.3
>
> Attachments: tomcat-maven-plugin-trunk_version_support.patch, 
> tomcat-maven-plugin-trunk_version_support_2.patch
>
>
> Add support for web application version for deply-* targets.
> See http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Naming



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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

svn commit: r1628369 - in /tomcat/trunk/test/org/apache/tomcat/util/http: TestCookiesDefaultSysProps.java TestCookiesNoFwdStrictSysProps.java TestCookiesNoStrictNamingSysProps.java TestCookiesStrictSy

[markt]

Author: markt
Date: Tue Sep 30 07:58:26 2014
New Revision: 1628369

URL: http://svn.apache.org/r1628369
Log:
Update comments

Modified:

tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java

tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java

tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java?rev=1628369&r1=1628368&r2=1628369&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java 
Tue Sep 30 07:58:26 2014
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.util.http;
 
 import java.util.HashMap;
@@ -29,11 +28,12 @@ import org.apache.catalina.startup.Tomca
 import org.apache.tomcat.util.buf.ByteChunk;
 
 /**
- * Test case for {@link LegacyCookieProcessor}. Note because of the use 
of final
- * static constants in {@link LegacyCookieProcessor}, each of these 
tests must be
- * executed in a new JVM instance. The tests have been place in separate 
classes
- * to facilitate this when running the unit tests via Ant.
+ * Test case for {@link LegacyCookieProcessor}. Note because of the use
+ * of final static constants in {@link CookieSupport}, each of
+ * these tests must be executed in a new JVM instance. The tests have been 
place
+ * in separate classes to facilitate this when running the unit tests via Ant.
  */
+@SuppressWarnings("javadoc")
 public class TestCookiesDefaultSysProps extends CookiesBaseTest {
 
 @Override

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java?rev=1628369&r1=1628368&r2=1628369&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
 Tue Sep 30 07:58:26 2014
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.util.http;
 
 import static org.junit.Assert.assertEquals;
@@ -25,11 +24,12 @@ import org.apache.catalina.startup.Tomca
 import org.apache.tomcat.util.buf.ByteChunk;
 
 /**
- * Test case for {@link LegacyCookieProcessor}. Note because of the use 
of final
- * static constants in {@link LegacyCookieProcessor}, each of these 
tests must be
- * executed in a new JVM instance. The tests have been place in separate 
classes
- * to facilitate this when running the unit tests via Ant.
+ * Test case for {@link LegacyCookieProcessor}. Note because of the use
+ * of final static constants in {@link CookieSupport}, each of
+ * these tests must be executed in a new JVM instance. The tests have been 
place
+ * in separate classes to facilitate this when running the unit tests via Ant.
  */
+@SuppressWarnings("javadoc")
 public class TestCookiesNoFwdStrictSysProps extends CookiesBaseTest {
 
 @Override

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java?rev=1628369&r1=1628368&r2=1628369&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
 Tue Sep 30 07:58:26 2014
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.util.http;
 
 import static org.junit.Assert.assertEquals;
@@ -25,11 +24,12 @@ import org.apache.catalina.startup.Tomca
 import org.apache.tomcat.util.buf.ByteChunk;
 
 /**
- * Test case for {@link LegacyCookieProcessor}. Note because of the use 
of final
- * static constants in {@link LegacyCookieProcessor}, each of these 
tests must be
- * executed in a new JVM instance. The tests have been place in separate 
classes
- * to facilitate this when running the unit tests via Ant.
+ * Test case for {@link LegacyCookieProcessor}. Note because of the use
+ * of final static constants in {@link CookieSupport}, each

svn commit: r1628368 - in /tomcat/trunk/java/org/apache/tomcat/util/http: CookieSupport.java LegacyCookieProcessor.java

[markt]

Author: markt
Date: Tue Sep 30 07:52:15 2014
New Revision: 1628368

URL: http://svn.apache.org/r1628368
Log:
Deprecate CookieSupport class.
Requires copying isV0Separator(char) to LegacyCookieProcessor

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java?rev=1628368&r1=1628367&r2=1628368&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java Tue Sep 30 
07:52:15 2014
@@ -19,7 +19,10 @@ package org.apache.tomcat.util.http;
 
 /**
  * Static constants for this package.
+ *
+ * @deprecated  Will be removed in Tomcat 9.
  */
+@Deprecated
 public final class CookieSupport {
 
 // --- 
Constants
@@ -32,10 +35,7 @@ public final class CookieSupport {
 /**
  * If true, cookie values are allowed to contain an equals character 
without
  * being quoted.
- *
- * @deprecated  Will be removed in Tomcat 9.
  */
-@Deprecated
 public static final boolean ALLOW_EQUALS_IN_VALUE;
 
 /**
@@ -43,37 +43,25 @@ public final class CookieSupport {
  * spec but are disallowed by the HTTP spec will be allowed in v0 cookie
  * names and values. These characters are: \"()/:<=>?@[\\]{} Note that the
  * inclusion of / depends on the value of {@link #FWD_SLASH_IS_SEPARATOR}.
- *
- * @deprecated  Will be removed in Tomcat 9.
  */
-@Deprecated
 public static final boolean ALLOW_HTTP_SEPARATORS_IN_V0;
 
 /**
  * If set to true, the / character will be treated as a
  * separator. Default is usually false. If STRICT_SERVLET_COMPLIANCE==true
  * then default is true. Explicitly setting always takes priority.
- *
- * @deprecated  Will be removed in Tomcat 9.
  */
-@Deprecated
 public static final boolean FWD_SLASH_IS_SEPARATOR;
 
 /**
  * If true, name only cookies will be permitted.
- *
- * @deprecated  Will be removed in Tomcat 9.
  */
-@Deprecated
 public static final boolean ALLOW_NAME_ONLY;
 
 /**
  * If set to true, the cookie header will be preserved. In most cases
  * except debugging, this is not useful.
- *
- * @deprecated  Will be removed in Tomcat 9.
  */
-@Deprecated
 public static final boolean PRESERVE_COOKIE_HEADER;
 
 /**
@@ -177,10 +165,7 @@ public final class CookieSupport {
  * spec, RFC2109.
  * @throws IllegalArgumentException if a control character was supplied as
  * input
- *
- * @deprecated  Will be removed in Tomcat 9.
  */
-@Deprecated
 public static final boolean isHttpSeparator(final char c) {
 if (c < 0x20 || c >= 0x7f) {
 if (c != 0x09) {

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java?rev=1628368&r1=1628367&r2=1628368&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
Tue Sep 30 07:52:15 2014
@@ -44,12 +44,22 @@ public final class LegacyCookieProcessor
 private static final StringManager sm =
 StringManager.getManager("org.apache.tomcat.util.http");
 
+private static final char[] V0_SEPARATORS = {',', ';', ' ', '\t'};
+private static final boolean[] V0_SEPARATOR_FLAGS = new boolean[128];
+
 // Excludes '/' since configuration controls whether or not to treat '/' as
 // a separator
 private static final char[] HTTP_SEPARATORS = new char[] {
 '\t', ' ', '\"', '(', ')', ',', ':', ';', '<', '=', '>', '?', '@',
 '[', '\\', ']', '{', '}' };
 
+static {
+for (char c : V0_SEPARATORS) {
+V0_SEPARATOR_FLAGS[c] = true;
+}
+}
+
+
 @SuppressWarnings("deprecation") // Default to false when deprecated code 
is removed
 private boolean allowEqualsInValue = CookieSupport.ALLOW_EQUALS_IN_VALUE;
 
@@ -206,7 +216,7 @@ public final class LegacyCookieProcessor
 while (pos < end &&
(isHttpSeparator((char) bytes[pos]) &&
!getAllowHttpSepsInV0() ||
-CookieSupport.isV0Separator((char) bytes[pos]) ||
+isV0Separator((char) bytes[pos]) ||
 isWhiteSpace(bytes[pos])))
 {pos++; }
 
@@ -271,7 +281,7 @@ public final class Legac

svn commit: r1628367 - /tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java

[markt]

Author: markt
Date: Tue Sep 30 07:47:58 2014
New Revision: 1628367

URL: http://svn.apache.org/r1628367
Log:
Restore throwing of IAE for control characters in cookie header removed in 
r1628366

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java?rev=1628367&r1=1628366&r2=1628367&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
Tue Sep 30 07:47:58 2014
@@ -204,7 +204,7 @@ public final class LegacyCookieProcessor
 
 // Skip whitespace and non-token characters (separators)
 while (pos < end &&
-   (httpSeparatorFlags[(char) bytes[pos]] &&
+   (isHttpSeparator((char) bytes[pos]) &&
!getAllowHttpSepsInV0() ||
 CookieSupport.isV0Separator((char) bytes[pos]) ||
 isWhiteSpace(bytes[pos])))
@@ -273,7 +273,7 @@ public final class LegacyCookieProcessor
 if (version == 0 &&
 !CookieSupport.isV0Separator((char)bytes[pos]) 
&&
 getAllowHttpSepsInV0() ||
-!httpSeparatorFlags[(char)bytes[pos]] ||
+!isHttpSeparator((char)bytes[pos]) ||
 bytes[pos] == '=') {
 // Token
 valueStart = pos;
@@ -440,7 +440,7 @@ public final class LegacyCookieProcessor
 int version, boolean isName){
 int pos = off;
 while (pos < end &&
-(!httpSeparatorFlags[(char)bytes[pos]] ||
+(!isHttpSeparator((char)bytes[pos]) ||
  version == 0 && getAllowHttpSepsInV0() && bytes[pos] != '=' &&
 !CookieSupport.isV0Separator((char)bytes[pos]) ||
  !isName && bytes[pos] == '=' && getAllowEqualsInValue())) {
@@ -454,6 +454,17 @@ public final class LegacyCookieProcessor
 }
 
 
+private boolean isHttpSeparator(final char c) {
+if (c < 0x20 || c >= 0x7f) {
+if (c != 0x09) {
+throw new IllegalArgumentException(
+"Control character in cookie value or attribute.");
+}
+}
+
+return httpSeparatorFlags[c];
+}
+
 /**
  * Given a starting position after an initial quote character, this gets
  * the position of the end quote. This escapes anything after a '\' char



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

svn commit: r1628366 - in /tomcat/trunk: java/org/apache/tomcat/util/http/CookieSupport.java java/org/apache/tomcat/util/http/LegacyCookieProcessor.java test/org/apache/tomcat/util/http/TestCookiePars

[markt]

Author: markt
Date: Tue Sep 30 07:41:57 2014
New Revision: 1628366

URL: http://svn.apache.org/r1628366
Log:
Make FWD_SLASH_IS_SEPARATOR configurable per context

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java
tomcat/trunk/webapps/docs/config/cookie-processor.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java?rev=1628366&r1=1628365&r2=1628366&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java Tue Sep 30 
07:41:57 2014
@@ -53,7 +53,10 @@ public final class CookieSupport {
  * If set to true, the / character will be treated as a
  * separator. Default is usually false. If STRICT_SERVLET_COMPLIANCE==true
  * then default is true. Explicitly setting always takes priority.
+ *
+ * @deprecated  Will be removed in Tomcat 9.
  */
+@Deprecated
 public static final boolean FWD_SLASH_IS_SEPARATOR;
 
 /**
@@ -174,7 +177,10 @@ public final class CookieSupport {
  * spec, RFC2109.
  * @throws IllegalArgumentException if a control character was supplied as
  * input
+ *
+ * @deprecated  Will be removed in Tomcat 9.
  */
+@Deprecated
 public static final boolean isHttpSeparator(final char c) {
 if (c < 0x20 || c >= 0x7f) {
 if (c != 0x09) {

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java?rev=1628366&r1=1628365&r2=1628366&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
Tue Sep 30 07:41:57 2014
@@ -44,6 +44,11 @@ public final class LegacyCookieProcessor
 private static final StringManager sm =
 StringManager.getManager("org.apache.tomcat.util.http");
 
+// Excludes '/' since configuration controls whether or not to treat '/' as
+// a separator
+private static final char[] HTTP_SEPARATORS = new char[] {
+'\t', ' ', '\"', '(', ')', ',', ':', ';', '<', '=', '>', '?', '@',
+'[', '\\', ']', '{', '}' };
 
 @SuppressWarnings("deprecation") // Default to false when deprecated code 
is removed
 private boolean allowEqualsInValue = CookieSupport.ALLOW_EQUALS_IN_VALUE;
@@ -58,6 +63,20 @@ public final class LegacyCookieProcessor
  // when deprecated code is removed
 private boolean presserveCookieHeader = 
CookieSupport.PRESERVE_COOKIE_HEADER;
 
+private boolean[] httpSeparatorFlags = new boolean[128];
+
+
+public LegacyCookieProcessor() {
+// Array elements will default to false
+for (char c : HTTP_SEPARATORS) {
+httpSeparatorFlags[c] = true;
+}
+@SuppressWarnings("deprecation") // Default to 
STRICT_SERVLET_COMPLIANCE
+ // when deprecated code is removed
+boolean b = CookieSupport.FWD_SLASH_IS_SEPARATOR;
+httpSeparatorFlags['/'] = b;
+}
+
 
 public boolean getAllowEqualsInValue() {
 return allowEqualsInValue;
@@ -99,6 +118,16 @@ public final class LegacyCookieProcessor
 }
 
 
+public boolean getForwardSlashIsSeparator() {
+return httpSeparatorFlags['/'];
+}
+
+
+public void setForwardSlashIsSeparator(boolean forwardSlashIsSeparator) {
+httpSeparatorFlags['/'] = forwardSlashIsSeparator;
+}
+
+
 @Override
 public Charset getCharset() {
 return StandardCharsets.ISO_8859_1;
@@ -175,7 +204,7 @@ public final class LegacyCookieProcessor
 
 // Skip whitespace and non-token characters (separators)
 while (pos < end &&
-   (CookieSupport.isHttpSeparator((char) bytes[pos]) &&
+   (httpSeparatorFlags[(char) bytes[pos]] &&
!getAllowHttpSepsInV0() ||
 CookieSupport.isV0Separator((char) bytes[pos]) ||
 isWhiteSpace(bytes[pos])))
@@ -244,7 +273,7 @@ public final class LegacyCookieProcessor
 if (version == 0 &&
 !CookieSupport.isV0Separator((char)bytes[pos]) 
&&
 getAllowHttpSepsInV0() ||
-!CookieSupport.isHttpSeparator((char)bytes[pos]) ||
+!httpSeparatorFlags[(char)bytes[pos]] ||
  

svn commit: r1628365 - /tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java

[markt]

Author: markt
Date: Tue Sep 30 07:29:38 2014
New Revision: 1628365

URL: http://svn.apache.org/r1628365
Log:
Better name

Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java?rev=1628365&r1=1628364&r2=1628365&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java Tue 
Sep 30 07:29:38 2014
@@ -49,7 +49,7 @@ public class TestCookieParsing extends T
 
 private static final String[] COOKIES_WITH_QUOTES = new String[] {
 "name=\"val\\\"ue\"" };
-private static final String COOKIES_WITH_QUOTES_TRUNC = 
"name=\"val\"uee\"";
+private static final String COOKIES_WITH_QUOTES_MODIFIED = 
"name=\"val\"uee\"";
 
 @Test
 public void testLegacyWithEquals() throws Exception {
@@ -186,7 +186,7 @@ public class TestCookieParsing extends T
 if (preserveHeader) {
 expected = concat(COOKIES_WITH_QUOTES);
 } else {
-expected = COOKIES_WITH_QUOTES_TRUNC;
+expected = COOKIES_WITH_QUOTES_MODIFIED;
 }
 TestCookieParsingClient client = new TestCookieParsingClient(
 legacyCookieProcessor, true, COOKIES_WITH_QUOTES, expected);



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