[TASK] Merge submodule dbal into core
[Packages/TYPO3.CMS.git] / typo3 / sysext / openid / lib / php-openid / php-openid-typo3.patch
1 --- Auth/Yadis/ParanoidHTTPFetcher.php  2012-10-21 00:26:52.036842042 +0200
2 +++ Auth/Yadis/ParanoidHTTPFetcher.php  2012-10-21 00:33:46.515660341 +0200
3 @@ -142,6 +142,19 @@
4                  }
5              }
6  
7 +                       // <TYPO3-specific>
8 +                       if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {
9 +                               curl_setopt($c, CURLOPT_PROXY, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);
10 +
11 +                               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']) {
12 +                                       curl_setopt($c, CURLOPT_HTTPPROXYTUNNEL, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']);
13 +                               }
14 +                               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']) {
15 +                                       curl_setopt($c, CURLOPT_PROXYUSERPWD, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']);
16 +                               }
17 +                       }
18 +                       // </TYPO3-specific>
19 +
20              curl_exec($c);
21  
22              $code = curl_getinfo($c, CURLINFO_HTTP_CODE);
23 @@ -226,6 +239,19 @@
24              }
25          }
26  
27 +               // <TYPO3-specific>
28 +               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {
29 +                       curl_setopt($c, CURLOPT_PROXY, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);
30 +
31 +                       if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']) {
32 +                               curl_setopt($c, CURLOPT_HTTPPROXYTUNNEL, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']);
33 +                       }
34 +                       if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']) {
35 +                               curl_setopt($c, CURLOPT_PROXYUSERPWD, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']);
36 +                       }
37 +               }
38 +               // </TYPO3-specific>
39 +
40          curl_exec($c);
41  
42          $code = curl_getinfo($c, CURLINFO_HTTP_CODE);