Commit Graph

129 Commits

Author SHA1 Message Date
Timothy Bish 42e4a6cd99 AMQ-6765 Add trace logging of start failure exception
Log the exception at trace level when start fails.

(cherry picked from commit 56bed30c64)
2017-07-11 16:19:51 -04:00
Timothy Bish 6613b8f1f6 AMQ-6699 Fix STOMP over WS not encoding header values
When sending STOMP frames out over WS the marshal isn't doing a proper
encode based on the STOMP version in use and so header values can be
transmitted without proper escaping.
(cherry picked from commit 2490c85fc5)
2017-06-14 15:15:56 -04:00
Timothy Bish bf395fcdb3 https://issues.apache.org/jira/browse/AMQ-6680
Fix handling of incoming MQTT binary data over WS.  The handler should
use the MQTTCodec to ensure that partial or packed frames are fully
processed
(cherry picked from commit e69367fbc3)
2017-05-22 12:28:02 -04:00
Timothy Bish bc879d762a https://issues.apache.org/jira/browse/AMQ-6669
Respect the wireFormat.maxFrameSize option on WS and WSS transports
allowing binary content larger than 65535
(cherry picked from commit 2e2d5ddd3d)
2017-05-04 16:39:49 -04:00
Dejan Bosanac b345535b7e [maven-release-plugin] prepare for next development iteration 2017-04-11 17:32:46 +02:00
Dejan Bosanac 19adb5d840 [maven-release-plugin] prepare release activemq-5.14.5 2017-04-11 17:32:24 +02:00
Christopher L. Shannon (cshannon) 6d848c440c [maven-release-plugin] prepare for next development iteration 2017-02-27 08:46:14 -05:00
Christopher L. Shannon (cshannon) 308eab0bb6 [maven-release-plugin] prepare release activemq-5.14.4 2017-02-27 08:45:01 -05:00
gtully c5315d6d5e [AMQ-6571] use browsercompatspec cookie matcher - apply patch from Andrew Flegg with thanks
(cherry picked from commit 4f6c55ad67)
2017-02-06 09:13:15 -05:00
Christopher L. Shannon (cshannon) b36262ebba [maven-release-plugin] prepare for next development iteration 2016-12-19 10:33:54 -05:00
Christopher L. Shannon (cshannon) 58dddb9181 [maven-release-plugin] prepare release activemq-5.14.3 2016-12-19 10:32:45 -05:00
Christopher L. Shannon (cshannon) 80b5fdcf2f https://issues.apache.org/jira/browse/AMQ-6521
Fixing support for Jetty 9.3 and Jetty 9.2.  The previous attempt at a
fix had the wrong class instance.

(cherry picked from commit 29b4db5c34)
2016-12-09 09:47:59 -05:00
Christopher L. Shannon (cshannon) 8d1136e699 [maven-release-plugin] prepare for next development iteration 2016-12-05 09:35:12 -05:00
Christopher L. Shannon (cshannon) 2462711684 [maven-release-plugin] prepare release activemq-5.14.2 2016-12-05 09:33:48 -05:00
Christopher L. Shannon (cshannon) 4cdd188ef2 https://issues.apache.org/jira/browse/AMQ-6521
Adding support for Jetty 9.3 by re-adding in the logic to dynamically
load the correct GzipHandler depending on the version

(cherry picked from commit 80f46a8056)
2016-11-29 11:39:17 -05:00
Christopher L. Shannon (cshannon) a50979e308 https://issues.apache.org/jira/browse/AMQ-6491
Changing the WebSocket servlet to return a succesful empty response
instead of an error when a GET request is made

(cherry picked from commit f40532a23d)
2016-11-22 07:28:53 -05:00
Christopher L. Shannon (cshannon) e9489a45b3 https://issues.apache.org/jira/browse/AMQ-6482
Adding websocket send timeout to AMQP over websockets

(cherry picked from commit 937b2acd46)
2016-11-04 14:10:23 -04:00
Christopher L. Shannon (cshannon) fdf1537eb8 https://issues.apache.org/jira/browse/AMQ-6482
Adding a timeout for websocket sends to prevent the transport thread
from getting stuck and blocking.  The default is 30 seconds.

(cherry picked from commit 450cabe4ea)
2016-11-04 12:59:04 -04:00
Christopher L. Shannon (cshannon) 9ab56d59cc [maven-release-plugin] prepare for next development iteration 2016-09-27 13:06:49 -04:00
Christopher L. Shannon (cshannon) 594c79e531 [maven-release-plugin] prepare release activemq-5.14.1 2016-09-27 13:06:12 -04:00
Christopher L. Shannon (cshannon) 02d53a0d9f Revert "[maven-release-plugin] prepare release activemq-5.14.1"
This reverts commit 422b231c25.
2016-09-27 11:57:35 -04:00
Christopher L. Shannon (cshannon) 354142adf1 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 47a652ef2a.
2016-09-27 11:57:25 -04:00
Christopher L. Shannon (cshannon) 47a652ef2a [maven-release-plugin] prepare for next development iteration 2016-09-27 08:58:13 -04:00
Christopher L. Shannon (cshannon) 422b231c25 [maven-release-plugin] prepare release activemq-5.14.1 2016-09-27 08:57:19 -04:00
Christopher L. Shannon (cshannon) 124bd1ae3d https://issues.apache.org/jira/browse/AMQ-6397
Setting the HTTP timeout for all HttpClients instead of just on send

(cherry picked from commit 06e929f101)
2016-08-17 09:39:04 -04:00
Christopher L. Shannon (cshannon) a35371d880 NO-JIRA : creating 5.14.x branch 2016-08-02 09:30:31 -04:00
Christopher L. Shannon (cshannon) 71cbc65283 [maven-release-plugin] prepare release activemq-5.14.0 2016-08-02 09:02:54 -04:00
Christopher L. Shannon (cshannon) bd442a3388 https://issues.apache.org/jira/browse/AMQ-6343
On MQTT Websocket close, a LWT message will be properly sent if
configured and a disconnect packet was not received
2016-07-05 18:13:45 +00:00
Christopher L. Shannon (cshannon) 96494f74c7 https://issues.apache.org/jira/browse/AMQ-6346
Prevent concurrent access to the MQTT protocol handlers which can lead
to a tansport level deadlock
2016-07-05 17:50:03 +00:00
Timothy Bish 31c55f7510 https://issues.apache.org/jira/browse/AMQ-6339
Add support for AMQP client to connect using WebSockets.
2016-06-30 14:52:40 -04:00
Timothy Bish 5ba8679083 Allow for the connection to close without getting the ERROR frame 2016-06-16 11:20:59 -04:00
Timothy Bish 71893f1434 Allow the HTTP test to have extra time to wait for all messages to
arrive as the transmission rate is much slower.
2016-05-10 10:59:12 -04:00
Timothy Bish e47edd7a28 https://issues.apache.org/jira/browse/AMQ-6262
Ensure that the connection check task is stopped once commands pass
through the inactivity monitor to prevent the transport from being
closed for no reason.
2016-04-25 17:05:09 -04:00
Dejan Bosanac 34eb1ee959 https://issues.apache.org/jira/browse/AMQ-6259 - mqtt-over-ws configuration 2016-04-19 16:02:45 +02:00
Timothy Bish 30d6ad72fa NO-JIRA Allow for the disconnect call in the test to fail as the short
keepAlive interval can trigger a shutdown of the socket before we have a
chance to write the disconnect depending on the timing.
2016-03-17 14:08:09 -04:00
Christopher L. Shannon (cshannon) e375af3810 https://issues.apache.org/jira/browse/AMQ-6182
Adding missing License header
2016-03-01 16:01:58 +00:00
Christopher L. Shannon (cshannon) 473b3284d4 https://issues.apache.org/jira/browse/AMQ-6182
Reworking patch so that the http trace method is also turned off by
default for the HttpTransport, besides just for the Websocket transport.
Also added SSL tests for both transports.
2016-02-29 22:36:59 +00:00
Christopher L. Shannon (cshannon) 7335f699f2 https://issues.apache.org/jira/browse/AMQ-6182
adding timeout to test method
2016-02-26 19:20:16 +00:00
Christopher L. Shannon (cshannon) 4fb8083977 https://issues.apache.org/jira/browse/AMQ-6182
Disabling the HTTP trace method on the websocket port by default.  It
can be enabled by setting the parameter "http.enableTrace=true" on the
connection uri if it is needed for debugging.
2016-02-26 18:54:25 +00:00
Timothy Bish 4ecff14030 NO-JIRA Update master version to 5.14.0-SNAPSHOT to match the eventual
release version.
2016-01-20 12:40:20 -05:00
Christopher L. Shannon (cshannon) b9dcb010f7 https://issues.apache.org/jira/browse/AMQ-6077
Making new values in ActiveMQObjectMessage transient which fixes HTTP
serialization
2015-12-15 19:37:05 +00:00
Christopher L. Shannon (cshannon) 913f64476b https://issues.apache.org/jira/browse/AMQ-6073
WSServlet for websockets will attempt to detect the subprotocol
requested and respond with the appropriate one.  Currently the protocols
loaded are what stomp.js use for stomp (v11.stomp and v12.stomp).
If a protocol can't be found then a default will be returned, either
"stomp" or "mqtt", which is the same behavior before this patch.

This will make it a bit easier to use stomp over websockets out of the
box as stomp.js will work by default.
2015-12-07 15:29:13 +00:00
Christopher L. Shannon (cshannon) cfb4ca9f54 [maven-release-plugin] prepare for next development iteration 2015-11-30 13:48:58 +00:00
Christopher L. Shannon (cshannon) abfe038ddf [maven-release-plugin] prepare release activemq-5.13.0 2015-11-30 13:48:11 +00:00
gtully 0a12bcb928 https://issues.apache.org/jira/browse/AMQ-2191 https://issues.apache.org/jira/browse/AMQ-3529 - rework fixes to remove uncertanty from dealing with intettuptedexception. Sync requests will trap interrupts that ocurr while waiting for responses and fail the connection with an interruptedioexception. Interrupts pending before requests will be suppressed, allowing possible clean shutdown. It is not safe to replay openwire ops b/c they are not idempotent, the only safe option is to have a teardown of the broker side state from a close 2015-11-27 12:21:56 +00:00
Christopher L. Shannon (cshannon) bbde8473bd https://issues.apache.org/jira/browse/AMQ-5980
Fixing an intermittent test failure in:

org.apache.activemq.transport.ws.StompWSSTransportTest.
testHeartbeatsKeepsConnectionOpen

Adding synchronization on sends for StompWSConnection.  The protocol
doesn't allow multiple threads to call a blocking send at the same time
and the heartbeat keep alive thread was colliding with the main
thread on sends.
2015-11-22 19:01:31 +00:00
gtully d7a3b9406b https://issues.apache.org/jira/browse/AMQ-6029 - make certs available to tunnle servlet - HttpsNeedClientAuthSendAndReceiveTest regression, add javax.security so login exceptions can propogate over http - https://issues.apache.org/jira/browse/AMQ-6013 2015-11-18 16:08:29 +00:00
Timothy Bish caa6b8e253 https://issues.apache.org/jira/browse/AMQ-6046
Prevent concurrent access to protocol handlers which can lead to
transport level deadlocks.
2015-11-17 11:03:31 -05:00
gtully 8136e67b40 https://issues.apache.org/jira/browse/AMQ-6016 - ensure xstream inits transients to default values when it bypasses the default creation method through object deserialization. Can make it more general if there are ever more instances of this. It avoids the need to check for null and sync 2015-10-30 12:01:08 +00:00
Dejan Bosanac f8bfff0bc8 https://issues.apache.org/jira/browse/AMQ-6029 - wss transport with certificate authentication 2015-10-30 11:42:36 +01:00