Fixed querying ads over HTTPS #353
Merged
Conversation
This file contains 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
changed http: to // to always use the correct protocol Fixes pi-hole#352
|
|
DL6ER
requested changes
Jan 12, 2017
| @@ -16,7 +16,7 @@ function eventsource() { | |||
| } | |||
|
|
|||
| var host = window.location.host; | |||
| var source = new EventSource("http://"+host+"/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); | |||
| var source = new EventSource("//"+host+"/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); | |||
There was a problem hiding this comment.
Please change it to
"admin/scripts/pi-hole/php/queryads.php?domain=..."
There was a problem hiding this comment.
That change causes the block page to not work, as it tries to find the script at http://<some_ad_domain>/scripts/...
EventSource's response has a MIME type ("text/html") that is not "text/event-stream". Aborting the connection.
DL6ER
approved these changes
Jan 12, 2017
AzureMarker
suggested changes
Jan 13, 2017
| @@ -16,7 +16,7 @@ function eventsource() { | |||
| } | |||
|
|
|||
| var host = window.location.host; | |||
| var source = new EventSource("http://"+host+"/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); | |||
| var source = new EventSource("scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); | |||
There was a problem hiding this comment.
Actually, simply add `admin/` to the front so it's `EventSource("admin/scripts/...`
|
Oh, I just edited my comment to ask you to instead change it to |
|
Hopefully it doesn't need any more changes now :P |
AzureMarker
approved these changes
Jan 14, 2017
DL6ER
approved these changes
Jan 14, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
By submitting this pull request, I confirm the following (please check boxes, eg [X] - no spaces) Failure to fill the template will close your PR:
Please submit all pull requests against the
developmentbranch. Failure to do so will delay or deny your requestHow familiar are you with the codebase?:
1
changed http:// to // to always use the correct protocol
Fixes #352
This template was created based on the work of
udemy-dl.