aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-10-14 19:57:16 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-10-14 19:57:16 +0200
commit8fd0512a3cd97d870aa3442c78bbdd034f541c7d (patch)
tree78196a70eed4ca75787a9d169fea24e11a2fa3f5
parent5b16d508b5b3b9a981ef357b68f8b0167b3fd631 (diff)
parent2d4cfc58ec324987ad39365cbb3e4eb49df4e426 (diff)
downloadwallabag-8fd0512a3cd97d870aa3442c78bbdd034f541c7d.tar.gz
wallabag-8fd0512a3cd97d870aa3442c78bbdd034f541c7d.tar.zst
wallabag-8fd0512a3cd97d870aa3442c78bbdd034f541c7d.zip
Merge pull request #848 from 11mariom/dev
Add support for custom http port
-rwxr-xr-xinc/poche/Tools.class.php1
-rwxr-xr-xinc/poche/config.inc.default.php2
2 files changed, 3 insertions, 0 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 93ec3fc6..beb4f30c 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -51,6 +51,7 @@ final class Tools
51 51
52 $serverport = (!isset($_SERVER["SERVER_PORT"]) 52 $serverport = (!isset($_SERVER["SERVER_PORT"])
53 || $_SERVER["SERVER_PORT"] == '80' 53 || $_SERVER["SERVER_PORT"] == '80'
54 || $_SERVER["SERVER_PORT"] == HTTP_PORT
54 || ($https && $_SERVER["SERVER_PORT"] == '443') 55 || ($https && $_SERVER["SERVER_PORT"] == '443')
55 || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection 56 || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection
56 ? '' : ':' . $_SERVER["SERVER_PORT"]); 57 ? '' : ':' . $_SERVER["SERVER_PORT"]);
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 2a458544..f666f468 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -24,6 +24,8 @@
24################################################################################# 24#################################################################################
25# Do not trespass unless you know what you are doing 25# Do not trespass unless you know what you are doing
26################################################################################# 26#################################################################################
27// Change this if http is running on nonstandard port - i.e is behind cache proxy
28@define ('HTTP_PORT', 80);
27 29
28// Change this if not using the standart port for SSL - i.e you server is behind sslh 30// Change this if not using the standart port for SSL - i.e you server is behind sslh
29@define ('SSL_PORT', 443); 31@define ('SSL_PORT', 443);