phpwebsite-comm-cvs-commits

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24754/Auth/Yadis

Modified Files:
	HTTPFetcher.php Manager.php ParanoidHTTPFetcher.php 
Log Message:
Update to 2.0.1 PHP OpenID library

Index: ParanoidHTTPFetcher.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/ParanoidHTTPFetcher.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ParanoidHTTPFetcher.php	4 Feb 2008 04:54:31 -0000	1.1.1.1
--- ParanoidHTTPFetcher.php	24 May 2008 14:45:29 -0000	1.2
***************
*** 61,65 ****
      {
          $v = curl_version();
!         return in_array('https', $v['protocols']);
      }
  
--- 61,71 ----
      {
          $v = curl_version();
!         if(is_array($v)) {
!             return in_array('https', $v['protocols']);
!         } elseif (is_string($v)) {
!             return preg_match('/OpenSSL/i', $v);
!         } else {
!             return 0;
!         }
      }
  
***************
*** 149,153 ****
          $c = curl_init();
  
!         curl_setopt($c, CURLOPT_NOSIGNAL, true);
          curl_setopt($c, CURLOPT_POST, true);
          curl_setopt($c, CURLOPT_POSTFIELDS, $body);
--- 155,162 ----
          $c = curl_init();
  
!         if (defined('CURLOPT_NOSIGNAL')) {
!             curl_setopt($c, CURLOPT_NOSIGNAL, true);
!         }
! 
          curl_setopt($c, CURLOPT_POST, true);
          curl_setopt($c, CURLOPT_POSTFIELDS, $body);

Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/Manager.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Manager.php	4 Feb 2008 04:54:31 -0000	1.1.1.1
--- Manager.php	24 May 2008 14:45:29 -0000	1.2
***************
*** 362,366 ****
   * High-level usage pattern is to call .getNextService(discover) in
   * order to find the next available service for this user for this
!  * session. Once a request completes, call .finish() to clean up the
   * session state.
   *
--- 362,366 ----
   * High-level usage pattern is to call .getNextService(discover) in
   * order to find the next available service for this user for this
!  * session. Once a request completes, call .cleanup() to clean up the
   * session state.
   *
***************
*** 411,415 ****
          if (!$manager || (!$manager->services)) {
              $this->destroyManager();
-             $http_response = array();
  
              list($yadis_url, $services) = call_user_func($discover_cb,
--- 411,414 ----

Index: HTTPFetcher.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/openid/class/Auth/Yadis/HTTPFetcher.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** HTTPFetcher.php	4 Feb 2008 04:54:31 -0000	1.1.1.1
--- HTTPFetcher.php	24 May 2008 14:45:29 -0000	1.2
***************
*** 86,90 ****
      {
          foreach ($headers as $line) {
!             if (strpos($line, "Location: ") === 0) {
                  $parts = explode(" ", $line, 2);
                  return $parts[1];
--- 86,90 ----
      {
          foreach ($headers as $line) {
!             if (strpos(strtolower($line), "location: ") === 0) {
                  $parts = explode(" ", $line, 2);
                  return $parts[1];