tony2001 Tue Dec 4 08:56:07 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl interface.c multi.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.4&r2=1.62.2.14.2.27.2.5&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.4 php-src/ext/curl/interface.c:1.62.2.14.2.27.2.5 --- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.4 Fri Nov 16 14:21:01 2007 +++ php-src/ext/curl/interface.c Tue Dec 4 08:56:07 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.62.2.14.2.27.2.4 2007/11/16 14:21:01 jani Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.5 2007/12/04 08:56:07 tony2001 Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -931,7 +931,7 @@ } /* }}} */ -static int curl_debug(CURL *cp, curl_infotype type, char *buf, size_t buf_len, void *ctx) +static int curl_debug(CURL *cp, curl_infotype type, char *buf, size_t buf_len, void *ctx) /* {{{ */ { php_curl *ch = (php_curl *) ctx; @@ -947,6 +947,7 @@ return 0; } +/* }}} */ #if CURLOPT_PASSWDFUNCTION != 0 /* {{{ curl_passwd @@ -1214,7 +1215,7 @@ } /* }}} */ -static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *return_value TSRMLS_DC) +static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *return_value TSRMLS_DC) /* {{{ */ { CURLcode error=CURLE_OK; @@ -1603,6 +1604,7 @@ return 0; } } +/* }}} */ /* {{{ proto bool curl_setopt(resource ch, int option, mixed value) Set an option for a cURL transfer */ http://cvs.php.net/viewvc.cgi/php-src/ext/curl/multi.c?r1=1.19.2.3.2.7&r2=1.19.2.3.2.7.2.1&diff_format=u Index: php-src/ext/curl/multi.c diff -u php-src/ext/curl/multi.c:1.19.2.3.2.7 php-src/ext/curl/multi.c:1.19.2.3.2.7.2.1 --- php-src/ext/curl/multi.c:1.19.2.3.2.7 Mon Jan 1 09:35:48 2007 +++ php-src/ext/curl/multi.c Tue Dec 4 08:56:07 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: multi.c,v 1.19.2.3.2.7 2007/01/01 09:35:48 sebastian Exp $ */ +/* $Id: multi.c,v 1.19.2.3.2.7.2.1 2007/12/04 08:56:07 tony2001 Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -122,13 +122,13 @@ /* }}} */ /* Used internally as comparison routine passed to zend_list_del_element */ -static int curl_compare_resources( zval *z1, zval **z2 ) +static int curl_compare_resources( zval *z1, zval **z2 ) /* {{{ */ { return (Z_TYPE_P( z1 ) == Z_TYPE_PP( z2 ) && Z_TYPE_P( z1 ) == IS_RESOURCE && Z_LVAL_P( z1 ) == Z_LVAL_PP( z2 ) ); } - +/* }}} */ /* {{{ proto int curl_multi_remove_handle(resource mh, resource ch) Remove a multi handle from a set of cURL handles */ @@ -155,7 +155,7 @@ } /* }}} */ -static void _make_timeval_struct(struct timeval *to, double timeout) +static void _make_timeval_struct(struct timeval *to, double timeout) /* {{{ */ { unsigned long conv; @@ -163,6 +163,7 @@ to->tv_sec = conv / 1000000; to->tv_usec = conv % 1000000; } +/* }}} */ /* {{{ proto int curl_multi_select(resource mh[, double timeout]) Get all the sockets associated with the cURL extension, which can then be "selected" */ @@ -319,7 +320,7 @@ } /* }}} */ -void _php_curl_multi_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) +void _php_curl_multi_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */ { php_curlm *mh = (php_curlm *) rsrc->ptr; if (mh) { @@ -329,6 +330,7 @@ rsrc->ptr = NULL; } } +/* }}} */ #endif
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php