13309.diff

Administrator Admin, 2010-07-13 13:58

Download (1.91 KB)

View differences:

t3lib/config_default.php (working copy)
78 78
		'curlProxyServer' => '',				// String: Proxyserver as http://proxy:port/.
79 79
		'curlProxyTunnel' => FALSE,				// Boolean: If set, use a tunneled connection through the proxy (usefull for websense etc.).
80 80
		'curlProxyUserPass' => '',				// String: Proxyserver authentication user:pass.
81
		'curlTimeout' => 0,						// Integer: Timeout value for cURL requests in seconds. 0 means to wait indefinitely.
81 82
		'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'
82 83
		'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!
83 84
		'contentTable' => '',					// This is the page-content table (Normally 'tt_content')
t3lib/class.t3lib_div.php (working copy)
2817 2817
			curl_setopt($ch, CURLOPT_HTTPGET, $includeHeader == 2 ? 'HEAD' : 'GET');
2818 2818
			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
2819 2819
			curl_setopt($ch, CURLOPT_FAILONERROR, 1);
2820
			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, max(0, intval($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlTimeout'])));
2820 2821

  
2821 2822
				// may fail (PHP 5.2.0+ and 5.1.5+) when open_basedir or safe_mode are enabled
2822 2823
			$followLocation = @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);