Re: Plan for 9.0.0.RC1

2015-10-21 Thread Mark Thomas 
On 21/10/2015 15:31, Rémy Maucherat wrote:
> 2015-10-21 16:14 GMT+02:00 Mark Thomas :
> 
>> On 20/10/2015 15:30, Mark Thomas wrote:
>>
>>> I found the root cause of the Gump failure. It was an error in the
>>> refactoring when I switched WebSocket from Servlet 3.1 non-blockin I/O
>>> to goting directly to Tomcat's I/O layer.
>>>
>>> I'll take a look at NIO2/Chrome next.
>>
>> Sorry, I still haven't got to this. I was distracted by finding that the
>> non-blocking I/O examples were failing for HTTP/2.
>>
>> Having fixed those bugs, are your NIO2/Chrome issues any better?
>>
> Yes, it still looks the same. For some reason some timeouts occur although
> it looks fairly certain the server didn't receive anything or misprocessed
> some input [or output since it's fairly certain the encryption and IO work
> well enough for static files].

Drat. I thought those fixes might help. Oh well.

I plan to start the 1.2.0 tc-native release next and then look at this
while that vote runs.

Mark


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

[Bug 58031] Posting data exceeding maxPostSize should result in HTTP 413.

2015-10-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58031

--- Comment #12 from Christopher L. Simons  ---
Any objections to applying the attached documentation patch?  I think it would
save many users from having to search and dig up this post to realize they can
use FailedRequestFilter to adjust the behavior that occurs when @maxPostSize is
exceeded.

-- 
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: Plan for 9.0.0.RC1

2015-10-21 Thread Rémy Maucherat 
2015-10-21 16:14 GMT+02:00 Mark Thomas :

> On 20/10/2015 15:30, Mark Thomas wrote:
>
> > I found the root cause of the Gump failure. It was an error in the
> > refactoring when I switched WebSocket from Servlet 3.1 non-blockin I/O
> > to goting directly to Tomcat's I/O layer.
> >
> > I'll take a look at NIO2/Chrome next.
>
> Sorry, I still haven't got to this. I was distracted by finding that the
> non-blocking I/O examples were failing for HTTP/2.
>
> Having fixed those bugs, are your NIO2/Chrome issues any better?
>
> Yes, it still looks the same. For some reason some timeouts occur although
it looks fairly certain the server didn't receive anything or misprocessed
some input [or output since it's fairly certain the encryption and IO work
well enough for static files].

Rémy

Re: Plan for 9.0.0.RC1

2015-10-21 Thread Mark Thomas 
On 20/10/2015 15:30, Mark Thomas wrote:

> I found the root cause of the Gump failure. It was an error in the
> refactoring when I switched WebSocket from Servlet 3.1 non-blockin I/O
> to goting directly to Tomcat's I/O layer.
> 
> I'll take a look at NIO2/Chrome next.

Sorry, I still haven't got to this. I was distracted by finding that the
non-blocking I/O examples were failing for HTTP/2.

Having fixed those bugs, are your NIO2/Chrome issues any better?

Mark


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

svn commit: r1709842 - in /tomcat/trunk/java/org/apache/coyote/http2: LocalStrings.properties StreamProcessor.java

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 14:00:54 2015
New Revision: 1709842

URL: http://svn.apache.org/viewvc?rev=1709842=rev
Log:
Add debug logging option for processing errors (helped track down another 
failure with the examples)

Modified:
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1709842=1709841=1709842=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Wed Oct 
21 14:00:54 2015
@@ -82,6 +82,7 @@ stream.outputBuffer.flush.debug=Connecti
 streamProcessor.error.connection=Connection [{0}], Stream [{1}], An error 
occurred during processing that was fatal to the connection
 streamProcessor.error.stream=Connection [{0}], Stream [{1}], An error occurred 
during processing that was fatal to the stream
 streamProcessor.httpupgrade.notsupported=HTTP upgrade is not supported within 
HTTP/2 streams
+streamProcessor.service.error=Error during request processing
 streamProcessor.ssl.error=Unable to retrieve SSL request attributes
 
 streamStateMachine.debug.change=Connection [{0}], Stream [{1}], State changed 
from [{2}] to [{3}]

Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1709842=1709841=1709842=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Wed Oct 21 
14:00:54 2015
@@ -398,6 +398,9 @@ public class StreamProcessor extends Abs
 try {
 adapter.service(request, response);
 } catch (Exception e) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("streamProcessor.service.error"), e);
+}
 setErrorState(ErrorState.CLOSE_NOW, e);
 }
 



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

svn commit: r1709843 - /tomcat/trunk/java/org/apache/coyote/http2/Stream.java

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 14:01:17 2015
New Revision: 1709843

URL: http://svn.apache.org/viewvc?rev=1709843=rev
Log:
Fix NPE when there is no request body

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1709843=1709842=1709843=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Wed Oct 21 14:01:17 
2015
@@ -611,7 +611,7 @@ public class Stream extends AbstractStre
 
 
 synchronized boolean isRequestBodyFullyRead() {
-return inBuffer.position() == 0 && isInputFinished();
+return (inBuffer == null || inBuffer.position() == 0) && 
isInputFinished();
 }
 
 



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

[Bug 56777] Allow configuration resources to be loaded from places other than straight off the filesystem

2015-10-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=56777

Huxing Zhang  changed:

   What|Removed |Added

  Attachment #33192|0   |1
is obsolete||

--- Comment #11 from Huxing Zhang  ---
Created attachment 33193
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33193=edit
back port fix of bug 56777 to tomcat 7.0.x

update patch, the previous patch is not correct, because
webapps/docs/changelog.xml.orig is added by mistake.

-- 
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 56777] Allow configuration resources to be loaded from places other than straight off the filesystem

2015-10-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=56777

--- Comment #9 from Huxing Zhang  ---
Hi folks, I will try to do the back-port to tomcat 7.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: r1709895 - in /tomcat/trunk: java/org/apache/catalina/filters/RestCsrfPreventionFilter.java webapps/docs/config/filter.xml

2015-10-21 Thread violetagg 
Author: violetagg
Date: Wed Oct 21 18:32:13 2015
New Revision: 1709895

URL: http://svn.apache.org/viewvc?rev=1709895=rev
Log:
Documentation for RestCsrfPreventionFilter

Modified:
tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
tomcat/trunk/webapps/docs/config/filter.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java?rev=1709895=1709894=1709895=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java 
Wed Oct 21 18:32:13 2015
@@ -215,13 +215,12 @@ public class RestCsrfPreventionFilter ex
 }
 
 /**
- * Paths accepting request parameters with nonce information are URLs that
- * can supply nonces via request parameter 'X-CSRF-Token'. For use cases
- * when a nonce information cannot be provided via header, one can provide
- * it via request parameters. If there is a X-CSRF-Token header, it will be
- * taken with preference over any parameter with the same name in the
- * request. Request parameters cannot be used to fetch new nonce, only
- * header.
+ * A comma separated list of URLs that can accept nonces via request
+ * parameter 'X-CSRF-Token'. For use cases when a nonce information cannot
+ * be provided via header, one can provide it via request parameters. If
+ * there is a X-CSRF-Token header, it will be taken with preference over 
any
+ * parameter with the same name in the request. Request parameters cannot 
be
+ * used to fetch new nonce, only header.
  *
  * @param pathsList
  *Comma separated list of URLs to be configured as paths

Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1709895=1709894=1709895=diff
==
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Wed Oct 21 18:32:13 2015
@@ -310,6 +310,161 @@
 
 
 
+
+
+  
+
+This filter provides basic CSRF protection for REST APIs. The CSRF
+protection is applied only for modifying HTTP requests (different from GET,
+HEAD, OPTIONS) to protected resources. It is based on a custom header
+X-CSRF-Token that provides a valid nonce.
+
+CSRF protection mechanism for REST APIs consists of the following steps:
+  
+Client asks for a valid nonce. This is performed with a
+non-modifying "Fetch" request to protected resource.
+Server responds with a valid nonce mapped to the current user
+session.
+Client provides this nonce in the subsequent modifying requests in
+the frame of the same user session.
+Server rejects all modifying requests to protected resources that
+do not contain a valid nonce.
+  
+
+
+  
+
+  
+
+On the server side
+
+
+  All CSRF protected REST APIs should be protected with an 
authentication
+  mechanism.
+  Protect modifying REST APIs with this filter.
+  Provide at least one non-modifying operation.
+
+  
+
+On the client side
+
+
+  Make a non-modifying "Fetch" request in order to obtain a valid 
nonce.
+  This can be done with sending additional header
+  X-CSRF-Token: Fetch
+  Cache the returned session id and nonce in order to provide them in
+  the subsequent modifying requests to protected resources.
+  Modifying requests can be denied and header 
+  X-CSRF-Token: Required will be returned in case of
+  invalid or missing nonce, expired session or in case the session
+  id is changed by the server.
+
+  
+
+  
+
+  
+
+When the client is not able to insert custom headers in its calls to
+   REST APIs there is additional capability to configure URLs for which a
+   valid nonce will be accepted as a request parameter.
+
+Note: If there is a X-CSRF-Token header, it will be taken
+   with preference over any parameter with the same name in the request.
+   Request parameters cannot be used to fetch new nonce, only header can be
+   used to request a new nonce.
+
+
+
+  
+
+  
+
+The filter class name for the CSRF Prevention Filter for REST APIs is
+org.apache.catalina.filters.RestCsrfPreventionFilter
+.
+
+  
+
+  
+
+The CSRF Prevention Filter for REST APIs supports the following
+initialisation parameters:
+
+
+
+  
+HTTP response status code that is used when rejecting denied
+request. The default value is 403.
+  
+
+  
+A comma separated

svn commit: r1709910 - /tomcat/native/trunk/java/org/apache/tomcat/

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 20:31:40 2015
New Revision: 1709910

URL: http://svn.apache.org/viewvc?rev=1709910=rev
Log:
Update o.a.t.jni external

Modified:
tomcat/native/trunk/java/org/apache/tomcat/   (props changed)

Propchange: tomcat/native/trunk/java/org/apache/tomcat/
--
--- svn:externals (original)
+++ svn:externals Wed Oct 21 20:31:40 2015
@@ -1 +1 @@
-^/tomcat/trunk/java/org/apache/tomcat/jni@1678592 jni
+^/tomcat/trunk/java/org/apache/tomcat/jni@1708643 jni



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

svn commit: r1709907 - in /tomcat/native/trunk: download_deps.sh native/srclib/VERSIONS

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 20:10:54 2015
New Revision: 1709907

URL: http://svn.apache.org/viewvc?rev=1709907=rev
Log:
Update dependencies

Modified:
tomcat/native/trunk/download_deps.sh
tomcat/native/trunk/native/srclib/VERSIONS

Modified: tomcat/native/trunk/download_deps.sh
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/download_deps.sh?rev=1709907=1709906=1709907=diff
==
--- tomcat/native/trunk/download_deps.sh (original)
+++ tomcat/native/trunk/download_deps.sh Wed Oct 21 20:10:54 2015
@@ -5,8 +5,8 @@
 
 
 
-SSL=openssl-1.0.1-beta2.tar.gz
-APR=apr-1.4.5.tar.gz
+SSL=openssl-1.0.2d.tar.gz
+APR=apr-1.5.2.tar.gz
 mkdir -p deps
 
 if [ ! -f deps/$SSL ] ; then

Modified: tomcat/native/trunk/native/srclib/VERSIONS
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/VERSIONS?rev=1709907=1709906=1709907=diff
==
--- tomcat/native/trunk/native/srclib/VERSIONS (original)
+++ tomcat/native/trunk/native/srclib/VERSIONS Wed Oct 21 20:10:54 2015
@@ -1,4 +1,4 @@
 Use the following version of the libraries
 
-- APR 1.5.1, http://apr.apache.org
-- OpenSSL 1.0.2 or later, http://www.openssl.org
+- APR 1.5.2, http://apr.apache.org
+- OpenSSL 1.0.2d or later, http://www.openssl.org



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

svn commit: r1709914 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_0: ./ native/include/tcn_version.h

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 20:45:38 2015
New Revision: 1709914

URL: http://svn.apache.org/viewvc?rev=1709914=rev
Log:
Tag 1.2.0

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/
  - copied from r1709913, tomcat/native/trunk/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h?rev=1709914=1709913=1709914=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h 
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h Wed Oct 
21 20:45:38 2015
@@ -69,7 +69,7 @@ extern "C" {
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



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

svn commit: r1709913 - /tomcat/native/tags/TOMCAT_NATIVE_1_2_0/

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 20:45:15 2015
New Revision: 1709913

URL: http://svn.apache.org/viewvc?rev=1709913=rev
Log:
No surprise. First attempt at 1.2.0 tag was no good

Removed:
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/


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

svn commit: r1709912 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_0: ./ download_deps.sh java/org/apache/tomcat/ java/org/apache/tomcat/Apr.java java/org/apache/tomcat/apr.properties native/include/tcn_

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 20:44:22 2015
New Revision: 1709912

URL: http://svn.apache.org/viewvc?rev=1709912=rev
Log:
Tag 1.2.0

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/
  - copied from r1709904, tomcat/native/trunk/
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/download_deps.sh
  - copied unchanged from r1709907, tomcat/native/trunk/download_deps.sh
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/java/org/apache/tomcat/
  - copied from r1709910, tomcat/native/trunk/java/org/apache/tomcat/
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/java/org/apache/tomcat/Apr.java
  - copied unchanged from r1709904, 
tomcat/native/trunk/java/org/apache/tomcat/Apr.java
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/java/org/apache/tomcat/apr.properties
  - copied unchanged from r1709904, 
tomcat/native/trunk/java/org/apache/tomcat/apr.properties
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/srclib/VERSIONS
  - copied unchanged from r1709907, 
tomcat/native/trunk/native/srclib/VERSIONS
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h?rev=1709912=1709904=1709912=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h 
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h Wed Oct 
21 20:44:22 2015
@@ -69,7 +69,7 @@ extern "C" {
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



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

svn commit: r1709915 - /tomcat/native/tags/TOMCAT_NATIVE_1_2_0/

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 20:46:37 2015
New Revision: 1709915

URL: http://svn.apache.org/viewvc?rev=1709915=rev
Log:
Second attempt was better but still not right

Removed:
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/


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

Re: svn commit: r1709917 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_0: ./ native/include/tcn_version.h

2015-10-21 Thread Mark Thomas 
On 21/10/2015 21:48, ma...@apache.org wrote:
> Author: markt
> Date: Wed Oct 21 20:48:21 2015
> New Revision: 1709917
> 
> URL: http://svn.apache.org/viewvc?rev=1709917=rev
> Log:
> Tag 1.2.0

I think this one was good. I'm going to put together an RC including
Windows binaries for people to test.

Mark


> 
> Added:
> tomcat/native/tags/TOMCAT_NATIVE_1_2_0/
>   - copied from r1709916, tomcat/native/trunk/
> Modified:
> tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h
> 
> Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h
> URL: 
> http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h?rev=1709917=1709916=1709917=diff
> ==
> --- tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h 
> (original)
> +++ tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h Wed 
> Oct 21 20:48:21 2015
> @@ -69,7 +69,7 @@ extern "C" {
>   *  This symbol is defined for internal, "development" copies of TCN. This
>   *  symbol will be #undef'd for releases.
>   */
> -#define TCN_IS_DEV_VERSION  1
> +#define TCN_IS_DEV_VERSION  0
>  
>  
>  /** The formatted string of APU's version */
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

svn commit: r1709916 - /tomcat/native/trunk/native/os/win32/libtcnative.rc

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 20:47:58 2015
New Revision: 1709916

URL: http://svn.apache.org/viewvc?rev=1709916=rev
Log:
Update Windows version info

Modified:
tomcat/native/trunk/native/os/win32/libtcnative.rc

Modified: tomcat/native/trunk/native/os/win32/libtcnative.rc
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/libtcnative.rc?rev=1709916=1709915=1709916=diff
==
--- tomcat/native/trunk/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/trunk/native/os/win32/libtcnative.rc Wed Oct 21 20:47:58 2015
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
  "See the License for the specific language governing " \
  "permissions and limitations under the License."
 
-#define TCN_VERSION "2.0.0"
+#define TCN_VERSION "1.2.0"
 1000 ICON "apache.ico"
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 1,2,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L



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

svn commit: r1709917 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_0: ./ native/include/tcn_version.h

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 20:48:21 2015
New Revision: 1709917

URL: http://svn.apache.org/viewvc?rev=1709917=rev
Log:
Tag 1.2.0

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/
  - copied from r1709916, tomcat/native/trunk/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h?rev=1709917=1709916=1709917=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h 
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_0/native/include/tcn_version.h Wed Oct 
21 20:48:21 2015
@@ -69,7 +69,7 @@ extern "C" {
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



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

svn commit: r10881 - in /dev/tomcat/tomcat-connectors/native/1.2.0: ./ binaries/ source/

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 22:03:42 2015
New Revision: 10881

Log:
Add the 1.2.0 source packages. Windows binaries to follow.

Added:
dev/tomcat/tomcat-connectors/native/1.2.0/
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/
dev/tomcat/tomcat-connectors/native/1.2.0/source/

dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz 
  (with props)

dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz.asc
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz.md5

dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz.sha1

dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip.asc
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip.sha1

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz
--
svn:mime-type = application/x-gzip

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz.asc
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz.md5
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz.md5
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz.md5
 Wed Oct 21 22:03:42 2015
@@ -0,0 +1 @@
+07b132c31f4dd32f0b63e8c42d7c87ce *tomcat-native-1.2.0-src.tar.gz
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-src.tar.gz.sha1
 Wed Oct 21 22:03:42 2015
@@ -0,0 +1 @@
+6501d86a022105cd43f409f6f14f12d6dec02981 *tomcat-native-1.2.0-src.tar.gz
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip
--
svn:mime-type = application/zip

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip.asc
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip.asc
--
svn:mime-type = application/pgp-signature

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip.md5
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip.md5
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip.md5
 Wed Oct 21 22:03:42 2015
@@ -0,0 +1 @@
+86aa9c45bb64cf417e2c4a308ae4b069 *tomcat-native-1.2.0-win32-src.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.0/source/tomcat-native-1.2.0-win32-src.zip.sha1
 Wed Oct 21 22:03:42 2015
@@ -0,0 +1 @@
+fdef44e9885eed760d602b2f05b5f10ce3945c23 *tomcat-native-1.2.0-win32-src.zip
\ No newline at end of file



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

[Bug 56777] Allow configuration resources to be loaded from places other than straight off the filesystem

2015-10-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=56777

--- Comment #10 from Huxing Zhang  ---
Created attachment 33192
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33192=edit
back port fix of bug 56777 to tomcat 7.0.x

back port fix of bug 56777 to tomcat 7.0.x.
Allow trust stores, keystores, CRLs and the tomcat-users.xml file to be loaded
from URLs as well as the file system.

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

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

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

2015-10-21 Thread Bill Barker 
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 min 47 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.12-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.12-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20151022.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja
 
r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20151022.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20151022.jar:/srv/gump/packages/guava/guava-18.0.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-6.12-SNAPSHOT.jar

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 6.12-SNAPSHOT on 3067 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/config/filter.xml:368: 
error: Line matches the illegal pattern '\s+$'.
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/config/filter.xml:411: 
error: Line matches the illegal pattern '\s+$'.

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:549: Got 2 errors and 0 
warnings.

Total time: 1 minute 46 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 2015102208, vmgump.apache.org:vmgump:2015102208
Gump E-mail Identifier (unique within run) #10.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

2015-10-21 Thread Bill Barker 
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 31 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 46 mins 14 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151021-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20151021/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151021.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151021-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -
 Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20151021/bin/openssl
 -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace

svn commit: r1709787 - in /tomcat/trunk: java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/authenticator/jaspic/provider/ java/org/apache/catalina/authenticator/jaspic/provider/m

2015-10-21 Thread remm 
Author: remm
Date: Wed Oct 21 10:16:17 2015
New Revision: 1709787

URL: http://svn.apache.org/viewvc?rev=1709787=rev
Log:
Add properties for the JASPIC modules, plus some cleanups (more properties will 
be needed). Patch from Fjodor Vershinin with some changes.

Modified:

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfig.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfigProvider.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatServerAuthContext.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/FormAuthModule.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/TomcatAuthModule.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicBasicAuthenticator.java

tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java

tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicFormAuthenticator.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java?rev=1709787=1709786=1709787=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
 Wed Oct 21 10:16:17 2015
@@ -17,6 +17,8 @@
 package org.apache.catalina.authenticator.jaspic;
 
 import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -49,8 +51,7 @@ public class JaspicAuthenticator extends
 
 private Subject serviceSubject;
 
-@SuppressWarnings("rawtypes")
-private Map authProperties = null;
+private Map authProperties = new HashMap<>();
 
 private JaspicCallbackHandler callbackHandler;
 
@@ -157,4 +158,15 @@ public class JaspicAuthenticator extends
 protected String getAuthMethod() {
 return context.getLoginConfig().getAuthMethod();
 }
+
+
+public void setProperty(String key, String value) {
+this.authProperties.put(key, value);
+}
+
+
+public Map getAuthProperties() {
+return Collections.unmodifiableMap(authProperties);
+}
+
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfig.java?rev=1709787=1709786=1709787=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfig.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/TomcatAuthConfig.java
 Wed Oct 21 10:16:17 2015
@@ -46,16 +46,18 @@ public class TomcatAuthConfig implements
 private Context context;
 private LoginConfig loginConfig;
 private Realm realm;
-
+private Map properties;
 
 public TomcatAuthConfig(String layer, String appContext, CallbackHandler 
callbackHandler,
-Context context) {
+Context context, Map properties) throws 
AuthException {
 this.messageLayer = layer;
 this.appContext = appContext;
 this.handler = callbackHandler;
 this.context = context;
+this.properties = properties;
 this.realm = context.getRealm();
 this.loginConfig = context.getLoginConfig();
+initializeAuthContext(properties);
 }
 
 
@@ -90,21 +92,31 @@ public class TomcatAuthConfig implements
 
 
 @Override
-@SuppressWarnings("rawtypes")
+@SuppressWarnings({ "rawtypes", "unchecked" })
 public synchronized ServerAuthContext getAuthContext(String authContextID,
 Subject serviceSubject, Map properties) throws AuthException {
 if (this.tomcatServerAuthContext == null) {
-this.tomcatServerAuthContext = new 
TomcatServerAuthContext(handler, getModule(),
-getOptions());
+initializeAuthContext(properties);
 }
 return tomcatServerAuthContext;
 }
 
 
-private Map getOptions() {
-Map options = new HashMap<>();
-options.put(TomcatAuthModule.REALM_NAME, getRealmName());
-return options;
+private void initializeAuthContext(Map properties) throws 
AuthException {
+TomcatAuthModule module = getModule();
+module.initialize(null, null, handler,

svn commit: r1709813 - in /tomcat/trunk/java/org/apache/coyote/http2: LocalStrings.properties Stream.java StreamProcessor.java

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 12:33:04 2015
New Revision: 1709813

URL: http://svn.apache.org/viewvc?rev=1709813=rev
Log:
Fix a couple of issues identified when testing the latest code with the 
nonblocking/bytecounter example.
- NB_READ_INTEREST needs to register a read interest, not return a value for 
isReady
- onDataAvailable() always needs to dispatch to a new thread
Includes some useful debug logging I added to help track what was going on.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1709813=1709812=1709813=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Wed Oct 
21 12:33:04 2015
@@ -72,6 +72,11 @@ stream.reset.debug=Connection [{0}], Str
 stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
 stream.write=Connection [{0}], Stream [{1}]
 
+stream.inputBuffer.copy=Copying [{0}] bytes from inBuffer to outBuffer
+stream.inputBuffer.dispatch=Data added to inBuffer when read interest is 
registered. Triggering a read dispatch
+stream.inputBuffer.empty=The Stream input buffer is empty. Waiting for more 
data
+stream.inputBuffer.signal=Data added to inBuffer when read thread is waiting. 
Signalling that thread to continue
+
 stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing 
output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
 
 streamProcessor.error.connection=Connection [{0}], Stream [{1}], An error 
occurred during processing that was fatal to the connection

Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1709813=1709812=1709813=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Wed Oct 21 12:33:04 
2015
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
 import java.util.Iterator;
 
 import org.apache.coyote.ActionCode;
-import org.apache.coyote.ContainerThreadMarker;
 import org.apache.coyote.InputBuffer;
 import org.apache.coyote.OutputBuffer;
 import org.apache.coyote.Request;
@@ -563,6 +562,9 @@ public class Stream extends AbstractStre
 while (inBuffer.position() == 0 && !isInputFinished()) {
 // Need to block until some data is written
 try {
+if (log.isDebugEnabled()) {
+
log.debug(sm.getString("stream.inputBuffer.empty"));
+}
 inBuffer.wait();
 } catch (InterruptedException e) {
 // Possible shutdown / rst or similar. Use an
@@ -573,9 +575,14 @@ public class Stream extends AbstractStre
 }
 
 if (inBuffer.position() > 0) {
-// Data remains in the in buffer. Copy it to the out 
buffer.
+// Data is available in the inBuffer. Copy it to the
+// outBuffer.
 inBuffer.flip();
 written = inBuffer.remaining();
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("stream.inputBuffer.copy",
+Integer.toString(written)));
+}
 inBuffer.get(outBuffer, 0, written);
 inBuffer.clear();
 } else if (isInputFinished()) {
@@ -596,14 +603,9 @@ public class Stream extends AbstractStre
 }
 
 
-boolean isReady() {
+void registerReadInterest() {
 synchronized (inBuffer) {
-if (inBuffer.position() == 0) {
-readInterest = true;
-return false;
-} else {
-return true;
-}
+readInterest = true;
 }
 }
 
@@ -623,13 +625,20 @@ public class Stream extends AbstractStre
  */
 synchronized boolean onDataAvailable() {
 if (readInterest) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("stream.inputBuffer.dispatch"));
+}
 readInterest = false;
 coyoteRequest.action(ActionCode.DISPATCH_READ, null);
-if (!ContainerThreadMarker.isContainerThread()) {
-

svn commit: r1709816 - /tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/SpnegoAuthModule.java

2015-10-21 Thread remm 
Author: remm
Date: Wed Oct 21 12:42:19 2015
New Revision: 1709816

URL: http://svn.apache.org/viewvc?rev=1709816=rev
Log:
Add the SPNEGO module, not reviewed yet. Patch from Fjodor Vershinin with some 
changes.

Added:

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/SpnegoAuthModule.java

Added: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/SpnegoAuthModule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/SpnegoAuthModule.java?rev=1709816=auto
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/SpnegoAuthModule.java
 (added)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/SpnegoAuthModule.java
 Wed Oct 21 12:42:19 2015
@@ -0,0 +1,509 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.authenticator.jaspic.provider.modules;
+
+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.LinkedHashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.message.AuthException;
+import javax.security.auth.message.AuthStatus;
+import javax.security.auth.message.MessageInfo;
+import javax.security.auth.message.MessagePolicy;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Realm;
+import org.apache.catalina.authenticator.Constants;
+import org.apache.catalina.connector.Request;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.codec.binary.Base64;
+import org.apache.tomcat.util.compat.JreVendor;
+import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSException;
+import org.ietf.jgss.GSSManager;
+import org.ietf.jgss.Oid;
+
+/**
+ * A SPNEGO authenticator that uses the SPNEGO/Kerberos support built in to 
Java
+ * 6. Successful Kerberos authentication depends on the correct configuration 
of
+ * multiple components. If the configuration is invalid, the error messages are
+ * often cryptic although a Google search will usually point you in the right
+ * direction.
+ */
+public class SpnegoAuthModule extends TomcatAuthModule {
+private static final Log log = LogFactory.getLog(SpnegoAuthModule.class);
+
+private Class[] supportedMessageTypes = new Class[] { 
HttpServletRequest.class,
+HttpServletResponse.class };
+
+private String loginConfigName = Constants.DEFAULT_LOGIN_MODULE_NAME;
+private boolean storeDelegatedCredential = true;
+private Pattern noKeepAliveUserAgents = null;
+private boolean applyJava8u40Fix = true;
+
+@Override
+public Class[] getSupportedMessageTypes() {
+return supportedMessageTypes;
+}
+
+
+@Override
+public void initializeModule(MessagePolicy requestPolicy, MessagePolicy 
responsePolicy,
+CallbackHandler handler, Map options) throws 
AuthException {
+this.loginConfigName = options.getOrDefault("loginConfigName", 
Constants.DEFAULT_LOGIN_MODULE_NAME);
+this.storeDelegatedCredential = 
Boolean.parseBoolean(options.getOrDefault("storeDelegatedCredential", 
Boolean.TRUE.toString()));
+this.noKeepAliveUserAgents = 
compilePattern(options.get("noKeepAliveUserAgents"));
+this.applyJava8u40Fix = 
Boolean.parseBoolean(options.getOrDefault("applyJava8u40Fix", 
Boolean.TRUE.toString()));
+
+configureKerberosFileLocation();
+

svn commit: r1709818 - in /tomcat/trunk/java/org/apache/catalina/authenticator: BasicAuthenticator.java jaspic/JaspicAuthenticator.java jaspic/LocalStrings.properties jaspic/MessageInfoImpl.java jaspi

2015-10-21 Thread remm 
Author: remm
Date: Wed Oct 21 12:44:40 2015
New Revision: 1709818

URL: http://svn.apache.org/viewvc?rev=1709818=rev
Log:
Cleanup, use the main Request type like the current authenticators and remove 
code duplication with the "classic" BASIC authenticator.

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/BasicAuthModule.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1709818=1709817=1709818=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java 
Wed Oct 21 12:44:40 2015
@@ -117,7 +117,7 @@ public class BasicAuthenticator extends
  * as per RFC 2617 section 2, and the Base64 encoded credentials as
  * per RFC 2045 section 6.8.
  */
-protected static class BasicCredentials {
+public static class BasicCredentials {
 
 // the only authentication method supported by this parser
 // note: we include single white space as its delimiter

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java?rev=1709818=1709817=1709818=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
 Wed Oct 21 12:44:40 2015
@@ -38,6 +38,7 @@ import org.apache.catalina.connector.Req
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Security valve which implements JASPIC authentication.
@@ -45,6 +46,7 @@ import org.apache.juli.logging.LogFactor
 public class JaspicAuthenticator extends AuthenticatorBase {
 
 private static final Log log = 
LogFactory.getLog(JaspicAuthenticator.class);
+protected static final StringManager sm = 
StringManager.getManager(JaspicAuthenticator.class);
 
 private static final String AUTH_TYPE = "JASPIC";
 public static final String MESSAGE_LAYER = "HttpServlet";

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties?rev=1709818=1709817=1709818=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
 Wed Oct 21 12:44:40 2015
@@ -16,3 +16,5 @@
 authenticator.jaspic.unauthorized=Cannot authenticate with the provided 
credentials
 authenticator.jaspic.unknownCallback=Unknown JASPIC callback: [{0}]
 authenticator.jaspic.unknownAuthType=Unknown authentication type: [{0}]
+authenticator.jaspic.badRequestType=Request [{0}] is not a Catalina request
+authenticator.jaspic.badResponseType=Response [{0}] is not a Servlet response
\ No newline at end of file

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java?rev=1709818=1709817=1709818=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java 
Wed Oct 21 12:44:40 2015
@@ -20,16 +20,18 @@ import java.util.HashMap;
 import java.util.Map;
 
 import javax.security.auth.message.MessageInfo;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.connector.Request;
+import org.apache.tomcat.util.res.StringManager;
 
 public class MessageInfoImpl implements MessageInfo {
+protected static final StringManager sm = 
StringManager.getManager(MessageInfoImpl.class);
+
 public static final String IS_MANDATORY = 
"javax.security.auth.message.MessagePolicy.isMandatory";
 
 private final

[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed

2015-10-21 Thread Bill Barker 
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-nio2 has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 3 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 41 mins 3 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151021-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151021.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151021-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl
 -master/dest-20151021/bin/openssl -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace

svn commit: r10877 - /release/tomcat/tomcat-7/v7.0.64/

2015-10-21 Thread violetagg 
Author: violetagg
Date: Wed Oct 21 08:13:48 2015
New Revision: 10877

Log:
Remove 7.0.64

Removed:
release/tomcat/tomcat-7/v7.0.64/


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

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

2015-10-21 Thread violetagg 
Author: violetagg
Date: Wed Oct 21 07:39:09 2015
New Revision: 1709732

URL: http://svn.apache.org/viewvc?rev=1709732=rev
Log:
Update the release date for 7.0.65

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

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1709732=1709731=1709732=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Oct 21 07:39:09 2015
@@ -84,7 +84,7 @@
 
   
 
-
+
   
 
   



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

svn commit: r1709730 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 07:38:51 2015
New Revision: 1709730

URL: http://svn.apache.org/viewvc?rev=1709730=rev
Log:
Allow more time for tests to run (primarily for Gump)
Add additional check that things have started properly.

Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1709730=1709729=1709730=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java 
Wed Oct 21 07:38:51 2015
@@ -70,6 +70,9 @@ public class TestWsWebSocketContainer ex
 private static final long TIMEOUT_MS = 5 * 1000;
 private static final long MARGIN = 500;
 
+// 5s should be plenty but Gump can be a lot slower
+private static final long START_STOP_WAIT = 60 * 1000;
+
 static {
 StringBuilder sb = new StringBuilder(4096);
 for (int i = 0; i < 4096; i++) {
@@ -898,6 +901,9 @@ public class TestWsWebSocketContainer ex
 
 Session s = connectToEchoServer(wsContainer, new EndpointA(), path);
 
+// One for the client, one for the server
+validateBackgroundProcessCount(2);
+
 StringBuilder msg = new StringBuilder();
 for (long i = 0; i < size; i++) {
 msg.append('x');
@@ -905,7 +911,7 @@ public class TestWsWebSocketContainer ex
 
 s.getBasicRemote().sendText(msg.toString());
 
-// Wait for up to 5 seconds for the client session to close
+// Wait for up to 5 seconds for the client session to open
 boolean open = s.isOpen();
 int count = 0;
 while (open != expectOpen && count < 50) {
@@ -922,21 +928,24 @@ public class TestWsWebSocketContainer ex
 s.close();
 }
 
-// Wait for up to 5 seconds for the server session to close and the
-// background process to stop
-count = 0;
-while (count < 50) {
-if (BackgroundProcessManager.getInstance().getProcessCount() == 0) 
{
+// Ensure both server and client have shutdown
+validateBackgroundProcessCount(0);
+}
+
+
+private void validateBackgroundProcessCount(int expected) throws Exception 
{
+int count = 0;
+while (count < (START_STOP_WAIT / 100)) {
+if (BackgroundProcessManager.getInstance().getProcessCount() == 
expected) {
 break;
 }
 Thread.sleep(100);
 count++;
 }
+Assert.assertEquals(expected, 
BackgroundProcessManager.getInstance().getProcessCount());
 
-Assert.assertEquals(0, 
BackgroundProcessManager.getInstance().getProcessCount());
 }
 
-
 @Test
 public void testPerMessageDefalteClient01() throws Exception {
 doTestPerMessageDefalteClient(MESSAGE_STRING_1, 1);



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

svn commit: r1709743 - in /tomcat/trunk/webapps/examples: WEB-INF/classes/async/Async0.java WEB-INF/classes/async/Async2.java jsp/async/async1.jsp jsp/async/async3.jsp

2015-10-21 Thread markt 
Author: markt
Date: Wed Oct 21 08:05:44 2015
New Revision: 1709743

URL: http://svn.apache.org/viewvc?rev=1709743=rev
Log:
Better time stamps for the async examples.

Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java
tomcat/trunk/webapps/examples/jsp/async/async1.jsp
tomcat/trunk/webapps/examples/jsp/async/async3.jsp

Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java?rev=1709743=1709742=1709743=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java Wed Oct 21 
08:05:44 2015
@@ -17,6 +17,8 @@
 package async;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import javax.servlet.AsyncContext;
 import javax.servlet.ServletException;
@@ -38,7 +40,9 @@ public class Async0 extends HttpServlet
 if (Boolean.TRUE == req.getAttribute("dispatch")) {
 log.info("Received dispatch, completing on the worker thread.");
 log.info("After complete called started:"+req.isAsyncStarted());
-resp.getWriter().write("Async dispatch 
worked:+"+System.currentTimeMillis()+"\n");
+Date date = new Date(System.currentTimeMillis());
+SimpleDateFormat sdf = new SimpleDateFormat("-MM-dd HH:mm:ss 
Z");
+resp.getWriter().write("Async dispatch worked: " + 
sdf.format(date) + "\n");
 } else {
 resp.setContentType("text/plain");
 final AsyncContext actx = req.startAsync();

Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java?rev=1709743=1709742=1709743=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java Wed Oct 21 
08:05:44 2015
@@ -17,6 +17,8 @@
 package async;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import javax.servlet.AsyncContext;
 import javax.servlet.ServletException;
@@ -34,7 +36,8 @@ public class Async2 extends HttpServlet
 private static final Log log = LogFactory.getLog(Async2.class);
 
 @Override
-protected void service(HttpServletRequest req, HttpServletResponse resp) 
throws ServletException, IOException {
+protected void service(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
 final AsyncContext actx = req.startAsync();
 actx.setTimeout(30*1000);
 Runnable run = new Runnable() {
@@ -45,7 +48,10 @@ public class Async2 extends HttpServlet
 log.info("Putting AsyncThread to sleep");
 Thread.sleep(2*1000);
 log.info("Writing data.");
-actx.getResponse().getWriter().write("Output from 
background thread. Time:"+System.currentTimeMillis()+"\n");
+Date date = new Date(System.currentTimeMillis());
+SimpleDateFormat sdf = new SimpleDateFormat("-MM-dd 
HH:mm:ss Z");
+actx.getResponse().getWriter().write(
+"Output from background thread. Time: " + 
sdf.format(date) + "\n");
 actx.complete();
 }catch (InterruptedException x) {
 log.error("Async2",x);

Modified: tomcat/trunk/webapps/examples/jsp/async/async1.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/async/async1.jsp?rev=1709743=1709742=1709743=diff
==
--- tomcat/trunk/webapps/examples/jsp/async/async1.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/async/async1.jsp Wed Oct 21 08:05:44 2015
@@ -14,13 +14,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@page session="false"%>
+<%@page session="false" import="java.util.Date,java.text.SimpleDateFormat"%>
 Output from async1.jsp
 Type is <%=request.getDispatcherType()%>
 <%
-System.out.println("Inside Async 1");
+  System.out.println("Inside Async 1");
   if (request.isAsyncStarted()) {
 request.getAsyncContext().complete();
   }
+  Date date = new Date(System.currentTimeMillis());
+  SimpleDateFormat sdf = new SimpleDateFormat("-MM-dd HH:mm:ss Z");
 %>
-Completed async request at <%=new java.sql.Date(System.currentTimeMillis())%>
\ No newline at end of file
+Completed async request at <%=sdf.format(date)%>
\ No newline at end of file

svn commit: r1709744 - in /tomcat/site/trunk: ./ docs/ xdocs/

2015-10-21 Thread violetagg 
Author: violetagg
Date: Wed Oct 21 08:06:34 2015
New Revision: 1709744

URL: http://svn.apache.org/viewvc?rev=1709744=rev
Log:
Updates (excluding docs) for 7.0.65 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-70.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-7.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1709744=1709743=1709744=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Oct 21 08:06:34 2015
@@ -37,7 +37,7 @@ tomcat.loc=http://www.apache.org/dist/to
 
 # - Tomcat versions -
 tomcat60=6.0.43
-tomcat70=7.0.64
+tomcat70=7.0.65
 tomcat80=8.0.28
 
 

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1709744=1709743=1709744=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Oct 21 08:06:34 2015
@@ -67,8 +67,8 @@
 
   
 Latest Stable 7.0.x Release
-2015-08-25
-7.0.64
+2015-10-19
+7.0.65
   
 
 

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1709744=1709743=1709744=diff
==
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Wed Oct 21 08:06:34 2015
@@ -206,7 +206,7 @@
 Quick Navigation
 
 
-[define v]7.0.64[end]
+[define v]7.0.65[end]
 https://www.apache.org/dist/tomcat/tomcat-7/KEYS;>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1709744=1709743=1709744=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Oct 21 08:06:34 2015
@@ -228,73 +228,70 @@ project logo are trademarks of the Apach
 
 
 
-
-2015-10-12 Tomcat 8.0.28 Released
+
+2015-10-19 Tomcat 7.0.65 Released
 
 
 
-The Apache Tomcat Project is proud to announce the release of version 8.0.28
-of Apache Tomcat. Apache Tomcat 8.0.28 includes fixes for issues identified in
-8.0.27 as well as other enhancements and changes. The notable changes since
-8.0.27 include:
+The Apache Tomcat Project is proud to announce the release of version 7.0.65 of
+Apache Tomcat. This release contains a number of bug fixes
+and improvements compared to version 7.0.64. The notable changes since 7.0.64
+include:
+
 
 
 
-Allow file based configuration resources (e.g. key stores) to be configured
-using URLs.
-
-Restore code signing to the Windows installer and uninstaller.
+Add a web application class loader implementation that supports the 
parallel
+loading of web application classes. Use of this feature requires a Java 7 
or
+later JRE
 
 
 
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 8
-changelog.
+Tomcat 7 changelog.
 
 
 
 
 
-Download
+Download |
+ChangeLog for 7.0.65
 
 
 
 
-
-2015-08-25 Tomcat 7.0.64 Released
+
+2015-10-12 Tomcat 8.0.28 Released
 
 
 
-The Apache Tomcat Project is proud to announce the release of version 7.0.64 of
-Apache Tomcat. This release contains a number of bug fixes
-and improvements compared to version 7.0.63. The notable changes since 7.0.63
-include:
-
+The Apache Tomcat Project is proud to announce the release of version 8.0.28
+of Apache Tomcat. Apache Tomcat 8.0.28 includes fixes for issues identified in
+8.0.27 as well as other enhancements and changes. The notable changes since
+8.0.27 include:
 
 
 
-Avoid an NPE when adding POJO WebSocket endpoints programmatically
-
-Improved handling of async timeouts
+Allow file based configuration resources (e.g. key stores) to be configured
+using URLs.
 
-Facilitate weaving by allowing ClassFileTransformer to be added to
-WebappClassLoader
+Restore code signing to the Windows installer and uninstaller.
 
 
 
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 7 changelog.
+Tomcat 8
+changelog.
 
 
 
 
 
-Download |
-ChangeLog for 7.0.64
+Download
 
 
 

Modified:

svn commit: r1709756 - in /tomcat/site/trunk/docs/tomcat-7.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

2015-10-21 Thread violetagg 
Author: violetagg
Date: Wed Oct 21 08:45:30 2015
New Revision: 1709756

URL: http://svn.apache.org/viewvc?rev=1709756=rev
Log:
Update docs for Apache Tomcat 7.0.65 release.


[This commit notification would consist of 330 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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

[ANN] Apache Tomcat 7.0.65 released

2015-10-21 Thread Violeta Georgieva 
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 7.0.65.

Apache Tomcat is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Expression Language and Java
WebSocket technologies.

This release contains a number of bug fixes and improvements compared to
version 7.0.64. The notable changes since 7.0.64 include:


- Add a web application class loader implementation that supports the
parallel
  loading of web application classes. Use of this feature requires a Java 7
or
  later JRE


Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-7.0-doc/changelog.html

Note: This version has 4 zip binaries: a generic one and
  three bundled with Tomcat native binaries for Windows operating
  systems running on different CPU architectures.

Note: Use of the Java WebSocket 1.1 implementation requires Java 7.

Note: If you use the APR/native AJP or HTTP connector you *must* upgrade
  to version 1.1.33 or later of the APR/native library.

Downloads:
http://tomcat.apache.org/download-70.cgi

Migration guides from Apache Tomcat 5.5.x and 6.0.x:
http://tomcat.apache.org/migration.html

Enjoy

The Apache Tomcat team