Timeout test

WordPress · Jan 24, 2014 · 247a225 · 247a225
1 parent 0c6a797
commit 247a225
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/library/Requests/Transport/fsockopen.php b/library/Requests/Transport/fsockopen.php
@@ -198,8 +198,8 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 			$options['hooks']->dispatch('fsockopen.after_request', array(&$fake_headers));
 			return '';
 		}
-        
-        $timeout_sec = (int) floor( $options['timeout'] );
+
+		$timeout_sec = (int) floor( $options['timeout'] );
 		$timeout_msec = $timeout_sec == $options['timeout'] ? 0 : 1000000 * $options['timeout'] % 1000000;
 		stream_set_timeout( $fp, $timeout_sec, $timeout_msec );
 

diff --git a/tests/Requests.php b/tests/Requests.php
@@ -137,4 +137,12 @@ public function test30xWithoutLocation() {
 		$this->assertEquals(302, $response->status_code);
 		$this->assertEquals(0, $response->redirects);
 	}
+
+	/**
+	 * @expectedException Requests_Exception
+	 */
+	public function testTimeoutException() {
+		$options = array('timeout' => 0.5);
+		$response = Requests::get('http://httpbin.org/delay/3', array(), $options);
+	}
 }