diff options
author | Jean-Christophe Saad-Dupuy <saad.dupuy@gmail.com> | 2013-10-07 12:47:13 +0200 |
---|---|---|
committer | Jean-Christophe Saad-Dupuy <saad.dupuy@gmail.com> | 2013-10-07 12:47:13 +0200 |
commit | 2916d24b209e1e36cf22cb902d7e6dc34113c7e5 (patch) | |
tree | 22de21d5d7d67779a23479eefe750124fae92602 /inc/poche | |
parent | 3352332f3fd1ee6452c951655d95fae2e3aaf264 (diff) | |
download | wallabag-2916d24b209e1e36cf22cb902d7e6dc34113c7e5.tar.gz wallabag-2916d24b209e1e36cf22cb902d7e6dc34113c7e5.tar.zst wallabag-2916d24b209e1e36cf22cb902d7e6dc34113c7e5.zip |
Added support for custom SSL port
Diffstat (limited to 'inc/poche')
-rw-r--r-- | inc/poche/Tools.class.php | 6 | ||||
-rwxr-xr-x | inc/poche/config.inc.php.new | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 6f2bc6e7..1d092823 100644 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php | |||
@@ -42,13 +42,13 @@ class Tools | |||
42 | && (strtolower($_SERVER['HTTPS']) == 'on')) | 42 | && (strtolower($_SERVER['HTTPS']) == 'on')) |
43 | || (isset($_SERVER["SERVER_PORT"]) | 43 | || (isset($_SERVER["SERVER_PORT"]) |
44 | && $_SERVER["SERVER_PORT"] == '443') // HTTPS detection. | 44 | && $_SERVER["SERVER_PORT"] == '443') // HTTPS detection. |
45 | || (isset($_SERVER["SERVER_PORT"]) && isset($SSL_PORT) //Custom HTTPS port detection | 45 | || (isset($_SERVER["SERVER_PORT"]) //Custom HTTPS port detection |
46 | && $_SERVER["SERVER_PORT"] == $SSL_PORT); | 46 | && $_SERVER["SERVER_PORT"] == SSL_PORT); |
47 | 47 | ||
48 | $serverport = (!isset($_SERVER["SERVER_PORT"]) | 48 | $serverport = (!isset($_SERVER["SERVER_PORT"]) |
49 | || $_SERVER["SERVER_PORT"] == '80' | 49 | || $_SERVER["SERVER_PORT"] == '80' |
50 | || ($https && $_SERVER["SERVER_PORT"] == '443') | 50 | || ($https && $_SERVER["SERVER_PORT"] == '443') |
51 | || ($https && $_SERVER["SERVER_PORT"]==$SSL_PORT) //Custom HTTPS port detection | 51 | || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection |
52 | ? '' : ':' . $_SERVER["SERVER_PORT"]); | 52 | ? '' : ':' . $_SERVER["SERVER_PORT"]); |
53 | 53 | ||
54 | $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); | 54 | $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); |
diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new index 255b97e6..902509e3 100755 --- a/inc/poche/config.inc.php.new +++ b/inc/poche/config.inc.php.new | |||
@@ -25,6 +25,9 @@ define ('STORAGE_PASSWORD', 'poche'); | |||
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 | 27 | ||
28 | // Change this if not using the standart port for SSL - i.e you server is behind sslh | ||
29 | define ('SSL_PORT', 443); | ||
30 | |||
28 | define ('MODE_DEMO', FALSE); | 31 | define ('MODE_DEMO', FALSE); |
29 | define ('DEBUG_POCHE', FALSE); | 32 | define ('DEBUG_POCHE', FALSE); |
30 | define ('DOWNLOAD_PICTURES', FALSE); | 33 | define ('DOWNLOAD_PICTURES', FALSE); |
@@ -57,4 +60,4 @@ define ('INSTAPAPER_FILE', '/instapaper-export.html'); | |||
57 | 60 | ||
58 | define ('IMPORT_POCKET_FILE', ROOT . POCKET_FILE); | 61 | define ('IMPORT_POCKET_FILE', ROOT . POCKET_FILE); |
59 | define ('IMPORT_READABILITY_FILE', ROOT . READABILITY_FILE); | 62 | define ('IMPORT_READABILITY_FILE', ROOT . READABILITY_FILE); |
60 | define ('IMPORT_INSTAPAPER_FILE', ROOT . INSTAPAPER_FILE); \ No newline at end of file | 63 | define ('IMPORT_INSTAPAPER_FILE', ROOT . INSTAPAPER_FILE); |