@@ -51,7 +51,7 @@ class CanonicalLink {
// Redirection taking place
//echo "Response: "; print_r($response);
$location = $response->getHeader('Location');
- //echo "Response redirecting to: {$location}\n";
+ echo "Response redirecting to: {$location}\n";
if (!$location) {
echo "WARN: Response Redirect Location could not be determined.\n";
print_r($response);
@@ -59,16 +59,21 @@ class CanonicalLink {
}
if (!preg_match('/^\w+:/', $location)) {
- //echo "WARN: Relative link in HTTP redirect Location: {$location}\n";
$relativeUrl = new HttpUrl($url);
$relativeUrl->setRelativeUrl($location);
$location = $relativeUrl->getUrl();
+
+ if ($location===$url) {
+ //echo "WARN: Relative link in HTTP redirect Location: {$location} from {$url}\n";
+ return NULL;
+ }
}
// TODO: Keep following the redirection until we arrive at
// a non-redirecting page
if ($follow) {
$newLocation = $this->getCanonicalLink($location, true, $depth++);
+
if (!is_null($newLocation) && $newLocation!=$location) {
$location = $newLocation;
}
CanonicalLink.php
@@ -40,7 +40,7 @@ class CanonicalLinkTest extends PHPUnit_Framework_TestCase {
****/
-// ****
+/****
public function testNormalUrl() {
$url = 'http://www.isolani.co.uk/';
$canonUrl = $this->canon->getCanonicalLink($url);
@@ -256,18 +256,16 @@ class CanonicalLinkTest extends PHPUnit_Framework_TestCase {
$canonUrl = $this->canon->getCanonicalLink($url);
$this->assertEquals($endUrl, $canonUrl);
}
-// ****/
+****/
-// ****
public function testMultipleRedirectUrl() {
$url = 'http://ping.fm/lzYNA';
$endUrl = 'http://web.me.com/abrightman/DisabilityLand/';
$canonUrl = $this->canon->getCanonicalLink($url);
$this->assertEquals($endUrl, $canonUrl);
}
-// ****/
public function testLowerCaseLocationRedirect() {
//echo ucwords('link-farm');
@@ -280,6 +278,17 @@ class CanonicalLinkTest extends PHPUnit_Framework_TestCase {
$this->assertEquals($endUrl, $canonUrl);
}
+
+ public function testRelativeInfiniteRedirect() {
+ $url = "http://bit.ly/28RAOP";
+ $endUrl = 'http://www.canadianarchitect.com/common_scripts/browse/default.asp?aid=1000208224';
+ //echo "Start link: {$url}\n";
+ $canonUrl = $this->canon->getCanonicalLink($url);
+ //echo "CanonURL link: {$canonUrl}\n";
+ $this->assertEquals($endUrl, $canonUrl);
+ }
+
+
}
tests/CanonicalLinkTest.php
818e4b31816e042b87031fb8854edc1749485467
Isofarro
isofarro2@gmail.com
http://github.com/isofarro/php5-http-utils/commit/1f9b30ad4d46a1c4dda1fe6a52f42387f302e9de
1f9b30ad4d46a1c4dda1fe6a52f42387f302e9de
2009-10-15T12:27:52-07:00
2009-10-15T12:27:52-07:00
Detecting infinite redirects of relative URLs
c83df0e3fe1c72cd380f38ebbf11d65558ad69e7
Isofarro
isofarro2@gmail.com