[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl interface.c

[Pierre-Alain Joye]

pajoye          Mon May 18 11:17:52 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/curl   interface.c 
  Log:
  - WS
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.40&r2=1.62.2.14.2.27.2.41&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.40 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.41
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.40    Mon May 18 10:31:08 2009
+++ php-src/ext/curl/interface.c        Mon May 18 11:17:51 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.40 2009/05/18 10:31:08 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.41 2009/05/18 11:17:51 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -582,14 +582,14 @@
        REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
 
 #if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 
7.10.6 */
-       REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
-       /* http authentication options */
-       REGISTER_CURL_CONSTANT(CURLAUTH_BASIC);
-       REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST);
-       REGISTER_CURL_CONSTANT(CURLAUTH_GSSNEGOTIATE);
-       REGISTER_CURL_CONSTANT(CURLAUTH_NTLM);
-       REGISTER_CURL_CONSTANT(CURLAUTH_ANY);
-       REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE);
+       REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
+       /* http authentication options */
+       REGISTER_CURL_CONSTANT(CURLAUTH_BASIC);
+       REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST);
+       REGISTER_CURL_CONSTANT(CURLAUTH_GSSNEGOTIATE);
+       REGISTER_CURL_CONSTANT(CURLAUTH_NTLM);
+       REGISTER_CURL_CONSTANT(CURLAUTH_ANY);
+       REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE);
 #endif
 
 #if LIBCURL_VERSION_NUM > 0x070a06 /* CURLOPT_PROXYAUTH & 
CURLOPT_FTP_CREATE_MISSING_DIRS are available since curl 7.10.7 */
@@ -2134,13 +2134,13 @@
                        case CURLINFO_PRIVATE:
                        case CURLINFO_EFFECTIVE_URL:
                        case CURLINFO_CONTENT_TYPE: {
-                               char *s_code = NULL;
+                               char *s_code = NULL;
 
-                               if (curl_easy_getinfo(ch->cp, option, &s_code) 
== CURLE_OK && s_code) {
-                                       RETURN_STRING(s_code, 1);
-                               } else {
-                                       RETURN_FALSE;
-                               }
+                               if (curl_easy_getinfo(ch->cp, option, &s_code) 
== CURLE_OK && s_code) {
+                                       RETURN_STRING(s_code, 1);
+                               } else {
+                                       RETURN_FALSE;
+                               }
                                break;
                        }
                        case CURLINFO_HTTP_CODE:



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php