[Bug 58009] Trying to forward request to newly created file results in 404 The requested resource is not available.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58009 --- Comment #2 from Matt matt...@yahoo.com --- Actually, after restarting the test server I'm getting the same behavior there, so the regression is not in 8.0.10. Disabling the resource cache does fix it, but that doesn't seem to be ideal. If the file is not found in the cache, shouldn't it try to retrieve the file normally? -- 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: r1684255 - in /tomcat/trunk: java/org/apache/coyote/http2/ test/org/apache/coyote/http2/
Author: markt
Date: Mon Jun 8 19:45:12 2015
New Revision: 1684255
URL: http://svn.apache.org/r1684255
Log:
Introduce separate exceptions for stream errors and connection errors
Added:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java (with
props)
tomcat/trunk/java/org/apache/coyote/http2/StreamError.java (with props)
Modified:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
tomcat/trunk/java/org/apache/coyote/http2/FrameType.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
Added: tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java?rev=1684255view=auto
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java (added)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java Mon Jun 8
19:45:12 2015
@@ -0,0 +1,26 @@
+/*
+ * 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.coyote.http2;
+
+public class ConnectionError extends Http2Exception {
+
+private static final long serialVersionUID = 1L;
+
+public ConnectionError(String msg, int streamId, Error error) {
+super(msg, streamId, error);
+}
+}
Propchange: tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java
--
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java?rev=1684255r1=1684254r2=1684255view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java Mon Jun
8 19:45:12 2015
@@ -83,7 +83,7 @@ public class ConnectionSettings {
public void setHeaderTableSize(long headerTableSize) throws IOException {
// Need to put a sensible limit on this. Start with 16k (default is 4k)
if (headerTableSize (16 * 1024)) {
-throw new
Http2Exception(sm.getString(connectionSettings.headerTableSizeLimit,
+throw new
ConnectionError(sm.getString(connectionSettings.headerTableSizeLimit,
Long.toString(headerTableSize)), 0, Error.PROTOCOL_ERROR);
}
this.headerTableSize = (int) headerTableSize;
@@ -97,7 +97,7 @@ public class ConnectionSettings {
// Can't be less than zero since the result of the byte-long
conversion
// will never be negative
if (enablePush 1) {
-throw new
Http2Exception(sm.getString(connectionSettings.enablePushInvalid,
+throw new
ConnectionError(sm.getString(connectionSettings.enablePushInvalid,
Long.toString(enablePush)), 0, Error.PROTOCOL_ERROR);
}
this.enablePush = (enablePush == 1);
@@ -117,7 +117,7 @@ public class ConnectionSettings {
}
public void setInitialWindowSize(long initialWindowSize) throws
IOException {
if (initialWindowSize MAX_WINDOW_SIZE) {
-throw new
Http2Exception(sm.getString(connectionSettings.windowSizeTooBig,
+throw new
ConnectionError(sm.getString(connectionSettings.windowSizeTooBig,
Long.toString(initialWindowSize),
Long.toString(MAX_WINDOW_SIZE)),
0, Error.PROTOCOL_ERROR);
}
@@ -130,7 +130,7 @@ public class ConnectionSettings {
}
public void setMaxFrameSize(long maxFrameSize) throws IOException {
if (maxFrameSize MIN_MAX_FRAME_SIZE || maxFrameSize
MAX_MAX_FRAME_SIZE) {
-throw new
Http2Exception(sm.getString(connectionSettings.maxFrameSizeInvalid,
+throw new
svn commit: r1684233 - in /tomcat/trunk: java/org/apache/coyote/http2/ test/org/apache/coyote/http2/
Author: markt
Date: Mon Jun 8 17:57:05 2015
New Revision: 1684233
URL: http://svn.apache.org/r1684233
Log:
Rename ErrorCode - Error
Added:
tomcat/trunk/java/org/apache/coyote/http2/Error.java
- copied, changed from r1683410,
tomcat/trunk/java/org/apache/coyote/http2/ErrorCode.java
Removed:
tomcat/trunk/java/org/apache/coyote/http2/ErrorCode.java
Modified:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
tomcat/trunk/java/org/apache/coyote/http2/FrameType.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java?rev=1684233r1=1684232r2=1684233view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java Mon Jun
8 17:57:05 2015
@@ -84,7 +84,7 @@ public class ConnectionSettings {
// Need to put a sensible limit on this. Start with 16k (default is 4k)
if (headerTableSize (16 * 1024)) {
throw new
Http2Exception(sm.getString(connectionSettings.headerTableSizeLimit,
-Long.toString(headerTableSize)), 0,
ErrorCode.PROTOCOL_ERROR);
+Long.toString(headerTableSize)), 0, Error.PROTOCOL_ERROR);
}
this.headerTableSize = (int) headerTableSize;
}
@@ -98,7 +98,7 @@ public class ConnectionSettings {
// will never be negative
if (enablePush 1) {
throw new
Http2Exception(sm.getString(connectionSettings.enablePushInvalid,
-Long.toString(enablePush)), 0, ErrorCode.PROTOCOL_ERROR);
+Long.toString(enablePush)), 0, Error.PROTOCOL_ERROR);
}
this.enablePush = (enablePush == 1);
}
@@ -119,7 +119,7 @@ public class ConnectionSettings {
if (initialWindowSize MAX_WINDOW_SIZE) {
throw new
Http2Exception(sm.getString(connectionSettings.windowSizeTooBig,
Long.toString(initialWindowSize),
Long.toString(MAX_WINDOW_SIZE)),
-0, ErrorCode.PROTOCOL_ERROR);
+0, Error.PROTOCOL_ERROR);
}
this.initialWindowSize = (int) initialWindowSize;
}
@@ -132,7 +132,7 @@ public class ConnectionSettings {
if (maxFrameSize MIN_MAX_FRAME_SIZE || maxFrameSize
MAX_MAX_FRAME_SIZE) {
throw new
Http2Exception(sm.getString(connectionSettings.maxFrameSizeInvalid,
Long.toString(maxFrameSize),
Integer.toString(MIN_MAX_FRAME_SIZE),
-Integer.toString(MAX_MAX_FRAME_SIZE)), 0,
ErrorCode.PROTOCOL_ERROR);
+Integer.toString(MAX_MAX_FRAME_SIZE)), 0,
Error.PROTOCOL_ERROR);
}
this.maxFrameSize = (int) maxFrameSize;
}
Copied: tomcat/trunk/java/org/apache/coyote/http2/Error.java (from r1683410,
tomcat/trunk/java/org/apache/coyote/http2/ErrorCode.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Error.java?p2=tomcat/trunk/java/org/apache/coyote/http2/Error.javap1=tomcat/trunk/java/org/apache/coyote/http2/ErrorCode.javar1=1683410r2=1684233rev=1684233view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ErrorCode.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Error.java Mon Jun 8 17:57:05
2015
@@ -16,7 +16,7 @@
*/
package org.apache.coyote.http2;
-public enum ErrorCode {
+public enum Error {
NO_ERROR(0x00),
PROTOCOL_ERROR (0x01),
@@ -33,21 +33,21 @@ public enum ErrorCode {
INADEQUATE_SECURITY (0x0c),
HTTP_1_1_REQUIRED (0x0d);
-private final long errorCode;
+private final long code;
-private ErrorCode(long errorCode) {
-this.errorCode = errorCode;
+private Error(long code) {
+this.code = code;
}
-public long getErrorCode() {
-return errorCode;
+public long getCode() {
+return code;
}
-public byte[] getErrorCodeBytes() {
-byte[] errorCodeByte = new byte[4];
-ByteUtil.setFourBytes(errorCodeByte, 0, errorCode);
-return errorCodeByte;
+public byte[] getCodeBytes() {
+byte[] codeByte = new byte[4];
+ByteUtil.setFourBytes(codeByte, 0, code);
+return codeByte;
}
}
Modified:
svn commit: r1684258 - in /tomcat/trunk: java/org/apache/coyote/http2/ test/org/apache/coyote/http2/
Author: markt
Date: Mon Jun 8 19:51:30 2015
New Revision: 1684258
URL: http://svn.apache.org/r1684258
Log:
Remove stream ID from Http2Exception (simpler logging of this to follow)
Modified:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
tomcat/trunk/java/org/apache/coyote/http2/FrameType.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/StreamError.java
tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java?rev=1684258r1=1684257r2=1684258view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionError.java Mon Jun 8
19:51:30 2015
@@ -20,7 +20,7 @@ public class ConnectionError extends Htt
private static final long serialVersionUID = 1L;
-public ConnectionError(String msg, int streamId, Error error) {
-super(msg, streamId, error);
+public ConnectionError(String msg, Error error) {
+super(msg, error);
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java?rev=1684258r1=1684257r2=1684258view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java Mon Jun
8 19:51:30 2015
@@ -16,8 +16,6 @@
*/
package org.apache.coyote.http2;
-import java.io.IOException;
-
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -44,7 +42,7 @@ public class ConnectionSettings {
private volatile int maxFrameSize = DEFAULT_MAX_FRAME_SIZE;
private volatile long maxHeaderListSize = UNLIMITED;
-public void set(int parameterId, long value) throws IOException {
+public void set(int parameterId, long value) throws ConnectionError {
if (log.isDebugEnabled()) {
log.debug(sm.getString(connectionSettings.debug,
Integer.toString(parameterId), Long.toString(value)));
@@ -80,11 +78,11 @@ public class ConnectionSettings {
public int getHeaderTableSize() {
return headerTableSize;
}
-public void setHeaderTableSize(long headerTableSize) throws IOException {
+public void setHeaderTableSize(long headerTableSize) throws
ConnectionError {
// Need to put a sensible limit on this. Start with 16k (default is 4k)
if (headerTableSize (16 * 1024)) {
throw new
ConnectionError(sm.getString(connectionSettings.headerTableSizeLimit,
-Long.toString(headerTableSize)), 0, Error.PROTOCOL_ERROR);
+Long.toString(headerTableSize)), Error.PROTOCOL_ERROR);
}
this.headerTableSize = (int) headerTableSize;
}
@@ -93,12 +91,12 @@ public class ConnectionSettings {
public boolean getEnablePush() {
return enablePush;
}
-public void setEnablePush(long enablePush) throws IOException {
+public void setEnablePush(long enablePush) throws ConnectionError {
// Can't be less than zero since the result of the byte-long
conversion
// will never be negative
if (enablePush 1) {
throw new
ConnectionError(sm.getString(connectionSettings.enablePushInvalid,
-Long.toString(enablePush)), 0, Error.PROTOCOL_ERROR);
+Long.toString(enablePush)), Error.PROTOCOL_ERROR);
}
this.enablePush = (enablePush == 1);
}
@@ -115,11 +113,11 @@ public class ConnectionSettings {
public int getInitialWindowSize() {
return initialWindowSize;
}
-public void setInitialWindowSize(long initialWindowSize) throws
IOException {
+public void setInitialWindowSize(long initialWindowSize) throws
ConnectionError {
if (initialWindowSize MAX_WINDOW_SIZE) {
throw new
ConnectionError(sm.getString(connectionSettings.windowSizeTooBig,
Long.toString(initialWindowSize),
Long.toString(MAX_WINDOW_SIZE)),
-0, Error.PROTOCOL_ERROR);
+Error.PROTOCOL_ERROR);
}
this.initialWindowSize = (int) initialWindowSize;
}
@@ -128,11 +126,11 @@ public class ConnectionSettings {
svn commit: r1684271 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2UpgradeHandler.java LocalStrings.properties Stream.java
Author: markt
Date: Mon Jun 8 20:32:34 2015
New Revision: 1684271
URL: http://svn.apache.org/r1684271
Log:
Implement stream closure on StreamError
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1684271r1=1684270r2=1684271view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Jun
8 20:32:34 2015
@@ -338,8 +338,32 @@ public class Http2UpgradeHandler extends
}
-private void closeStream(StreamError se) {
-// TODO
+private void closeStream(StreamError se) throws IOException {
+
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(upgradeHandler.rst.debug, connectionId,
+Integer.toString(se.getStreamId()), se.getError()));
+}
+
+Stream stream = getStream(se.getStreamId());
+stream.sendRst();
+
+// Write a RST frame
+byte[] rstFrame = new byte[13];
+// Length
+ByteUtil.setThreeBytes(rstFrame, 0, 4);
+// Type
+rstFrame[3] = FrameType.RST.getIdByte();
+// No flags
+// Stream ID
+ByteUtil.set31Bits(rstFrame, 5, se.getStreamId());
+// Payload
+ByteUtil.setFourBytes(rstFrame, 9, se.getError().getCode());
+
+synchronized (socketWrapper) {
+socketWrapper.write(true, rstFrame, 0, rstFrame.length);
+socketWrapper.flush(true);
+}
}
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=1684271r1=1684270r2=1684271view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Mon Jun
8 20:32:34 2015
@@ -63,6 +63,7 @@ streamProcessor.httpupgrade.notsupported
streamStateMachine.debug.change=Connection [{0}], Stream [{1}], State changed
from [{2}] to [{3}]
streamStateMachine.invalidFrame=Connection [{0}], Stream [{1}], State [{2}],
Frame type [{3}]
+upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], RST
(closing stream)
upgradeHandler.goaway.debug=Connection [{0}], Goaway, Last stream [{1}], Error
code [{2}], Debug data [{3}]
upgradeHandler.init=Connection [{0}]
upgradeHandler.ioerror=Connection [{0}]
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=1684271r1=1684270r2=1684271view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Mon Jun 8 20:32:34
2015
@@ -255,6 +255,11 @@ public class Stream extends AbstractStre
}
+void sendRst() {
+state.sendReset();
+}
+
+
class StreamOutputBuffer implements OutputBuffer {
private final ByteBuffer buffer = ByteBuffer.allocate(8 * 1024);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684280 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Author: markt Date: Mon Jun 8 21:10:46 2015 New Revision: 1684280 URL: http://svn.apache.org/r1684280 Log: Remove unused import Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1684280r1=1684279r2=1684280view=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Mon Jun 8 21:10:46 2015 @@ -54,7 +54,6 @@ import org.apache.juli.logging.LogFactor import org.apache.tomcat.util.res.StringManager; import org.apache.tomcat.websocket.WsSession; import org.apache.tomcat.websocket.WsWebSocketContainer; -import org.apache.tomcat.websocket.pojo.PojoEndpointServer; import org.apache.tomcat.websocket.pojo.PojoMethodMapping; /** - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1343 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1684277 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1344 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1684280 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: r1684283 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Author: markt
Date: Mon Jun 8 21:30:19 2015
New Revision: 1684283
URL: http://svn.apache.org/r1684283
Log:
Fix header writing bug
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1684283r1=1684282r2=1684283view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Jun
8 21:30:19 2015
@@ -414,6 +414,7 @@ public class Http2UpgradeHandler extends
target.flip();
ByteUtil.setThreeBytes(header, 0, target.limit());
if (first) {
+first = false;
header[3] = FrameType.HEADERS.getIdByte();
if (stream.getOutputBuffer().hasNoBody()) {
header[4] = FLAG_END_OF_STREAM;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684273 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
Author: markt
Date: Mon Jun 8 20:44:21 2015
New Revision: 1684273
URL: http://svn.apache.org/r1684273
Log:
A couple more tests
Added:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java (with
props)
Added: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java?rev=1684273view=auto
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java (added)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java Mon Jun
8 20:44:21 2015
@@ -0,0 +1,93 @@
+/*
+ * 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.coyote.http2;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Unit tests for Section 4.2 of
+ * a href=https://tools.ietf.org/html/rfc7540;RFC 7540/a.
+ * br
+ * The order of tests in this class is aligned with the order of the
+ * requirements in the RFC.
+ */
+public class TestHttp2Section_4_2 extends Http2TestBase {
+
+// TODO Exceeds SETTINGS_MAX_FRAME_SIZE
+
+@Test
+public void testFrameTypeLimitsTooBig() throws Exception {
+hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
+
+// HTTP2 upgrade
+http2Connect();
+
+// Overly large ping
+byte[] ping = new byte[109];
+
+// Header
+// Length
+ByteUtil.setThreeBytes(ping, 0, 100);
+// Type
+ping[3] = FrameType.PING.getIdByte();
+// No flags
+// Stream 0
+// Empty payload
+
+os.write(ping);
+
+// Read GOAWAY frame
+parser.readFrame(true);
+
+Assert.assertTrue(output.getTrace(),
+output.getTrace().startsWith(0-Goaway-[2147483647]-[ +
+Error.FRAME_SIZE_ERROR.getCode() + ]-[));
+}
+
+
+@Test
+public void testFrameTypeLimitsTooSmall() throws Exception {
+hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
+
+// HTTP2 upgrade
+http2Connect();
+
+// Overly large ping
+byte[] ping = new byte[9];
+
+// Header
+// Length 0
+// Type
+ping[3] = FrameType.PING.getIdByte();
+// No flags
+// Stream 0
+// Empty payload
+
+os.write(ping);
+
+// Read GOAWAY frame
+parser.readFrame(true);
+
+Assert.assertTrue(output.getTrace(),
+output.getTrace().startsWith(0-Goaway-[2147483647]-[ +
+Error.FRAME_SIZE_ERROR.getCode() + ]-[));
+}
+
+
+// TODO Test connection vs stream error on a stream other than zero
+}
Propchange: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684279 - in /tomcat/trunk: java/org/apache/coyote/http2/ByteUtil.java test/org/apache/coyote/http2/TestHttp2Section_4_2.java
Author: markt
Date: Mon Jun 8 21:07:38 2015
New Revision: 1684279
URL: http://svn.apache.org/r1684279
Log:
Add a test for exceeding the maximum frame size
Modified:
tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java?rev=1684279r1=1684278r2=1684279view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java Mon Jun 8 21:07:38
2015
@@ -61,6 +61,12 @@ public class ByteUtil {
}
+public static void setTwoBytes(byte[] output, int firstByte, int value) {
+output[firstByte] = (byte) ((value 0xFF00) 8);
+output[firstByte + 1] = (byte) (value 0xFF);
+}
+
+
public static void setThreeBytes(byte[] output, int firstByte, int value) {
output[firstByte] = (byte) ((value 0xFF) 16);
output[firstByte + 1] = (byte) ((value 0xFF00) 8);
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java?rev=1684279r1=1684278r2=1684279view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java Mon Jun
8 21:07:38 2015
@@ -28,7 +28,42 @@ import org.junit.Test;
*/
public class TestHttp2Section_4_2 extends Http2TestBase {
-// TODO Exceeds SETTINGS_MAX_FRAME_SIZE
+@Test
+public void testFrameSizeLimitsTooBig() throws Exception {
+hpackEncoder = new
HpackEncoder(ConnectionSettings.DEFAULT_HEADER_TABLE_SIZE);
+
+// HTTP2 upgrade
+http2Connect();
+
+// Overly large settings
+// Settings have to be a multiple of six
+int settingsCount = (ConnectionSettings.DEFAULT_MAX_FRAME_SIZE / 6) +
1;
+int size = settingsCount * 6;
+byte[] settings = new byte[size + 9];
+// Header
+// Length
+ByteUtil.setThreeBytes(settings, 0, size);
+// Type
+settings[3] = FrameType.SETTINGS.getIdByte();
+// No flags
+// Stream 0
+
+// payload
+for (int i = 0; i settingsCount; i++) {
+// Enable server push over and over again
+ByteUtil.setTwoBytes(settings, (i * 6) + 9, 2);
+ByteUtil.setFourBytes(settings, (i * 6) + 9 + 2, 1);
+}
+
+os.write(settings);
+
+// Read GOAWAY frame
+parser.readFrame(true);
+
+Assert.assertTrue(output.getTrace(),
+output.getTrace().startsWith(0-Goaway-[2147483647]-[ +
+Error.FRAME_SIZE_ERROR.getCode() + ]-[));
+}
@Test
public void testFrameTypeLimitsTooBig() throws Exception {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684266 - in /tomcat/trunk/java/org/apache/coyote/http2: FrameType.java Http2Parser.java Http2UpgradeHandler.java LocalStrings.properties StreamError.java StreamStateMachine.java
Author: markt
Date: Mon Jun 8 20:11:36 2015
New Revision: 1684266
URL: http://svn.apache.org/r1684266
Log:
StreamError needs the stream ID (so we know which stream to close)
Modified:
tomcat/trunk/java/org/apache/coyote/http2/FrameType.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/StreamError.java
tomcat/trunk/java/org/apache/coyote/http2/StreamStateMachine.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/FrameType.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/FrameType.java?rev=1684266r1=1684265r2=1684266view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/FrameType.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/FrameType.java Mon Jun 8
20:11:36 2015
@@ -56,22 +56,18 @@ public enum FrameType {
}
-public void checkStream(String connectionId, int streamId) throws
Http2Exception {
-if (streamId == 0 !streamZero) {
-throw new
ConnectionError(sm.getString(frameType.checkStream.invalidForZero,
-connectionId, this), Error.PROTOCOL_ERROR);
-} else if (streamId != 0 !streamNonZero) {
-throw new
ConnectionError(sm.getString(frameType.checkStream.invalidForNonZero,
-connectionId, Integer.valueOf(streamId), this),
Error.PROTOCOL_ERROR);
+public void checkStream(int streamId) throws Http2Exception {
+if (streamId == 0 !streamZero || streamId != 0 !streamNonZero) {
+throw new ConnectionError(sm.getString(frameType.checkStream,
this),
+Error.PROTOCOL_ERROR);
}
}
-public void checkPayloadSize(String connectionId, int streamId, int
payloadSize)
-throws Http2Exception {
+public void checkPayloadSize(int payloadSize) throws Http2Exception {
if (payloadSizeValidator != null
!payloadSizeValidator.test(payloadSize)) {
throw new
ConnectionError(sm.getString(frameType.checkPayloadSize,
-connectionId, Integer.toString(streamId), this,
Integer.toString(payloadSize)),
+Integer.toString(payloadSize), this),
Error.FRAME_SIZE_ERROR);
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1684266r1=1684265r2=1684266view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Jun 8
20:11:36 2015
@@ -86,9 +86,8 @@ class Http2Parser {
try {
validateFrame(expected, frameType, streamId, flags, payloadSize);
} catch (StreamError se) {
-// TODO debug log
swallow(payloadSize);
-return true;
+throw se;
}
switch (frameType) {
@@ -313,7 +312,7 @@ class Http2Parser {
} else {
throw new StreamError(
sm.getString(http2Parser.processFrameWindowUpdate.invalidIncrement),
-Error.PROTOCOL_ERROR);
+Error.PROTOCOL_ERROR, streamId);
}
}
@@ -413,7 +412,7 @@ class Http2Parser {
if (expected != null frameType != expected) {
throw new
StreamError(sm.getString(http2Parser.processFrame.unexpectedType,
-expected, frameType), Error.PROTOCOL_ERROR);
+expected, frameType), Error.PROTOCOL_ERROR, streamId);
}
if (payloadSize maxPayloadSize) {
@@ -435,8 +434,8 @@ class Http2Parser {
}
}
-frameType.checkStream(connectionId, streamId);
-frameType.checkPayloadSize(connectionId, streamId, payloadSize);
+frameType.checkStream(streamId);
+frameType.checkPayloadSize(payloadSize);
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1684266r1=1684265r2=1684266view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Jun
8 20:11:36 2015
@@ -172,7 +172,7 @@ public class Http2UpgradeHandler extends
String base64Settings =
stream.getCoyoteRequest().getHeader(HTTP2_SETTINGS_HEADER);
byte[] settings = Base64.decodeBase64(base64Settings);
svn commit: r1684277 - in /tomcat/trunk: java/org/apache/coyote/http2/FrameType.java java/org/apache/coyote/http2/Http2Parser.java java/org/apache/coyote/http2/Http2UpgradeHandler.java test/org/apache
Author: markt
Date: Mon Jun 8 20:53:39 2015
New Revision: 1684277
URL: http://svn.apache.org/r1684277
Log:
Invalid priority length is only a stream error
Modified:
tomcat/trunk/java/org/apache/coyote/http2/FrameType.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/FrameType.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/FrameType.java?rev=1684277r1=1684276r2=1684277view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/FrameType.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/FrameType.java Mon Jun 8
20:53:39 2015
@@ -22,17 +22,17 @@ import org.apache.tomcat.util.res.String
public enum FrameType {
-DATA (0, false, true, null),
-HEADERS (1, false, true, null),
-PRIORITY (2, false, true, (x) - x == 5),
-RST (3, false, true, (x) - x == 4),
-SETTINGS (4,true, false, (x) - x % 6 == 0),
-PUSH_PROMISE (5, false, true, (x) - x = 4),
-PING (6,true, false, (x) - x == 8),
-GOAWAY(7,true, false, (x) - x = 8),
-WINDOW_UPDATE (8,true, true, (x) - x == 4),
-CONTINUATION (9, false, true, null),
-UNKNOWN (256, true, true, null);
+DATA (0, false, true, null, false),
+HEADERS (1, false, true, null, true),
+PRIORITY (2, false, true, (x) - x == 5, false),
+RST (3, false, true, (x) - x == 4, false),
+SETTINGS (4,true, false, (x) - x % 6 == 0, true),
+PUSH_PROMISE (5, false, true, (x) - x = 4, true),
+PING (6,true, false, (x) - x == 8, false),
+GOAWAY(7,true, false, (x) - x = 8, false),
+WINDOW_UPDATE (8,true, true, (x) - x == 4, false),
+CONTINUATION (9, false, true, null, true),
+UNKNOWN (256, true, true, null, false);
private static final StringManager sm =
StringManager.getManager(FrameType.class);
@@ -40,14 +40,16 @@ public enum FrameType {
private final boolean streamZero;
private final boolean streamNonZero;
private final IntPredicate payloadSizeValidator;
+private final boolean payloadErrorFatal;
private FrameType(int id, boolean streamZero, boolean streamNonZero,
-IntPredicate payloadSizeValidator) {
+IntPredicate payloadSizeValidator, boolean payloadErrorFatal) {
this.id = id;
this.streamZero = streamZero;
this.streamNonZero = streamNonZero;
this.payloadSizeValidator = payloadSizeValidator;
+this.payloadErrorFatal = payloadErrorFatal;
}
@@ -64,11 +66,17 @@ public enum FrameType {
}
-public void checkPayloadSize(int payloadSize) throws Http2Exception {
+public void checkPayloadSize(int streamId, int payloadSize) throws
Http2Exception {
if (payloadSizeValidator != null
!payloadSizeValidator.test(payloadSize)) {
-throw new
ConnectionError(sm.getString(frameType.checkPayloadSize,
-Integer.toString(payloadSize), this),
-Error.FRAME_SIZE_ERROR);
+if (payloadErrorFatal) {
+throw new
ConnectionError(sm.getString(frameType.checkPayloadSize,
+Integer.toString(payloadSize), this),
+Error.FRAME_SIZE_ERROR);
+} else {
+throw new
StreamError(sm.getString(frameType.checkPayloadSize,
+Integer.toString(payloadSize), this),
+Error.FRAME_SIZE_ERROR, streamId);
+}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1684277r1=1684276r2=1684277view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Jun 8
20:53:39 2015
@@ -435,7 +435,7 @@ class Http2Parser {
}
frameType.checkStream(streamId);
-frameType.checkPayloadSize(payloadSize);
+frameType.checkPayloadSize(streamId, payloadSize);
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1684277r1=1684276r2=1684277view=diff
==
---
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 49 mins 37 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150608-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150608/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150608.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150608-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-1.0.2/dest-20150608/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv
[Bug 58010] Class file are not getting compiled with debuginfo while setting classdebuginfo in jasper ant task
https://bz.apache.org/bugzilla/show_bug.cgi?id=58010 Joshua C Rebelo joshua.reb...@gmail.com changed: What|Removed |Added CC||joshua.reb...@gmail.com OS||All -- 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: r1684150 - /tomcat/trunk/res/checkstyle/javax-import-control.xml
Author: markt Date: Mon Jun 8 11:21:30 2015 New Revision: 1684150 URL: http://svn.apache.org/r1684150 Log: Fix disallowed imports Modified: tomcat/trunk/res/checkstyle/javax-import-control.xml Modified: tomcat/trunk/res/checkstyle/javax-import-control.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/javax-import-control.xml?rev=1684150r1=1684149r2=1684150view=diff == --- tomcat/trunk/res/checkstyle/javax-import-control.xml (original) +++ tomcat/trunk/res/checkstyle/javax-import-control.xml Mon Jun 8 11:21:30 2015 @@ -36,6 +36,27 @@ subpackage name=persistence allow pkg=javax.persistence/ /subpackage + subpackage name=security +subpackage name=auth + subpackage name=message +allow pkg=javax.crypto / +allow class=javax.security.auth.Subject/ +allow pkg=javax.security.auth.callback/ +allow pkg=javax.security.auth.login/ +allow pkg=javax.security.auth.x500/ +disallow pkg=javax.security.auth.message.callback local-only=true/ +disallow pkg=javax.security.auth.message.config local-only=true/ +disallow pkg=javax.security.auth.message.module local-only=true/ +subpackage name=config +allow class=javax.security.auth.AuthPermission/ + allow pkg=javax.security.auth.message/ +/subpackage +subpackage name=module + allow pkg=javax.security.auth.message/ +/subpackage + /subpackage +/subpackage + /subpackage subpackage name=servlet allow pkg=javax.servlet/ disallow pkg=javax.servlet.jsp local-only=true/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684155 - /tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Author: markt
Date: Mon Jun 8 11:27:10 2015
New Revision: 1684155
URL: http://svn.apache.org/r1684155
Log:
Fix compilation error (will need review w.r.t. what the spec expects here)
based on pull request 21 from fjodorver.
Modified:
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Modified:
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java?rev=1684155r1=1684154r2=1684155view=diff
==
--- tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
(original)
+++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Mon Jun 8 11:27:10 2015
@@ -62,7 +62,9 @@ public abstract class AuthConfigFactory
.doPrivileged(new
java.security.PrivilegedExceptionAction() {
public Object run() throws ClassNotFoundException,
InstantiationException,
IllegalAccessException {
-return
ProviderLocator.loadClass(finalClassName, this.getClass(),
contextClassLoader).newInstance();
+// TODO Review this
+Class clazz = Class.forName(finalClassName,
true, contextClassLoader);
+return clazz.newInstance();
}
});
} catch (PrivilegedActionException e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684143 - in /tomcat/trunk/java/javax/security: ./ auth/
Author: markt Date: Mon Jun 8 10:55:57 2015 New Revision: 1684143 URL: http://svn.apache.org/r1684143 Log: Create package ready to copy in JASPIC API from Geronimo Added: tomcat/trunk/java/javax/security/ tomcat/trunk/java/javax/security/auth/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684148 - in /tomcat/trunk/java/javax/security/auth/message/config: AuthConfig.java AuthConfigFactory.java
Author: markt Date: Mon Jun 8 11:09:28 2015 New Revision: 1684148 URL: http://svn.apache.org/r1684148 Log: Remove unused imports Modified: tomcat/trunk/java/javax/security/auth/message/config/AuthConfig.java tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java Modified: tomcat/trunk/java/javax/security/auth/message/config/AuthConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfig.java?rev=1684148r1=1684147r2=1684148view=diff == --- tomcat/trunk/java/javax/security/auth/message/config/AuthConfig.java (original) +++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfig.java Mon Jun 8 11:09:28 2015 @@ -16,7 +16,6 @@ */ package javax.security.auth.message.config; -import javax.security.auth.message.AuthException; import javax.security.auth.message.MessageInfo; /** Modified: tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java?rev=1684148r1=1684147r2=1684148view=diff == --- tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java (original) +++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java Mon Jun 8 11:09:28 2015 @@ -20,9 +20,6 @@ import java.security.PrivilegedActionExc import java.util.Map; import javax.security.auth.AuthPermission; -import javax.security.auth.message.AuthException; - -import org.apache.geronimo.osgi.locator.ProviderLocator; /** * @version $Rev$ $Date$ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684146 - in /tomcat/trunk/java/javax/security/auth/message: callback/ config/ module/
Author: markt Date: Mon Jun 8 11:08:18 2015 New Revision: 1684146 URL: http://svn.apache.org/r1684146 Log: Fix import order issues Modified: tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java tomcat/trunk/java/javax/security/auth/message/callback/TrustStoreCallback.java tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java Modified: tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java?rev=1684146r1=1684145r2=1684146view=diff == --- tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java (original) +++ tomcat/trunk/java/javax/security/auth/message/callback/CallerPrincipalCallback.java Mon Jun 8 11:08:18 2015 @@ -16,9 +16,10 @@ */ package javax.security.auth.message.callback; +import java.security.Principal; + import javax.security.auth.Subject; import javax.security.auth.callback.Callback; -import java.security.Principal; /** * Callback that enables an authentication module to inform the runtime of the call principal or name of the caller principal. Modified: tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java?rev=1684146r1=1684145r2=1684146view=diff == --- tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java (original) +++ tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java Mon Jun 8 11:08:18 2015 @@ -16,9 +16,10 @@ */ package javax.security.auth.message.callback; -import javax.security.auth.callback.Callback; import java.security.cert.CertStore; +import javax.security.auth.callback.Callback; + /** * Callback that enables a runtime to inform authentication modules of the CertStore to use. * Modified: tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java?rev=1684146r1=1684145r2=1684146view=diff == --- tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java (original) +++ tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java Mon Jun 8 11:08:18 2015 @@ -16,10 +16,11 @@ */ package javax.security.auth.message.callback; -import javax.security.auth.callback.Callback; +import java.util.Arrays; + import javax.security.auth.Subject; +import javax.security.auth.callback.Callback; -import java.util.Arrays; /** * Callback that enables an authentication module to supply a username and password (to a runtime?) and determine if Modified: tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java?rev=1684146r1=1684145r2=1684146view=diff == --- tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java (original) +++ tomcat/trunk/java/javax/security/auth/message/callback/PrivateKeyCallback.java Mon Jun 8 11:08:18 2015 @@ -16,13 +16,13 @@ */ package javax.security.auth.message.callback; -import javax.security.auth.callback.Callback; -import javax.security.auth.x500.X500Principal; - import java.math.BigInteger; import java.security.PrivateKey; import java.security.cert.Certificate; +import javax.security.auth.callback.Callback; +import javax.security.auth.x500.X500Principal; + /** * Callback that enables an authentication module to request a certificate chain and private key from the runtime. * The information specifying the chain and key may be an alias, a digest, a subject key, or an issuer ID. Modified: tomcat/trunk/java/javax/security/auth/message/callback/SecretKeyCallback.java URL:
[GUMP@vmgump]: Project tomcat-tc8.0.x-validate (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-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-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 2 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.8-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] 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.8-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150608.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/apache-commons/lang/target/commons-lang3-3.5-SNAPSHOT.ja r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150608.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150608.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.8-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle [taskdef] Could not load definitions from resource checkstyletask.properties. It could not be found. BUILD FAILED /srv/gump/public/workspace/tomcat-8.0.x/build.xml:537: Problem: failed to create task or type checkstyle Cause: The name is undefined. Action: Check the spelling. Action: Check that any custom tasks/types have been declared. Action: Check that any presetdef/macrodef declarations have taken place. Total time: 1 second - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20150608060020, vmgump.apache.org:vmgump:20150608060020 Gump E-mail Identifier (unique within run) #2. -- 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-tc7.0.x-validate (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-validate : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-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-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 4 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.8-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] 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.8-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150608.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/apache-commons/lang/target/commons-lang3-3.5-SNAPSHOT.ja r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150608.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150608.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.8-SNAPSHOT.jar downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle [taskdef] Could not load definitions from resource checkstyletask.properties. It could not be found. BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:526: Problem: failed to create task or type checkstyle Cause: The name is undefined. Action: Check the spelling. Action: Check that any custom tasks/types have been declared. Action: Check that any presetdef/macrodef declarations have taken place. Total time: 2 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20150608060020, vmgump.apache.org:vmgump:20150608060020 Gump E-mail Identifier (unique within run) #1. -- 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-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-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 sec Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.8-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.8-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150608.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/apache-commons/lang/target/commons-lang3-3.5-SNAPSHOT.ja r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150608.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150608.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.8-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [taskdef] Could not load definitions from resource checkstyletask.properties. It could not be found. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:537: Problem: failed to create task or type checkstyle Cause: The name is undefined. Action: Check the spelling. Action: Check that any custom tasks/types have been declared. Action: Check that any presetdef/macrodef declarations have taken place. Total time: 1 second - 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 20150608060020, vmgump.apache.org:vmgump:20150608060020 Gump E-mail Identifier (unique within run) #3. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684145 - in /tomcat/trunk/java/javax/security/auth/message: AuthException.java callback/CertStoreCallback.java callback/GroupPrincipalCallback.java callback/PasswordValidationCallback.ja
Author: markt
Date: Mon Jun 8 11:01:48 2015
New Revision: 1684145
URL: http://svn.apache.org/r1684145
Log:
Fix trailing whitespace issues
Modified:
tomcat/trunk/java/javax/security/auth/message/AuthException.java
tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java
tomcat/trunk/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java
Modified: tomcat/trunk/java/javax/security/auth/message/AuthException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/AuthException.java?rev=1684145r1=1684144r2=1684145view=diff
==
--- tomcat/trunk/java/javax/security/auth/message/AuthException.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/AuthException.java Mon Jun 8
11:01:48 2015
@@ -23,7 +23,7 @@ import javax.security.auth.login.LoginEx
*/
public class AuthException extends LoginException {
private static final long serialVersionUID = -1156951780670243758L;
-
+
public AuthException() {
}
Modified:
tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java?rev=1684145r1=1684144r2=1684145view=diff
==
---
tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java
(original)
+++
tomcat/trunk/java/javax/security/auth/message/callback/CertStoreCallback.java
Mon Jun 8 11:01:48 2015
@@ -21,7 +21,7 @@ import java.security.cert.CertStore;
/**
* Callback that enables a runtime to inform authentication modules of the
CertStore to use.
- *
+ *
* @version $Rev$ $Date$
*/
public class CertStoreCallback implements Callback {
Modified:
tomcat/trunk/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/GroupPrincipalCallback.java?rev=1684145r1=1684144r2=1684145view=diff
==
---
tomcat/trunk/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
(original)
+++
tomcat/trunk/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
Mon Jun 8 11:01:48 2015
@@ -21,7 +21,7 @@ import javax.security.auth.callback.Call
/**
* Callback that enables an authentication module to inform the runtime of the
groups a user is in.
- *
+ *
* @version $Rev$ $Date$
*/
public class GroupPrincipalCallback implements Callback {
Modified:
tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java?rev=1684145r1=1684144r2=1684145view=diff
==
---
tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java
(original)
+++
tomcat/trunk/java/javax/security/auth/message/callback/PasswordValidationCallback.java
Mon Jun 8 11:01:48 2015
@@ -24,7 +24,7 @@ import java.util.Arrays;
/**
* Callback that enables an authentication module to supply a username and
password (to a runtime?) and determine if
* the result of validation.
- *
+ *
* @version $Rev$ $Date$
*/
public class PasswordValidationCallback implements Callback {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58010] New: Class file are not getting compiled with debuginfo while setting classdebuginfo in jasper ant task
https://bz.apache.org/bugzilla/show_bug.cgi?id=58010
Bug ID: 58010
Summary: Class file are not getting compiled with debuginfo
while setting classdebuginfo in jasper ant task
Product: Tomcat 7
Version: 7.0.55
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: vasa@gmail.com
JSP Classes compiled by Jasper Ant Task getting compiled without debuginfo even
though by default classdebuginfo is set to true in
apache-tomcat-7.0.55-src/java/org/apache/jasper/JspC.java:189
Used the following snippet for compiling jsp in a sample web application
taskdef name=jasper2 classname=org.apache.jasper.JspC
classpath
...
/classpath
/taskdef
mkdir dir=${dir}//
jasper2 validateXml=false classdebuginfo=true uriroot=${dir}/jsp
outputDir=${dir}/src verbose=1 /
--
Used the following command to check if the classes compiled by Jasper has debug
info enabled or not .
javap -l Sample.class
which did not give LineNumberTable and LocalVariableTable attributes.
http://stackoverflow.com/questions/1508235/determine-whether-class-file-was-compiled-with-debug-info
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684144 - /tomcat/trunk/java/javax/security/auth/message/
Author: markt Date: Mon Jun 8 11:00:19 2015 New Revision: 1684144 URL: http://svn.apache.org/r1684144 Log: Copy JASPIC 1.0 API from Geronimo This copy is unchanged so there are numerous Checkstyle issues that need to be fixed Added: tomcat/trunk/java/javax/security/auth/message/ - copied from r1684143, geronimo/specs/trunk/geronimo-jaspic_1.0_spec/src/main/java/javax/security/auth/message/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684158 - in /tomcat/trunk/java/javax/security/auth/message: AuthStatus.java config/AuthConfigFactory.java
Author: markt
Date: Mon Jun 8 11:29:02 2015
New Revision: 1684158
URL: http://svn.apache.org/r1684158
Log:
Add missing @Override markers
Modified:
tomcat/trunk/java/javax/security/auth/message/AuthStatus.java
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Modified: tomcat/trunk/java/javax/security/auth/message/AuthStatus.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/AuthStatus.java?rev=1684158r1=1684157r2=1684158view=diff
==
--- tomcat/trunk/java/javax/security/auth/message/AuthStatus.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/AuthStatus.java Mon Jun 8
11:29:02 2015
@@ -33,6 +33,7 @@ public class AuthStatus {
this.name = name;
}
+@Override
public String toString() {
return name;
}
Modified:
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java?rev=1684158r1=1684157r2=1684158view=diff
==
--- tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
(original)
+++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Mon Jun 8 11:29:02 2015
@@ -35,6 +35,7 @@ public abstract class AuthConfigFactory
static {
contextClassLoader = (ClassLoader) java.security.AccessController
.doPrivileged(new java.security.PrivilegedAction() {
+@Override
public Object run() {
return Thread.currentThread().getContextClassLoader();
}
@@ -49,6 +50,7 @@ public abstract class AuthConfigFactory
if (factory == null) {
String className = (String) java.security.AccessController
.doPrivileged(new java.security.PrivilegedAction() {
+@Override
public Object run() {
return
java.security.Security.getProperty(DEFAULT_FACTORY_SECURITY_PROPERTY);
}
@@ -60,6 +62,7 @@ public abstract class AuthConfigFactory
final String finalClassName = className;
factory = (AuthConfigFactory) java.security.AccessController
.doPrivileged(new
java.security.PrivilegedExceptionAction() {
+@Override
public Object run() throws ClassNotFoundException,
InstantiationException,
IllegalAccessException {
// TODO Review this
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684162 - in /tomcat/trunk/java/javax/security/auth/message: MessageInfo.java config/AuthConfigFactory.java config/ClientAuthConfig.java config/ServerAuthConfig.java module/ClientAuthModu
Author: markt
Date: Mon Jun 8 11:35:14 2015
New Revision: 1684162
URL: http://svn.apache.org/r1684162
Log:
Fix the generics issues we can fix and suppress the issues in the API since we
can't fix those.
Suppress at the method level so we spot generics issues in any new methods we
add (assuming there is a JASPIC.next and we contribute to it in some way)
Modified:
tomcat/trunk/java/javax/security/auth/message/MessageInfo.java
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
tomcat/trunk/java/javax/security/auth/message/config/ClientAuthConfig.java
tomcat/trunk/java/javax/security/auth/message/config/ServerAuthConfig.java
tomcat/trunk/java/javax/security/auth/message/module/ClientAuthModule.java
tomcat/trunk/java/javax/security/auth/message/module/ServerAuthModule.java
Modified: tomcat/trunk/java/javax/security/auth/message/MessageInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/MessageInfo.java?rev=1684162r1=1684161r2=1684162view=diff
==
--- tomcat/trunk/java/javax/security/auth/message/MessageInfo.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/MessageInfo.java Mon Jun 8
11:35:14 2015
@@ -23,6 +23,7 @@ import java.util.Map;
*/
public interface MessageInfo {
+@SuppressWarnings(rawtypes) // JASPIC API uses raw types
Map getMap();
Object getRequestMessage();
Modified:
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java?rev=1684162r1=1684161r2=1684162view=diff
==
--- tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
(original)
+++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Mon Jun 8 11:35:14 2015
@@ -33,10 +33,10 @@ public abstract class AuthConfigFactory
private static ClassLoader contextClassLoader;
static {
-contextClassLoader = (ClassLoader) java.security.AccessController
-.doPrivileged(new java.security.PrivilegedAction() {
+contextClassLoader = java.security.AccessController
+.doPrivileged(new
java.security.PrivilegedActionClassLoader() {
@Override
-public Object run() {
+public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
});
@@ -48,10 +48,10 @@ public abstract class AuthConfigFactory
sm.checkPermission(new AuthPermission(getAuthConfigFactory));
}
if (factory == null) {
-String className = (String) java.security.AccessController
-.doPrivileged(new java.security.PrivilegedAction() {
+String className = java.security.AccessController
+.doPrivileged(new java.security.PrivilegedActionString()
{
@Override
-public Object run() {
+public String run() {
return
java.security.Security.getProperty(DEFAULT_FACTORY_SECURITY_PROPERTY);
}
});
@@ -60,14 +60,14 @@ public abstract class AuthConfigFactory
}
try {
final String finalClassName = className;
-factory = (AuthConfigFactory) java.security.AccessController
-.doPrivileged(new
java.security.PrivilegedExceptionAction() {
+factory = java.security.AccessController
+.doPrivileged(new
java.security.PrivilegedExceptionActionAuthConfigFactory() {
@Override
-public Object run() throws ClassNotFoundException,
InstantiationException,
+public AuthConfigFactory run() throws
ClassNotFoundException, InstantiationException,
IllegalAccessException {
// TODO Review this
-Class clazz = Class.forName(finalClassName,
true, contextClassLoader);
-return clazz.newInstance();
+Class? clazz = Class.forName(finalClassName,
true, contextClassLoader);
+return (AuthConfigFactory) clazz.newInstance();
}
});
} catch (PrivilegedActionException e) {
@@ -107,6 +107,7 @@ public abstract class AuthConfigFactory
public abstract String registerConfigProvider(AuthConfigProvider provider,
String layer, String appContext, String description);
+@SuppressWarnings(rawtypes) // JASPIC API
HTTP2 parsing and error handling
All, I'm not particularly happy with the current error handling (based around Http2Exception) and as I work my way through the spec in detail I am coming across cases that are becoming increasingly difficult to handle cleanly. I think I have reached the point where a completely different approach is needed. I am thinking along the lines of a ParseState object that gets passed around and updated if things go wrong. I'm going to try this approach over the next few days. If it works there is likely to be a largish commit to switch to this new approach but I'll try and keep that commit limited to changing the error handling. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684193 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/server/UpgradeUtil.java java/org/apache/tomcat/websocket/server/WsServerContainer.java webapps/docs/changelog.xml
Author: violetagg Date: Mon Jun 8 14:17:30 2015 New Revision: 1684193 URL: http://svn.apache.org/r1684193 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57969 Merged revision 1684172 from tomcat/trunk: Provide path params to POJO via WsPerSessionServerEndpointConfig instead of the 'global' ServerEndpointConfig. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 8 14:17:30 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842
svn commit: r1684196 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/server/UpgradeUtil.java java/org/apache/tomcat/websocket/server/WsServerContainer.java webapps/docs/changelog.xml
Author: violetagg Date: Mon Jun 8 14:24:30 2015 New Revision: 1684196 URL: http://svn.apache.org/r1684196 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57969 Merged revision 1684172 from tomcat/trunk: Provide path params to POJO via WsPerSessionServerEndpointConfig instead of the 'global' ServerEndpointConfig. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 8 14:24:30 2015 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555 ,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
[Bug 57969] @PathParam annotation captures incorrect value under high load
https://bz.apache.org/bugzilla/show_bug.cgi?id=57969 Violeta Georgieva violet...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Violeta Georgieva violet...@apache.org --- Hi, This is fixed in trunk, in 8.0.x for 8.0.24 and in 7.0.x for 7.0.63 onwards. Regards, Violeta -- 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
[GitHub] tomcat pull request: Add JASPIC API (JSR 196) to build process
Github user markt-asf commented on the pull request: https://github.com/apache/tomcat/pull/21#issuecomment-109959429 OK. I've copied the Geronimo classes across and fixed the checkstyle and compilation errors. I've now seen some additional issues that need to be addressed. 1. Remove the @version lines from the Javadoc (and the whole comment if that is the only Javadoc present) 2. Line length (80 for comments, 100 for code) 3. Use imports (particularly noticed in AuthConfigFactory) And something I forgot in my comment on the commit, the integration into build.xml should be a separate commit to. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1684172 - in /tomcat/trunk/java/org/apache/tomcat/websocket/server: UpgradeUtil.java WsServerContainer.java
Author: violetagg
Date: Mon Jun 8 12:43:30 2015
New Revision: 1684172
URL: http://svn.apache.org/r1684172
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57969
Provide path params to POJO via WsPerSessionServerEndpointConfig instead of the
'global' ServerEndpointConfig.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java?rev=1684172r1=1684171r2=1684172view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java Mon
Jun 8 12:43:30 2015
@@ -223,6 +223,9 @@ public class UpgradeUtil {
clazz);
} else {
ep = new PojoEndpointServer();
+// Need to make path params available to POJO
+perSessionServerEndpointConfig.getUserProperties().put(
+
org.apache.tomcat.websocket.pojo.Constants.POJO_PATH_PARAM_KEY, pathParams);
}
} catch (InstantiationException e) {
throw new ServletException(e);
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1684172r1=1684171r2=1684172view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Mon Jun 8 12:43:30 2015
@@ -380,13 +380,6 @@ public class WsServerContainer extends W
return null;
}
-if
(!PojoEndpointServer.class.isAssignableFrom(sec.getEndpointClass())) {
-// Need to make path params available to POJO
-sec.getUserProperties().put(
-
org.apache.tomcat.websocket.pojo.Constants.POJO_PATH_PARAM_KEY,
-pathParams);
-}
-
return new WsMappingResult(sec, pathParams);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58011] New: Tomcat 7 crasches intermittently with NIO and HTTPS
https://bz.apache.org/bugzilla/show_bug.cgi?id=58011 Bug ID: 58011 Summary: Tomcat 7 crasches intermittently with NIO and HTTPS Product: Tomcat 7 Version: 7.0.61 Hardware: PC Status: NEW Severity: major Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: carl...@gmail.com Running Tomcat 7.0.61 as service with mostly HTTPS - it will terminate after a few days or sometimes hours. We use java 8_45 on Windows 2008 server. From server.xml: Executor name=tomcatThreadPool namePrefix=catalina-exec- maxThreads=150 minSpareThreads=4/ Connector port=80 executor=tomcatThreadPool redirectPort=443 / Connector port=443 protocol=org.apache.coyote.http11.Http11NioProtocol executor=tomcatThreadPool scheme=https secure=true SSLEnabled=true sslProtocol=TLS / Error message: Fault:500 in page: /corp/report/CSEVERE: java.lang.IllegalArgumentException: You can only write using the application write buffer provided by the handler. at org.apache.tomcat.util.net.SecureNioChannel.write(SecureNioChannel.java:482) at sun.nio.ch.FileChannelImpl.transferToArbitraryChannel(Unknown Source) at sun.nio.ch.FileChannelImpl.transferTo(Unknown Source) at org.apache.tomcat.util.net.NioEndpoint$Poller.processSendfile(NioEndpoint.java:1352) at org.apache.tomcat.util.net.NioEndpoint$Poller.processKey(NioEndpoint.java:1271) at org.apache.tomcat.util.net.NioEndpoint$Poller.run(NioEndpoint.java:1231) at java.lang.Thread.run(Unknown Source) jun 08, 2015 1:18:20 EM org.apache.tomcat.util.net.NioEndpoint$Poller processSendfile SEVERE: java.lang.IllegalArgumentException: You can only write using the application write buffer provided by the handler. at org.apache.tomcat.util.net.SecureNioChannel.write(SecureNioChannel.java:482) at sun.nio.ch.FileChannelImpl.transferToArbitraryChannel(Unknown Source) at sun.nio.ch.FileChannelImpl.transferTo(Unknown Source) at org.apache.tomcat.util.net.NioEndpoint$Poller.processSendfile(NioEndpoint.java:1352) at org.apache.tomcat.util.net.NioEndpoint$Poller.processKey(NioEndpoint.java:1271) at org.apache.tomcat.util.net.NioEndpoint$Poller.run(NioEndpoint.java:1231) at java.lang.Thread.run(Unknown Source) -- 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 58009] Trying to forward request to newly created file results in 404 The requested resource is not available.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58009 Remy Maucherat r...@apache.org changed: What|Removed |Added Status|NEW |NEEDINFO OS||All --- Comment #1 from Remy Maucherat r...@apache.org --- There's a resource cache, so if you create - or delete, modify, etc - a file using direct file access, then you can get stale data. In some situations, there's no workaround except disable the cache. The new cache may be caching more than the previous one, causing the new behavior. Please provide a test case to investigate further. -- 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 57977] The original class loader isn't re-bound to the thread in PersistentValve.invoke()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57977 Remy Maucherat r...@apache.org changed: What|Removed |Added Severity|normal |minor --- Comment #4 from Remy Maucherat r...@apache.org --- Actually, the patch looks wrong. If the valve is set at the host level (or below), then nothing is needed, the host valve is the one supposed to be doing the context classloader setting. If somehow the valve is located at the engine level, then this looks rather weird (but maybe it's nice if there are lots of vhosts), and in that case it needs to set the context classloader (and some more - normally any such change is supposed to be done with context.(un)bind now). Since PersistentValve is not documented anywhere, the its use is questionable (non sticky sessions are not really allowed), I'd add a note in the javadoc saying it should be associated to a Host or Context. -- 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
