[BUGFIX] Fix T3editor after PSR-7 change
[Packages/TYPO3.CMS.git] / typo3 / sysext / openid / lib / php-openid / php-openid-typo3.patch
index 510010e..be2fd9b 100644 (file)
@@ -1,43 +1,48 @@
-diff -b -r -u Auth/Yadis/ParanoidHTTPFetcher.php Auth/Yadis/ParanoidHTTPFetcher.php\r
---- Auth/Yadis/ParanoidHTTPFetcher.php 2008-09-09 21:12:13.000000000 +0200\r
-+++ Auth/Yadis/ParanoidHTTPFetcher.php 2008-09-24 22:24:11.000000000 +0200\r
-@@ -130,6 +130,19 @@\r
-             curl_setopt($c, CURLOPT_RANGE, \r
-                         "0-".(1024 * Auth_OpenID_FETCHER_MAX_RESPONSE_KB));\r
\r
-+                      // <TYPO3-specific>\r
-+                      if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {\r
-+                              curl_setopt($c, CURLOPT_PROXY, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);\r
-+\r
-+                              if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']) {\r
-+                                      curl_setopt($c, CURLOPT_HTTPPROXYTUNNEL, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']);\r
-+                              }\r
-+                              if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']) {\r
-+                                      curl_setopt($c, CURLOPT_PROXYUSERPWD, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']);\r
-+                              }\r
-+                      }\r
-+                      // </TYPO3-specific>\r
-+\r
-             curl_exec($c);\r
\r
-             $code = curl_getinfo($c, CURLINFO_HTTP_CODE);\r
-@@ -194,6 +207,19 @@\r
-         curl_setopt($c, CURLOPT_WRITEFUNCTION,\r
-                     array(&$this, "_writeData"));\r
\r
-+              // <TYPO3-specific>\r
-+              if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {\r
-+                      curl_setopt($c, CURLOPT_PROXY, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);\r
-+\r
-+                      if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']) {\r
-+                              curl_setopt($c, CURLOPT_HTTPPROXYTUNNEL, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']);\r
-+                      }\r
-+                      if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']) {\r
-+                              curl_setopt($c, CURLOPT_PROXYUSERPWD, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']);\r
-+                      }\r
-+              }\r
-+              // </TYPO3-specific>\r
-+\r
-         curl_exec($c);\r
\r
-         $code = curl_getinfo($c, CURLINFO_HTTP_CODE);\r
+ .../php-openid/Auth/Yadis/ParanoidHTTPFetcher.php  | 27 ++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+diff --git a/typo3/sysext/openid/lib/php-openid/Auth/Yadis/ParanoidHTTPFetcher.php b/typo3/sysext/openid/lib/php-openid/Auth/Yadis/ParanoidHTTPFetcher.php
+index 627ea9a..af5043e 100644
+--- a/typo3/sysext/openid/lib/php-openid/Auth/Yadis/ParanoidHTTPFetcher.php
++++ b/typo3/sysext/openid/lib/php-openid/Auth/Yadis/ParanoidHTTPFetcher.php
+@@ -153,6 +153,20 @@ class Auth_Yadis_ParanoidHTTPFetcher extends Auth_Yadis_HTTPFetcher {
+             if (defined('Auth_OpenID_HTTP_PROXY')) {
+                 curl_setopt($c, CURLOPT_PROXY, Auth_OpenID_HTTP_PROXY);
+             }
++
++                      // <TYPO3-specific>
++                      if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {
++                              curl_setopt($c, CURLOPT_PROXY, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);
++
++                              if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']) {
++                                      curl_setopt($c, CURLOPT_HTTPPROXYTUNNEL, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']);
++                              }
++                              if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']) {
++                                      curl_setopt($c, CURLOPT_PROXYUSERPWD, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']);
++                              }
++                      }
++                      // </TYPO3-specific>
++
+             curl_exec($c);
+             $code = curl_getinfo($c, CURLINFO_HTTP_CODE);
+@@ -216,6 +230,19 @@ class Auth_Yadis_ParanoidHTTPFetcher extends Auth_Yadis_HTTPFetcher {
+             curl_setopt($c, CURLOPT_PROXY, Auth_OpenID_HTTP_PROXY);
+         }
++              // <TYPO3-specific>
++              if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {
++                      curl_setopt($c, CURLOPT_PROXY, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);
++
++                      if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']) {
++                              curl_setopt($c, CURLOPT_HTTPPROXYTUNNEL, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyTunnel']);
++                      }
++                      if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']) {
++                              curl_setopt($c, CURLOPT_PROXYUSERPWD, $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyUserPass']);
++                      }
++              }
++              // </TYPO3-specific>
++
+         curl_setopt($c, CURLOPT_POST, true);
+         curl_setopt($c, CURLOPT_POSTFIELDS, $body);
+         curl_setopt($c, CURLOPT_TIMEOUT, $this->timeout);