You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2017/01/03 14:14:33 UTC
qpid-dispatch git commit: DISPATCH-600 Changes to console for
Supporting secure websockets
Repository: qpid-dispatch
Updated Branches:
refs/heads/master be75d9cee -> 75492de7a
DISPATCH-600 Changes to console for Supporting secure websockets
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/75492de7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/75492de7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/75492de7
Branch: refs/heads/master
Commit: 75492de7a01cac6c4e0a0580ad151ddcc73b17a2
Parents: be75d9c
Author: Ernest Allen <ea...@redhat.com>
Authored: Tue Jan 3 09:14:10 2017 -0500
Committer: Ernest Allen <ea...@redhat.com>
Committed: Tue Jan 3 09:14:10 2017 -0500
----------------------------------------------------------------------
console/stand-alone/index.html | 8 ++++----
console/stand-alone/plugin/js/qdrService.js | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/75492de7/console/stand-alone/index.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index 1b08af7..cea5316 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<html xmlns:ng="http://angularjs.org">
+<html xmlns:ng="https://angularjs.org">
<head>
@@ -25,7 +25,7 @@ under the License.
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>Qpid Dispatch Console</title>
- <link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+ <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery.tipsy/1.0.2/jquery.tipsy.css" type="text/css"/>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ng-grid/2.0.11/ng-grid.min.css" type="text/css"/>
@@ -75,9 +75,9 @@ under the License.
<script src='https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.14/d3.min.js'></script>
<script src='https://cdnjs.cloudflare.com/ajax/libs/d3-queue/3.0.3/d3-queue.min.js'></script>
- <script src="http://d3js.org/topojson.v0.min.js"></script>
+ <script src="https://d3js.org/topojson.v0.min.js"></script>
- <script src="http://code.jquery.com/jquery-1.8.3.min.js"></script>
+ <script src="https://code.jquery.com/jquery-1.8.3.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js"></script>
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/75492de7/console/stand-alone/plugin/js/qdrService.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrService.js b/console/stand-alone/plugin/js/qdrService.js
index 2cec634..a9d038b 100644
--- a/console/stand-alone/plugin/js/qdrService.js
+++ b/console/stand-alone/plugin/js/qdrService.js
@@ -928,10 +928,11 @@ console.dump(e)
var reconnect = angular.isDefined(options.reconnect) ? options.reconnect : true
QDR.log.debug("testConnect called with reconnect " + reconnect)
var baseAddress = options.address + ':' + options.port;
+ var protocol = $location.protocol() + "://"
try {
var ws = self.rhea.websocket_connect(WebSocket);
connection = self.rhea.connect({
- connection_details: ws('ws://' + baseAddress, ["binary"]),
+ connection_details: ws(protocol + baseAddress, ["binary"]),
reconnect: reconnect,
properties: {
console_identifier: 'Dispatch console'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org