jani Tue May 19 13:50:33 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
Log:
MFH: Sync with PHP_5_3 the WS/CS and some missing constant fixes
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.47&r2=1.62.2.14.2.48&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.47
php-src/ext/curl/interface.c:1.62.2.14.2.48
--- php-src/ext/curl/interface.c:1.62.2.14.2.47 Mon May 18 09:11:31 2009
+++ php-src/ext/curl/interface.c Tue May 19 13:50:32 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.47 2009/05/18 09:11:31 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.48 2009/05/19 13:50:32 jani Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -158,13 +158,14 @@
#define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
#if defined(PHP_WIN32) || defined(__GNUC__)
- #define php_curl_ret(__ret) RETVAL_FALSE; return __ret;
+# define php_curl_ret(__ret) RETVAL_FALSE; return __ret;
#else
- #define php_curl_ret(__ret) RETVAL_FALSE; return;
+# define php_curl_ret(__ret) RETVAL_FALSE; return;
#endif
-static int php_curl_option_url(php_curl *ch, const char *url, const int len) {
- CURLcode error=CURLE_OK;
+static int php_curl_option_url(php_curl *ch, const char *url, const int len)
/* {{{ */
+{
+ CURLcode error = CURLE_OK;
#if LIBCURL_VERSION_NUM < 0x071100
char *copystr = NULL;
#endif
@@ -201,6 +202,7 @@
return (error == CURLE_OK ? 1 : 0);
}
+/* }}} */
/* {{{ arginfo */
static
@@ -300,7 +302,6 @@
ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0)
ZEND_ARG_INFO(0, mh)
ZEND_END_ARG_INFO()
-
/* }}} */
/* {{{ curl_functions[]
@@ -368,6 +369,10 @@
le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL,
"curl", module_number);
le_curl_multi_handle =
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, "curl",
module_number);
+ /* See http://curl.haxx.se/lxr/source/docs/libcurl/symbols-in-versions
+ or curl src/docs/libcurl/symbols-in-versions for a (almost) complete
list
+ of options and which version they were introduced */
+
/* Constants for curl_setopt() */
REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT);
@@ -481,14 +486,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 */
@@ -608,8 +613,8 @@
#if LIBCURL_VERSION_NUM >= 0x070b00
REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
#endif
-
REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
+ REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS4);
REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
REGISTER_CURL_CONSTANT(CURL_NETRC_OPTIONAL);
@@ -1059,7 +1064,7 @@
PHP_FUNCTION(curl_version)
{
curl_version_info_data *d;
- long uversion = CURLVERSION_NOW;
+ long uversion = CURLVERSION_NOW;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &uversion)
== FAILURE) {
return;
@@ -1123,10 +1128,10 @@
Initialize a cURL session */
PHP_FUNCTION(curl_init)
{
- zval **url;
- php_curl *ch;
- CURL *cp;
- int argc = ZEND_NUM_ARGS();
+ php_curl *ch;
+ zval **url;
+ CURL *cp;
+ int argc = ZEND_NUM_ARGS();
if (argc < 0 || argc > 1 || zend_get_parameters_ex(argc, &url) ==
FAILURE) {
WRONG_PARAM_COUNT;
@@ -1186,14 +1191,14 @@
Copy a cURL handle along with all of it's preferences */
PHP_FUNCTION(curl_copy_handle)
{
- zval **zid;
- CURL *cp;
- php_curl *ch;
- php_curl *dupch;
+ CURL *cp;
+ zval **zid;
+ php_curl *ch, *dupch;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &zid) == FAILURE)
{
WRONG_PARAM_COUNT;
}
+
ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
cp = curl_easy_duphandle(ch->cp);
@@ -1206,6 +1211,7 @@
TSRMLS_SET_CTX(dupch->thread_ctx);
dupch->cp = cp;
+ dupch->uses = 0;
dupch->handlers->write->method = ch->handlers->write->method;
dupch->handlers->write->type = ch->handlers->write->type;
dupch->handlers->read->method = ch->handlers->read->method;
@@ -1377,7 +1383,8 @@
case CURLOPT_SSLENGINE:
case CURLOPT_SSLENGINE_DEFAULT:
case CURLOPT_SSLCERTTYPE:
- case CURLOPT_ENCODING: {
+ case CURLOPT_ENCODING:
+ {
#if LIBCURL_VERSION_NUM < 0x071100
char *copystr = NULL;
#endif
@@ -1515,7 +1522,7 @@
uint string_key_len;
postfields = HASH_OF(*zvalue);
- if (! postfields) {
+ if (!postfields) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Couldn't get HashTable in CURLOPT_POSTFIELDS");
RETVAL_FALSE;
return 1;
@@ -1588,8 +1595,8 @@
} else {
#if LIBCURL_VERSION_NUM >= 0x071101
- /* with curl 7.17.0 and later, we can use
COPYPOSTFIELDS, but we have to provide size before */
convert_to_string_ex(zvalue);
+ /* with curl 7.17.0 and later, we can use
COPYPOSTFIELDS, but we have to provide size before */
error = curl_easy_setopt(ch->cp,
CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
error = curl_easy_setopt(ch->cp,
CURLOPT_COPYPOSTFIELDS, Z_STRVAL_PP(zvalue));
#else
@@ -1695,7 +1702,7 @@
PHP_FUNCTION(curl_setopt)
{
zval **zid, **zoption, **zvalue;
- php_curl *ch;
+ php_curl *ch;
if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &zid, &zoption,
&zvalue) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -1719,24 +1726,24 @@
{
zval *zid, *arr, **entry;
php_curl *ch;
- long option;
+ ulong option;
HashPosition pos;
- char *string_key;
- int str_key_len;
+ char *string_key;
+ uint str_key_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "za", &zid, &arr)
== FAILURE) {
- RETURN_FALSE;
+ return;
}
ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), &pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void **)&entry,
&pos) == SUCCESS) {
- if (zend_hash_get_current_key_ex(Z_ARRVAL_P(arr), &string_key,
&str_key_len, &option, 0, &pos) == HASH_KEY_IS_STRING) {
+ if (zend_hash_get_current_key_ex(Z_ARRVAL_P(arr), &string_key,
&str_key_len, &option, 0, &pos) != HASH_KEY_IS_LONG) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array keys
must be CURLOPT constants or equivalent integer values");
RETURN_FALSE;
}
- if (_php_curl_setopt(ch, option, entry, return_value
TSRMLS_CC)) {
+ if (_php_curl_setopt(ch, (long) option, entry, return_value
TSRMLS_CC)) {
RETURN_FALSE;
}
zend_hash_move_forward_ex(Z_ARRVAL_P(arr), &pos);
@@ -1766,9 +1773,9 @@
Perform a cURL session */
PHP_FUNCTION(curl_exec)
{
- zval **zid;
- php_curl *ch;
- CURLcode error;
+ CURLcode error;
+ zval **zid;
+ php_curl *ch;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &zid) == FAILURE)
{
WRONG_PARAM_COUNT;
@@ -1808,10 +1815,9 @@
Get information regarding a specific transfer */
PHP_FUNCTION(curl_getinfo)
{
- zval **zid,
- **zoption;
- php_curl *ch;
- int option, argc = ZEND_NUM_ARGS();
+ zval **zid, **zoption;
+ php_curl *ch;
+ int option, argc = ZEND_NUM_ARGS();
if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &zid,
&zoption) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -1902,13 +1908,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:
@@ -1962,8 +1968,8 @@
Return a string contain the last error for the current session */
PHP_FUNCTION(curl_error)
{
- zval **zid;
- php_curl *ch;
+ zval **zid;
+ php_curl *ch;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &zid) == FAILURE)
{
WRONG_PARAM_COUNT;
@@ -1980,8 +1986,8 @@
Return an integer containing the last error number */
PHP_FUNCTION(curl_errno)
{
- zval **zid;
- php_curl *ch;
+ zval **zid;
+ php_curl *ch;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &zid) == FAILURE)
{
WRONG_PARAM_COUNT;
@@ -1997,8 +2003,8 @@
Close a cURL session */
PHP_FUNCTION(curl_close)
{
- zval **zid;
- php_curl *ch;
+ zval **zid;
+ php_curl *ch;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &zid) == FAILURE)
{
WRONG_PARAM_COUNT;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
