diff options
| author | Brion Vibber <brion@pobox.com> | 2010-07-12 14:21:57 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-07-12 14:21:57 -0700 |
| commit | cd29d3d646379aa9a1352035973c8e379cc7f42b (patch) | |
| tree | e064c5292c546e6df8eaad9609a56150f69c62c3 /extlib/Auth/Yadis/HTTPFetcher.php | |
| parent | bd8506eee883ecd424fdf3d7e545c10c754df6ff (diff) | |
| parent | 1b3b7f9a422f6b703ec36d43e2283f91a9835f3b (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'extlib/Auth/Yadis/HTTPFetcher.php')
| -rw-r--r-- | extlib/Auth/Yadis/HTTPFetcher.php | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/extlib/Auth/Yadis/HTTPFetcher.php b/extlib/Auth/Yadis/HTTPFetcher.php index 963b9a49a..148cde1b2 100644 --- a/extlib/Auth/Yadis/HTTPFetcher.php +++ b/extlib/Auth/Yadis/HTTPFetcher.php @@ -115,12 +115,40 @@ class Auth_Yadis_HTTPFetcher { /** * @access private */ - function _findRedirect($headers) + function _findRedirect($headers, $url) { foreach ($headers as $line) { if (strpos(strtolower($line), "location: ") === 0) { $parts = explode(" ", $line, 2); - return $parts[1]; + $loc = $parts[1]; + $ppos = strpos($loc, "://"); + if ($ppos === false || $ppos > strpos($loc, "/")) { + /* no host; add it */ + $hpos = strpos($url, "://"); + $prt = substr($url, 0, $hpos+3); + $url = substr($url, $hpos+3); + if (substr($loc, 0, 1) == "/") { + /* absolute path */ + $fspos = strpos($url, "/"); + if ($fspos) $loc = $prt.substr($url, 0, $fspos).$loc; + else $loc = $prt.$url.$loc; + } else { + /* relative path */ + $pp = $prt; + while (1) { + $xpos = strpos($url, "/"); + if ($xpos === false) break; + $apos = strpos($url, "?"); + if ($apos !== false && $apos < $xpos) break; + $apos = strpos($url, "&"); + if ($apos !== false && $apos < $xpos) break; + $pp .= substr($url, 0, $xpos+1); + $url = substr($url, $xpos+1); + } + $loc = $pp.$loc; + } + } + return $loc; } } return null; @@ -144,4 +172,3 @@ class Auth_Yadis_HTTPFetcher { } } -?>
\ No newline at end of file |