This repository was archived by the owner on Jan 7, 2025. It is now read-only.
Detect protocol for socket.io uri to add https support#1339
Open
stevefox wants to merge 2 commits intoNVIDIA:masterfrom
Open
Detect protocol for socket.io uri to add https support#1339stevefox wants to merge 2 commits intoNVIDIA:masterfrom
stevefox wants to merge 2 commits intoNVIDIA:masterfrom
Conversation
Member
|
(was #1333) |
Member
|
I tested this and verified that it doesn't break anything for non-secure sites. Can you send me a CLA so I can merge this? |
lukeyeager
suggested changes
Dec 7, 2016
digits/templates/socketio.html
Outdated
| <script type="text/javascript" src="/static/js/3rdparty/socket.io-1.4.5.min.js"></script> | ||
| <script> | ||
| var socket = io.connect('http://' + document.domain + ':' + location.port + "{{namespace}}"); | ||
| var socket = io.connect(location.protocol + '//' + document.domain + ':' + location.port + "{{namespace}}"); |
Member
There was a problem hiding this comment.
Why don't we go whole hog and use location.origin? Browser support looks fine.
http://www.w3schools.com/jsref/prop_loc_origin.asp
lukeyeager
approved these changes
Dec 8, 2016
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@lukeyeager Thanks, I've rebased this against the master branch now.