Merge 1.0.0 changes back to master.

This commit is contained in:
Nick Couchman
2018-09-30 08:41:28 -04:00

View File

@@ -284,7 +284,7 @@ Guacamole.HTTPTunnel = function(tunnelURL, crossDomain, extraTunnelHeaders) {
* *
* @private * @private
*/ */
var extraHeaders = extraTunnelHeaders || {}; var extraHeaders = extraTunnelHeaders || {};
/** /**
* Adds the configured additional headers to the given request. * Adds the configured additional headers to the given request.
@@ -1277,7 +1277,7 @@ Guacamole.StaticHTTPTunnel = function StaticHTTPTunnel(url, crossDomain, extraTu
* *
* @private * @private
*/ */
var extraHeaders = extraTunnelHeaders || {}; var extraHeaders = extraTunnelHeaders || {};
/** /**
* Adds the configured additional headers to the given request. * Adds the configured additional headers to the given request.