Fixed bug #13309: t3lib_div::getURL curl connection has no connection timeout

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8190 709f56b5-9817-0410-a4d7-c38de5d9e867

Author: dmitry

ChangeLog

@@ -2,6 +2,7 @@
 
 	* Fixed bug #6208: zlib must be compiled in to make an extension lookup
 	* Fixed bug #12322: cHash is generated when no parameters are given
+	* Fixed bug #13309: t3lib_div::getURL curl connection has no connection timeout
 
 2010-07-13  Jeff Segars  <[email protected]>
 

t3lib/class.t3lib_div.php

@@ -2817,6 +2817,7 @@ public static function getURL($url, $includeHeader = 0, $requestHeaders = false,
 			curl_setopt($ch, CURLOPT_HTTPGET, $includeHeader == 2 ? 'HEAD' : 'GET');
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 			curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, max(0, intval($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlTimeout'])));
 
 				// may fail (PHP 5.2.0+ and 5.1.5+) when open_basedir or safe_mode are enabled
 			$followLocation = @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);

t3lib/config_default.php

@@ -78,6 +78,7 @@
 		'curlProxyServer' => '',				// String: Proxyserver as http://proxy:port/.
 		'curlProxyTunnel' => FALSE,				// Boolean: If set, use a tunneled connection through the proxy (usefull for websense etc.).
 		'curlProxyUserPass' => '',				// String: Proxyserver authentication user:pass.
+		'curlTimeout' => 0,						// Integer: Timeout value for cURL requests in seconds. 0 means to wait indefinitely.
 		'form_enctype' => 'multipart/form-data',	// String: This is the default form encoding type for most forms in TYPO3. It allows for file uploads to be in the form. However if file-upload is disabled for your PHP version even ordinary data sent with this encryption will not get to the server. So if you have file_upload disabled, you will have to change this to eg. 'application/x-www-form-urlencoded'
 		'textfile_ext' => 'txt,html,htm,css,tmpl,js,sql,xml,csv,' . PHP_EXTENSIONS_DEFAULT,	// Text file extensions. Those that can be edited. Executable PHP files may not be editable in webspace if disallowed!
 		'contentTable' => '',					// This is the page-content table (Normally 'tt_content')