[BUGFIX] Fix T3editor after PSR-7 change
[Packages/TYPO3.CMS.git] / typo3 / sysext / openid / lib / php-openid / php-openid-typo3.patch
index 89c0410..be2fd9b 100644 (file)
@@ -1,10 +1,15 @@
-diff -b -r -u Auth/Yadis/ParanoidHTTPFetcher.php Auth/Yadis/ParanoidHTTPFetcher.php
---- Auth/Yadis/ParanoidHTTPFetcher.php 2008-09-09 21:12:13.000000000 +0200
-+++ Auth/Yadis/ParanoidHTTPFetcher.php 2008-09-24 22:24:11.000000000 +0200
-@@ -130,6 +130,19 @@
-             curl_setopt($c, CURLOPT_RANGE, 
-                         "0-".(1024 * Auth_OpenID_FETCHER_MAX_RESPONSE_KB));
+ .../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']);
@@ -21,9 +26,9 @@ diff -b -r -u Auth/Yadis/ParanoidHTTPFetcher.php Auth/Yadis/ParanoidHTTPFetcher.
              curl_exec($c);
  
              $code = curl_getinfo($c, CURLINFO_HTTP_CODE);
-@@ -194,6 +207,19 @@
-         curl_setopt($c, CURLOPT_WRITEFUNCTION,
-                     array(&$this, "_writeData"));
+@@ -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']) {
@@ -38,24 +43,6 @@ diff -b -r -u Auth/Yadis/ParanoidHTTPFetcher.php Auth/Yadis/ParanoidHTTPFetcher.
 +              }
 +              // </TYPO3-specific>
 +
-         curl_exec($c);
-         $code = curl_getinfo($c, CURLINFO_HTTP_CODE);
-Index: typo3/sysext/openid/lib/php-openid/Auth/OpenID/Consumer.php
-===================================================================
---- typo3/sysext/openid/lib/php-openid/Auth/OpenID/Consumer.php        (revision 7119)
-+++ typo3/sysext/openid/lib/php-openid/Auth/OpenID/Consumer.php        (working copy)
-@@ -957,7 +957,11 @@
-             }
-             if (!$assoc->checkMessageSignature($message)) {
--                return new Auth_OpenID_FailureResponse(null,
-+                              // If we get a "bad signature" here, it means that the association
-+                              // is unrecoverabley corrupted in some way. Any futher attempts
-+                              // to login with this association is likely to fail. Drop it.
-+                              $this->store->removeAssociation($server_url, $assoc_handle);
-+                              return new Auth_OpenID_FailureResponse(null,
-                                                        "Bad signature");
-             }
-         } else {
-
+         curl_setopt($c, CURLOPT_POST, true);
+         curl_setopt($c, CURLOPT_POSTFIELDS, $body);
+         curl_setopt($c, CURLOPT_TIMEOUT, $this->timeout);