OSDN Git Service
(root)
/
pukiwiki
/
pukiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1c21a00
)
BugTrack/341 Support Port 443 of non-https sites
author
umorigu
<umorigu@gmail.com>
Sun, 3 Sep 2017 17:26:28 +0000
(
02:26
+0900)
committer
umorigu
<umorigu@gmail.com>
Sun, 3 Sep 2017 17:26:28 +0000
(
02:26
+0900)
lib/func.php
patch
|
blob
|
history
diff --git
a/lib/func.php
b/lib/func.php
index
08e9e33
..
d3a860a
100644
(file)
--- a/
lib/func.php
+++ b/
lib/func.php
@@
-881,8
+881,7
@@
function _pkwk_base_uri_type_stack($peek, $push, $uri_type)
function guess_script_absolute_uri()
{
$port = SERVER_PORT;
- $is_ssl = (SERVER_PORT == 443) ||
- (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') ||
+ $is_ssl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') ||
(isset($_SERVER['REQUEST_SCHEME']) && $_SERVER['REQUEST_SCHEME'] === 'https');
if ($is_ssl) {
$host = 'https://' . SERVER_NAME .