8000 Fix checking protocol (HTTP/HTTPS) by piotrplenik · Pull Request #23 · oauth-io/sdk-php · GitHub
[go: up one dir, main page]
Skip to content

Fix checking protocol (HTTP/HTTPS) #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
piotrplenik wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix checking protocol (HTTP/HTTPS) #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix checking protocol (HTTP/HTTPS) 
Referring to "http://php.net/manual/en/reserved.variables.server.php" $_SERVER['HTTPS'] is non-empty value
  • Loading branch information
@piotrplenik
piotrplenik committed Sep 2, 2016
commit c3bdfe0864da8c155413a0c2633578b75f5ad83a
2 changes: 1 addition & 1 deletion src/OAuth_io/OAuth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public function refreshCredentials($credentials, $force = false) {
}

public function redirect($provider, $url) {
$urlToRedirect = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . $url;
$urlToRedirect = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . $url;
$csrf = $this->generateStateToken();
$location = $this->injector->config['oauthd_url'] . $this->injector->config['oauthd_base'] . '/' . $provider .
'?k=' . $this->injector->config['app_key'] . '&opts=' .
Expand Down
0