[FEATURE] Support for proxy NTLM authentication 10/23510/4
authorTomita Militaru <militarutomita@gmail.com>
Sat, 31 Aug 2013 10:51:24 +0000 (13:51 +0300)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 15 Oct 2013 14:52:32 +0000 (16:52 +0200)
Set curl option for NTLM authentication and a configuration entry
in the install tool.

Resolves: #14730
Releases: 6.2
Change-Id: I9a5bac36e2280eca893c2da4e39b4c4f701b7f2b
Reviewed-on: https://review.typo3.org/23510
Reviewed-by: Wouter Wolters
Reviewed-by: Philipp Gampe
Reviewed-by: Dmitry Dulepov
Reviewed-by: Kay Strobach
Tested-by: Kay Strobach
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/core/Classes/Utility/GeneralUtility.php
typo3/sysext/core/Configuration/DefaultConfiguration.php

index 0b25c21..feb3a1e 100644 (file)
@@ -2340,6 +2340,9 @@ class GeneralUtility {
                        // (Proxy support implemented by Arco <arco@appeltaart.mine.nu>)
                        if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {
                                curl_setopt($ch, CURLOPT_PROXY, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);
+                               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyNTLM']) {
+                                       curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_NTLM);
+                               }
                                if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']) {
                                        curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']);
                                }
index 40e9275..de6293d 100644 (file)
@@ -84,6 +84,7 @@ return array(
                'loginCopyrightWarrantyURL' => '',              // String: Add the URL where you explain the extend of the warranty you provide. This URL is displayed in the login dialog as the place where people can learn more about the conditions of your warranty. Must be set (more than 10 chars) in addition with the 'loginCopyrightWarrantyProvider' message.
                'loginCopyrightShowVersion' => FALSE,   // Boolean: If set, the current TYPO3 version is shown.
                'curlUse' => FALSE,                                             // Boolean: If set, try to use cURL to fetch external URLs
+               'curlProxyNTLM' => FALSE,                                       // Boolean: Proxy NTLM authentication support.
                /**
                 * @deprecated Deprecated since 4.6 - will be removed in 6.2.
                 */