Overriding detected server port#60
Open
jcsaaddupuy wants to merge 7 commits intosebsauvage:masterfrom
jcsaaddupuy:master
Open
Overriding detected server port#60jcsaaddupuy wants to merge 7 commits intosebsauvage:masterfrom jcsaaddupuy:master
jcsaaddupuy wants to merge 7 commits intosebsauvage:masterfrom
jcsaaddupuy:master
Conversation
…[config][ACTUAL_SERVER_PORT]
pikzen
pushed a commit
to pikzen/Shaarli
that referenced
this pull request
Nov 21, 2014
Do not add a tag to the search if it's already being searched for. * Fixes shaarli#50 * Fixes sebsauvage#140
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
When hosting Shaarli on a webserver behind a sslh instance, generated urls contains the actual webserver port (based on $_SERVER['PORT']) .
In such a config, the webserver may not be directly reachable from outside and using the detected port isn't relevent, as it will be the one on which sslh run which will be serving pages.
As a workaround I added a global ACTUAL_SERVER_PORT, as you can see here and here which is will be used in the serverUrl function.
In order to be coherent, I also made the RSS/Atom URL relatives (like the other ones) by removing the {$feedurl} variable in tpl/includes.html and tpl/page.header.html.