Skip to content
This repository was archived by the owner on Dec 7, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions library/ZendOpenId/Consumer/GenericConsumer.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,20 @@ public function __construct(Storage\AbstractStorage $storage = null,
* @param mixed $extensions extension object or array of extensions objects
* @param Response $response an optional response
* object to perform HTTP or HTML form redirection
* @param string $method HTTP method used to redirect to server
* @return bool
*/
public function login($id, $returnTo = null, $root = null, $extensions = null,
Response $response = null)
Response $response = null, $method = 'GET')
{
return $this->_checkId(
false,
$id,
$returnTo,
$root,
$extensions,
$response);
$response,
$method);
}

/**
Expand Down Expand Up @@ -782,7 +784,7 @@ protected function _discovery(&$id, &$server, &$version)
* @return bool
*/
protected function _checkId($immediate, $id, $returnTo=null, $root=null,
$extensions=null, Response $response = null)
$extensions=null, Response $response = null, $method = 'GET')
{
$this->_setError('');

Expand Down Expand Up @@ -863,7 +865,7 @@ protected function _checkId($immediate, $id, $returnTo=null, $root=null,
return false;
}

OpenId::redirect($server, $params, $response);
OpenId::redirect($server, $params, $response, $method);
return true;
}

Expand Down
6 changes: 4 additions & 2 deletions library/ZendOpenId/OpenId.php
Original file line number Diff line number Diff line change
Expand Up @@ -438,9 +438,11 @@ public static function redirect($url, $params = null,
"</script>");
}

$response->setStatusCode(302);
if ($method == 'GET') {
$response->setStatusCode(302);

$response->getHeaders()->addHeaderLine('Location', $url);
$response->getHeaders()->addHeaderLine('Location', $url);
}

if (!headers_sent()) {
header($response->renderStatusLine());
Expand Down