Custom timeout support

gsnedders · gsnedders · commit fe7e33301e0a · 2006-09-15T19:47:50.000Z
diff --git a/simplepie.inc b/simplepie.inc
@@ -5,7 +5,7 @@ A PHP-Based RSS and Atom Feed Framework
 Takes the hard work out of managing a complete RSS/Atom solution.
 
 Version: "Lemon Meringue"
-Updated: 11 September 2006
+Updated: 15 September 2006
 Copyright: 2004-2006 Ryan Parman, Geoffrey Sneddon
 http://simplepie.org
 
@@ -26,7 +26,7 @@ class SimplePie
 	// SimplePie Info
 	var $name = 'SimplePie';
 	var $version = 'Lemon Meringue';
-	var $build = '20060911';
+	var $build = '20060915';
 	var $url = 'http://simplepie.org/';
 	var $useragent;
 	var $linkback;
@@ -37,6 +37,7 @@ class SimplePie
 	// Options
 	var $rss_url;
 	var $file;
+	var $timeout;
 	var $xml_dump = false;
 	var $enable_cache = true;
 	var $max_minutes = 60;
@@ -98,6 +99,11 @@ class SimplePie
 		}
 	}
 	
+	function set_timeout($timeout = 10)
+	{
+		$this->timeout = (int) $timeout;
+	}
+	
 	function enable_xmldump($enable = false)
 	{
 		$this->xml_dump = (bool) $enable;
@@ -270,7 +276,7 @@ EOT;
 							{
 								$headers['if-none-match'] = $this->data['etag'];
 							}
-							$file = new SimplePie_File($this->rss_url, 1, 5, $headers, $this->useragent);
+							$file = new SimplePie_File($this->rss_url, $this->timeout/10, 5, $headers, $this->useragent);
 							if ($file->success)
 							{
 								$headers = $file->headers();
@@ -306,7 +312,7 @@ EOT;
 				}
 				else
 				{
-					$file = new SimplePie_File($this->rss_url, 10, 5, null, $this->useragent);
+					$file = new SimplePie_File($this->rss_url, $this->timeout, 5, null, $this->useragent);
 				}
 			}
 			if (!$file->success)
@@ -317,7 +323,7 @@ EOT;
 			
 			if (!SimplePie_Locator::is_feed($file))
 			{
-				$locate = new SimplePie_Locator($file);
+				$locate = new SimplePie_Locator($file, $this->timeout, $this->useragent);
 				$feed = $locate->find();
 				if ($feed)
 				{
@@ -511,7 +517,7 @@ EOT;
 
 			if ($check)
 			{
-				$file = new SimplePie_File($favicon);
+				$file = new SimplePie_File($favicon, $this->timeout/10, 5, null, $this->useragent);
 				$headers = $file->headers();
 				$file->close();
 
@@ -2037,7 +2043,7 @@ class SimplePie_File
 					$out = "GET $get HTTP/1.0\r\n";
 					$out .= "Host: $url_parts[host]\r\n";
 					$out .= "User-Agent: $useragent\r\n";
-					if (extension_loaded('zlib') && function_exists('gzinflate'))
+					if (function_exists('gzinflate'))
 					{
 						$out .= "Accept-Encoding: gzip,deflate\r\n";
 					}
@@ -3362,20 +3368,23 @@ class SimplePie_Misc
 class SimplePie_Locator
 {
 	var $useragent;
+	var $timeout;
 	var $file;
 	var $local;
 	var $elsewhere;
 	
-	function SimplePie_Locator(&$file)
+	function SimplePie_Locator(&$file, $timeout = 10, $useragent = null)
 	{
 		if (!is_a($file, 'SimplePie_File'))
 		{
-			$this->file = new SimplePie_File($file);
+			$this->file = new SimplePie_File($file, $timeout, $useragent);
 		}
 		else
 		{
 			$this->file =& $file;
 		}
+		$this->useragent = $useragent;
+		$this->timeout = $timeout;
 	}
 		
 	
@@ -3386,8 +3395,6 @@ class SimplePie_Locator
 			return $this->file->url;
 		}
 		
-		$this->useragent = $this->file->useragent;
-		
 		$autodiscovery = $this->autodiscovery($this->file);
 		if ($autodiscovery)
 		{
@@ -3433,7 +3440,14 @@ class SimplePie_Locator
 	{
 		if (!is_a($file, 'SimplePie_File'))
 		{
-			$file2 = new SimplePie_File($file, 1, 5, null, $this->useragent);
+			if (isset($this))
+			{
+				$file2 = new SimplePie_File($file, $this->timeout, 5, null, $this->useragent);
+			}
+			else
+			{
+				$file2 = new SimplePie_File($file);
+			}
 			$file2->body();
 			$file2->close();
 		}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ A PHP-Based RSS and Atom Feed Framework`
`5`	`5`	`Takes the hard work out of managing a complete RSS/Atom solution.`
`6`	`6`
`7`	`7`	`Version: "Lemon Meringue"`
`8`		`-Updated: 11 September 2006`
	`8`	`+Updated: 15 September 2006`
`9`	`9`	`Copyright: 2004-2006 Ryan Parman, Geoffrey Sneddon`
`10`	`10`	`http://simplepie.org`
`11`	`11`
`@@ -26,7 +26,7 @@ class SimplePie`
`26`	`26`	`// SimplePie Info`
`27`	`27`	`var $name = 'SimplePie';`
`28`	`28`	`var $version = 'Lemon Meringue';`
`29`		`- var $build = '20060911';`
	`29`	`+ var $build = '20060915';`
`30`	`30`	`var $url = 'http://simplepie.org/';`
`31`	`31`	`var $useragent;`
`32`	`32`	`var $linkback;`
`@@ -37,6 +37,7 @@ class SimplePie`
`37`	`37`	`// Options`
`38`	`38`	`var $rss_url;`
`39`	`39`	`var $file;`
	`40`	`+ var $timeout;`
`40`	`41`	`var $xml_dump = false;`
`41`	`42`	`var $enable_cache = true;`
`42`	`43`	`var $max_minutes = 60;`
`@@ -98,6 +99,11 @@ class SimplePie`
`98`	`99`	`}`
`99`	`100`	`}`
`100`	`101`
	`102`	`+ function set_timeout($timeout = 10)`
	`103`	`+ {`
	`104`	`+ $this->timeout = (int) $timeout;`
	`105`	`+ }`
	`106`	`+`
`101`	`107`	`function enable_xmldump($enable = false)`
`102`	`108`	`{`
`103`	`109`	`$this->xml_dump = (bool) $enable;`
`@@ -270,7 +276,7 @@ EOT;`
`270`	`276`	`{`
`271`	`277`	`$headers['if-none-match'] = $this->data['etag'];`
`272`	`278`	`}`
`273`		`- $file = new SimplePie_File($this->rss_url, 1, 5, $headers, $this->useragent);`
	`279`	`+ $file = new SimplePie_File($this->rss_url, $this->timeout/10, 5, $headers, $this->useragent);`
`274`	`280`	`if ($file->success)`
`275`	`281`	`{`
`276`	`282`	`$headers = $file->headers();`
`@@ -306,7 +312,7 @@ EOT;`
`306`	`312`	`}`
`307`	`313`	`else`
`308`	`314`	`{`
`309`		`- $file = new SimplePie_File($this->rss_url, 10, 5, null, $this->useragent);`
	`315`	`+ $file = new SimplePie_File($this->rss_url, $this->timeout, 5, null, $this->useragent);`
`310`	`316`	`}`
`311`	`317`	`}`
`312`	`318`	`if (!$file->success)`
`@@ -317,7 +323,7 @@ EOT;`
`317`	`323`
`318`	`324`	`if (!SimplePie_Locator::is_feed($file))`
`319`	`325`	`{`
`320`		`- $locate = new SimplePie_Locator($file);`
	`326`	`+ $locate = new SimplePie_Locator($file, $this->timeout, $this->useragent);`
`321`	`327`	`$feed = $locate->find();`
`322`	`328`	`if ($feed)`
`323`	`329`	`{`
`@@ -511,7 +517,7 @@ EOT;`
`511`	`517`
`512`	`518`	`if ($check)`
`513`	`519`	`{`
`514`		`- $file = new SimplePie_File($favicon);`
	`520`	`+ $file = new SimplePie_File($favicon, $this->timeout/10, 5, null, $this->useragent);`
`515`	`521`	`$headers = $file->headers();`
`516`	`522`	`$file->close();`
`517`	`523`
`@@ -2037,7 +2043,7 @@ class SimplePie_File`
`2037`	`2043`	`$out = "GET $get HTTP/1.0\r\n";`
`2038`	`2044`	`$out .= "Host: $url_parts[host]\r\n";`
`2039`	`2045`	`$out .= "User-Agent: $useragent\r\n";`
`2040`		`- if (extension_loaded('zlib') && function_exists('gzinflate'))`
	`2046`	`+ if (function_exists('gzinflate'))`
`2041`	`2047`	`{`
`2042`	`2048`	`$out .= "Accept-Encoding: gzip,deflate\r\n";`
`2043`	`2049`	`}`
`@@ -3362,20 +3368,23 @@ class SimplePie_Misc`
`3362`	`3368`	`class SimplePie_Locator`
`3363`	`3369`	`{`
`3364`	`3370`	`var $useragent;`
	`3371`	`+ var $timeout;`
`3365`	`3372`	`var $file;`
`3366`	`3373`	`var $local;`
`3367`	`3374`	`var $elsewhere;`
`3368`	`3375`
`3369`		`- function SimplePie_Locator(&$file)`
	`3376`	`+ function SimplePie_Locator(&$file, $timeout = 10, $useragent = null)`
`3370`	`3377`	`{`
`3371`	`3378`	`if (!is_a($file, 'SimplePie_File'))`
`3372`	`3379`	`{`
`3373`		`- $this->file = new SimplePie_File($file);`
	`3380`	`+ $this->file = new SimplePie_File($file, $timeout, $useragent);`
`3374`	`3381`	`}`
`3375`	`3382`	`else`
`3376`	`3383`	`{`
`3377`	`3384`	`$this->file =& $file;`
`3378`	`3385`	`}`
	`3386`	`+ $this->useragent = $useragent;`
	`3387`	`+ $this->timeout = $timeout;`
`3379`	`3388`	`}`
`3380`	`3389`
`3381`	`3390`
`@@ -3386,8 +3395,6 @@ class SimplePie_Locator`
`3386`	`3395`	`return $this->file->url;`
`3387`	`3396`	`}`
`3388`	`3397`
`3389`		`- $this->useragent = $this->file->useragent;`
`3390`		`-`
`3391`	`3398`	`$autodiscovery = $this->autodiscovery($this->file);`
`3392`	`3399`	`if ($autodiscovery)`
`3393`	`3400`	`{`
`@@ -3433,7 +3440,14 @@ class SimplePie_Locator`
`3433`	`3440`	`{`
`3434`	`3441`	`if (!is_a($file, 'SimplePie_File'))`
`3435`	`3442`	`{`
`3436`		`- $file2 = new SimplePie_File($file, 1, 5, null, $this->useragent);`
	`3443`	`+ if (isset($this))`
	`3444`	`+ {`
	`3445`	`+ $file2 = new SimplePie_File($file, $this->timeout, 5, null, $this->useragent);`
	`3446`	`+ }`
	`3447`	`+ else`
	`3448`	`+ {`
	`3449`	`+ $file2 = new SimplePie_File($file);`
	`3450`	`+ }`
`3437`	`3451`	`$file2->body();`
`3438`	`3452`	`$file2->close();`
`3439`	`3453`	`}`