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

[Antony Dovgal]

tony2001                Tue Jul  1 08:10:47 2008 UTC

  Modified files:              
    /php-src/ext/curl   interface.c 
  Log:
  fix curl_init()
  "s" in HEAD accepts zstr
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.122&r2=1.123&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.122 php-src/ext/curl/interface.c:1.123
--- php-src/ext/curl/interface.c:1.122  Mon Dec 31 07:12:08 2007
+++ php-src/ext/curl/interface.c        Tue Jul  1 08:10:47 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c,v 1.122 2007/12/31 07:12:08 sebastian Exp $ */
+/* $Id: interface.c,v 1.123 2008/07/01 08:10:47 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1089,17 +1089,17 @@
 {
        php_curl        *ch;
        CURL            *cp;
-       char            *src = NULL;
+       zstr            src = NULL_ZSTR;
        int             src_len;
        zend_uchar      src_type;
 
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|t", &src, 
&src_len, &src_type) == FAILURE) {
-                RETURN_FALSE;
-        }
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|t", &src, 
&src_len, &src_type) == FAILURE) {
+               RETURN_FALSE;
+       }
 
-       if (src && src_type == IS_UNICODE) {
-               src = zend_unicode_to_ascii((UChar*)src, src_len TSRMLS_CC);
-               if (!src) {
+       if (src.v && src_type == IS_UNICODE) {
+               src.s = zend_unicode_to_ascii((UChar*)src.u, src_len TSRMLS_CC);
+               if (!src.s) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Binary or 
ASCII-Unicode string expected, non-ASCII-Unicode string received"); 
                        RETURN_FALSE;
                }
@@ -1139,10 +1139,10 @@
        curl_easy_setopt(ch->cp, CURLOPT_NOSIGNAL, 1);
 #endif
 
-       if (src) {
+       if (src.v) {
                char *urlcopy;
 
-               urlcopy = estrndup(src, src_len);
+               urlcopy = estrndup(src.s, src_len);
                curl_easy_setopt(ch->cp, CURLOPT_URL, urlcopy);
                zend_llist_add_element(&ch->to_free.str, &urlcopy);
        }



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