X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=1a86c93c0ea5dbabdaeefa84223db10471055816;hp=b0a845dc4b84944869fe82a020b9b08fcba8f766;hb=fac50662a1ea545b40f15613f8c4806a1ed745b0;hpb=9abfff211db6120c2594247420857f53c967443c diff --git a/http_request_api.c b/http_request_api.c index b0a845d..1a86c93 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -29,8 +29,6 @@ # include "php_http_request_object.h" #endif -ZEND_EXTERN_MODULE_GLOBALS(http); - /* {{{ cruft for thread safe SSL crypto locks */ #if defined(ZTS) && defined(HTTP_HAVE_SSL) # ifdef PHP_WIN32 @@ -167,13 +165,16 @@ PHP_MSHUTDOWN_FUNCTION(http_request) } #define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt(request->ch, CURLOPT_##OPTION, (p)) -#define HTTP_CURL_OPT_STRING(keyname) HTTP_CURL_OPT_STRING_EX(keyname, keyname) -#define HTTP_CURL_OPT_SSL_STRING(keyname) HTTP_CURL_OPT_STRING_EX(keyname, SSL##keyname) -#define HTTP_CURL_OPT_SSL_STRING_(keyname) HTTP_CURL_OPT_STRING_EX(keyname, SSL_##keyname) -#define HTTP_CURL_OPT_STRING_EX(keyname, optname) \ +#define HTTP_CURL_OPT_STRING(keyname, obdc) HTTP_CURL_OPT_STRING_EX(keyname, keyname, obdc) +#define HTTP_CURL_OPT_SSL_STRING(keyname, obdc) HTTP_CURL_OPT_STRING_EX(keyname, SSL##keyname, obdc) +#define HTTP_CURL_OPT_SSL_STRING_(keyname,obdc ) HTTP_CURL_OPT_STRING_EX(keyname, SSL_##keyname, obdc) +#define HTTP_CURL_OPT_STRING_EX(keyname, optname, obdc) \ if (!strcasecmp(key, #keyname)) { \ - convert_to_string(*param); \ - HTTP_CURL_OPT(optname, Z_STRVAL_PP(param)); \ + zval *copy = http_request_option_cache(request, #keyname, zval_copy(IS_STRING, *param)); \ + if (obdc) { \ + HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(copy), return FAILURE); \ + } \ + HTTP_CURL_OPT(optname, Z_STRVAL_P(copy)); \ key = NULL; \ continue; \ } @@ -182,8 +183,8 @@ PHP_MSHUTDOWN_FUNCTION(http_request) #define HTTP_CURL_OPT_SSL_LONG_(keyname) HTTP_CURL_OPT_LONG_EX(keyname, SSL_##keyname) #define HTTP_CURL_OPT_LONG_EX(keyname, optname) \ if (!strcasecmp(key, #keyname)) { \ - convert_to_long(*param); \ - HTTP_CURL_OPT(optname, Z_LVAL_PP(param)); \ + zval *copy = http_request_option_cache(request, #keyname, zval_copy(IS_LONG, *param)); \ + HTTP_CURL_OPT(optname, Z_LVAL_P(copy)); \ key = NULL; \ continue; \ } @@ -193,6 +194,9 @@ PHP_MSHUTDOWN_FUNCTION(http_request) #define http_request_option(r, o, k, t) _http_request_option_ex((r), (o), (k), sizeof(k), (t) TSRMLS_CC) #define http_request_option_ex(r, o, k, l, t) _http_request_option_ex((r), (o), (k), (l), (t) TSRMLS_CC) static inline zval *_http_request_option_ex(http_request *request, HashTable *options, char *key, size_t keylen, int type TSRMLS_DC); +#define http_request_option_cache(r, k, z) _http_request_option_cache_ex((r), (k), sizeof(k), 0, (z) TSRMLS_CC) +#define http_request_option_cache_ex(r, k, kl, h, z) _http_request_option_cache_ex((r), (k), (kl), (h), (z) TSRMLS_CC) +static inline zval *_http_request_option_cache_ex(http_request *r, char *key, size_t keylen, ulong h, zval *opt TSRMLS_DC); static size_t http_curl_read_callback(void *, size_t, size_t, void *); static int http_curl_progress_callback(void *, double, double, double, double); @@ -202,19 +206,19 @@ static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *); /* }}} */ /* {{{ http_request *http_request_init(http_request *) */ -PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch, http_request_method meth, const char *url TSRMLS_DC) +PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch, http_request_method meth, const char *url ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) { http_request *r; if (request) { r = request; } else { - r = emalloc(sizeof(http_request)); + r = emalloc_rel(sizeof(http_request)); } memset(r, 0, sizeof(http_request)); r->ch = ch; - r->url = (url && *url) ? estrdup(url) : NULL; + r->url = (url) ? http_absolute_url(url) : NULL; r->meth = (meth > 0) ? meth : HTTP_GET; phpstr_init(&r->conv.request); @@ -222,7 +226,7 @@ PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch phpstr_init(&r->_cache.cookies); zend_hash_init(&r->_cache.options, 0, NULL, ZVAL_PTR_DTOR, 0); - TSRMLS_SET_CTX(request->tsrm_ls); + TSRMLS_SET_CTX(r->tsrm_ls); return r; } @@ -263,6 +267,7 @@ PHP_HTTP_API void _http_request_free(http_request **request) { if (*request) { TSRMLS_FETCH_FROM_CTX((*request)->tsrm_ls); + http_request_body_free(&(*request)->body); http_request_dtor(*request); efree(*request); *request = NULL; @@ -278,7 +283,7 @@ PHP_HTTP_API void _http_request_reset(http_request *request) request->conv.last_type = 0; phpstr_dtor(&request->conv.request); phpstr_dtor(&request->conv.response); - http_request_body_free(&request->body); + http_request_body_dtor(request->body); } /* }}} */ @@ -292,6 +297,8 @@ PHP_HTTP_API void _http_request_defaults(http_request *request) #if defined(ZTS) HTTP_CURL_OPT(NOSIGNAL, 1); #endif + HTTP_CURL_OPT(PRIVATE, request); + HTTP_CURL_OPT(ERRORBUFFER, request->_error); HTTP_CURL_OPT(HEADER, 0); HTTP_CURL_OPT(FILETIME, 1); HTTP_CURL_OPT(AUTOREFERER, 1); @@ -301,7 +308,7 @@ PHP_HTTP_API void _http_request_defaults(http_request *request) HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback); HTTP_CURL_OPT(IOCTLFUNCTION, http_curl_ioctl_callback); HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback); - HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback); + HTTP_CURL_OPT(PROGRESSFUNCTION, NULL); HTTP_CURL_OPT(URL, NULL); HTTP_CURL_OPT(NOPROGRESS, 1); HTTP_CURL_OPT(PROXY, NULL); @@ -312,13 +319,16 @@ PHP_HTTP_API void _http_request_defaults(http_request *request) HTTP_CURL_OPT(PORT, 0); HTTP_CURL_OPT(USERPWD, NULL); HTTP_CURL_OPT(HTTPAUTH, 0); - HTTP_CURL_OPT(ENCODING, 0); + HTTP_CURL_OPT(ENCODING, NULL); HTTP_CURL_OPT(FOLLOWLOCATION, 0); HTTP_CURL_OPT(UNRESTRICTED_AUTH, 0); HTTP_CURL_OPT(REFERER, NULL); HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")"); HTTP_CURL_OPT(HTTPHEADER, NULL); HTTP_CURL_OPT(COOKIE, NULL); +#if LIBCURL_VERSION_NUM >= 0x070e01 + HTTP_CURL_OPT(COOKIELIST, NULL); +#endif HTTP_CURL_OPT(COOKIEFILE, NULL); HTTP_CURL_OPT(COOKIEJAR, NULL); HTTP_CURL_OPT(RESUME_FROM, 0); @@ -359,10 +369,16 @@ PHP_HTTP_API void _http_request_set_progress_callback(http_request *request, zva if (request->_progress_callback) { zval_ptr_dtor(&request->_progress_callback); } - if (cb) { + if ((request->_progress_callback = cb)) { ZVAL_ADDREF(cb); + HTTP_CURL_OPT(NOPROGRESS, 0); + HTTP_CURL_OPT(PROGRESSDATA, request); + HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback); + } else { + HTTP_CURL_OPT(NOPROGRESS, 1); + HTTP_CURL_OPT(PROGRESSDATA, NULL); + HTTP_CURL_OPT(PROGRESSFUNCTION, NULL); } - request->_progress_callback = cb; } /* {{{ STATUS http_request_prepare(http_request *, HashTable *) */ @@ -380,12 +396,9 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti /* set options */ HTTP_CURL_OPT(DEBUGDATA, request); HTTP_CURL_OPT(URL, request->url); - HTTP_CURL_OPT(PRIVATE, request->url); /* progress callback */ - if ((zoption = http_request_option(request, options, "onprogress", 0))) { - HTTP_CURL_OPT(NOPROGRESS, 0); - HTTP_CURL_OPT(PROGRESSDATA, request); + if ((zoption = http_request_option(request, options, "onprogress", -1))) { http_request_set_progress_callback(request, zoption); } @@ -424,15 +437,6 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption)); } - /* compress, empty string enables all supported if libcurl was build with zlib support */ - if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) { -#ifdef HTTP_HAVE_CURL_ZLIB - HTTP_CURL_OPT(ENCODING, "gzip, deflate"); -#else - HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0.1"); -#endif - } - /* redirects, defaults to 0 */ if ((zoption = http_request_option(request, options, "redirect", IS_LONG))) { HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0); @@ -453,29 +457,26 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti } /* additional headers, array('name' => 'value') */ + if (request->_cache.headers) { + curl_slist_free_all(request->_cache.headers); + request->_cache.headers = NULL; + } if ((zoption = http_request_option(request, options, "headers", IS_ARRAY))) { char *header_key; ulong header_idx; HashPosition pos; - if (request->_cache.headers) { - curl_slist_free_all(request->_cache.headers); - request->_cache.headers = NULL; - } - FOREACH_KEY(pos, zoption, header_key, header_idx) { if (header_key) { zval **header_val; if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &header_val, &pos)) { char header[1024] = {0}; - zval *cpy, *val = convert_to_type_ex(IS_STRING, *header_val, &cpy); - snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_P(val)); + ZVAL_ADDREF(*header_val); + convert_to_string_ex(header_val); + snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val)); request->_cache.headers = curl_slist_append(request->_cache.headers, header); - - if (cpy) { - zval_ptr_dtor(&cpy); - } + zval_ptr_dtor(header_val); } /* reset */ @@ -483,39 +484,27 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti } } } + if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) { + request->_cache.headers = curl_slist_append(request->_cache.headers, "Accept-Encoding: gzip;q=1.0,deflate;q=0.5,*;q=0.1"); + } + HTTP_CURL_OPT(HTTPHEADER, request->_cache.headers); /* cookies, array('name' => 'value') */ if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) { - char *cookie_key = NULL; - ulong cookie_idx = 0; - HashPosition pos; - phpstr_dtor(&request->_cache.cookies); - - FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) { - if (cookie_key) { - zval **cookie_val; - if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) { - zval *cpy, *val = convert_to_type_ex(IS_STRING, *cookie_val, &cpy); - - phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key, Z_STRVAL_P(val)); - - if (cpy) { - zval_ptr_dtor(&cpy); - } - } - - /* reset */ - cookie_key = NULL; - } - } - - if (request->_cache.cookies.used) { + if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", sizeof("; ")-1, NULL, 0)) { phpstr_fix(&request->_cache.cookies); HTTP_CURL_OPT(COOKIE, request->_cache.cookies.data); } } +#if LIBCURL_VERSION_NUM >= 0x070e01 + /* reset cookies */ + if ((zoption = http_request_option(request, options, "resetcookies", IS_BOOL)) && Z_LVAL_P(zoption)) { + HTTP_CURL_OPT(COOKIELIST, "ALL"); + } +#endif + /* session cookies */ if ((zoption = http_request_option(request, options, "cookiesession", IS_BOOL))) { if (Z_LVAL_P(zoption)) { @@ -529,6 +518,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti /* cookiestore, read initial cookies from that file and store cookies back into that file */ if ((zoption = http_request_option(request, options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) { + HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(zoption), return FAILURE); HTTP_CURL_OPT(COOKIEFILE, Z_STRVAL_P(zoption)); HTTP_CURL_OPT(COOKIEJAR, Z_STRVAL_P(zoption)); } @@ -577,25 +567,25 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti FOREACH_KEYVAL(pos, zoption, key, idx, param) { if (key) { - HTTP_CURL_OPT_SSL_STRING(CERT); - HTTP_CURL_OPT_SSL_STRING(CERTTYPE); - HTTP_CURL_OPT_SSL_STRING(CERTPASSWD); + HTTP_CURL_OPT_SSL_STRING(CERT, 1); + HTTP_CURL_OPT_SSL_STRING(CERTTYPE, 0); + HTTP_CURL_OPT_SSL_STRING(CERTPASSWD, 0); - HTTP_CURL_OPT_SSL_STRING(KEY); - HTTP_CURL_OPT_SSL_STRING(KEYTYPE); - HTTP_CURL_OPT_SSL_STRING(KEYPASSWD); + HTTP_CURL_OPT_SSL_STRING(KEY, 0); + HTTP_CURL_OPT_SSL_STRING(KEYTYPE, 0); + HTTP_CURL_OPT_SSL_STRING(KEYPASSWD, 0); - HTTP_CURL_OPT_SSL_STRING(ENGINE); + HTTP_CURL_OPT_SSL_STRING(ENGINE, 0); HTTP_CURL_OPT_SSL_LONG(VERSION); HTTP_CURL_OPT_SSL_LONG_(VERIFYPEER); HTTP_CURL_OPT_SSL_LONG_(VERIFYHOST); - HTTP_CURL_OPT_SSL_STRING_(CIPHER_LIST); + HTTP_CURL_OPT_SSL_STRING_(CIPHER_LIST, 0); - HTTP_CURL_OPT_STRING(CAINFO); - HTTP_CURL_OPT_STRING(CAPATH); - HTTP_CURL_OPT_STRING(RANDOM_FILE); - HTTP_CURL_OPT_STRING(EGDSOCKET); + HTTP_CURL_OPT_STRING(CAINFO, 1); + HTTP_CURL_OPT_STRING(CAPATH, 1); + HTTP_CURL_OPT_STRING(RANDOM_FILE, 1); + HTTP_CURL_OPT_STRING(EGDSOCKET, 1); /* reset key */ key = NULL; @@ -670,7 +660,7 @@ PHP_HTTP_API void _http_request_exec(http_request *request) TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); if (CURLE_OK != (result = curl_easy_perform(request->ch))) { - http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s (%s)", curl_easy_strerror(result), request->url); + http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(result), request->_error, request->url); } } /* }}} */ @@ -703,7 +693,6 @@ PHP_HTTP_API void _http_request_info(http_request *request, HashTable *info) HTTP_CURL_INFO(CONTENT_LENGTH_DOWNLOAD); HTTP_CURL_INFO(CONTENT_LENGTH_UPLOAD); HTTP_CURL_INFO(CONTENT_TYPE); - /*HTTP_CURL_INFO(PRIVATE);*/ HTTP_CURL_INFO(HTTPAUTH_AVAIL); HTTP_CURL_INFO(PROXYAUTH_AVAIL); /*HTTP_CURL_INFO(OS_ERRNO);*/ @@ -730,30 +719,26 @@ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *ct /* {{{ static int http_curl_progress_callback(void *, double, double, double, double) */ static int http_curl_progress_callback(void *ctx, double dltotal, double dlnow, double ultotal, double ulnow) { - int rc; - zval *params_pass[4], params_local[4], retval; + zval *param, retval; http_request *request = (http_request *) ctx; TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); - params_pass[0] = ¶ms_local[0]; - params_pass[1] = ¶ms_local[1]; - params_pass[2] = ¶ms_local[2]; - params_pass[3] = ¶ms_local[3]; - - INIT_PZVAL(params_pass[0]); - INIT_PZVAL(params_pass[1]); - INIT_PZVAL(params_pass[2]); - INIT_PZVAL(params_pass[3]); - ZVAL_DOUBLE(params_pass[0], dltotal); - ZVAL_DOUBLE(params_pass[1], dlnow); - ZVAL_DOUBLE(params_pass[2], ultotal); - ZVAL_DOUBLE(params_pass[3], ulnow); - INIT_PZVAL(&retval); ZVAL_NULL(&retval); - rc = call_user_function(EG(function_table), NULL, request->_progress_callback, &retval, 4, params_pass TSRMLS_CC); + + MAKE_STD_ZVAL(param); + array_init(param); + add_assoc_double(param, "dltotal", dltotal); + add_assoc_double(param, "dlnow", dlnow); + add_assoc_double(param, "ultotal", ultotal); + add_assoc_double(param, "ulnow", ulnow); + + call_user_function(EG(function_table), NULL, request->_progress_callback, &retval, 1, ¶m TSRMLS_CC); + + zval_ptr_dtor(¶m); zval_dtor(&retval); - return rc; + + return 0; } /* }}} */ @@ -829,31 +814,47 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size static inline zval *_http_request_option_ex(http_request *r, HashTable *options, char *key, size_t keylen, int type TSRMLS_DC) { zval **zoption; +#ifdef ZEND_ENGINE_2 ulong h = zend_get_hash_value(key, keylen); - - if (!options || (SUCCESS != zend_hash_quick_find(options, key, keylen, h, (void **) &zoption))) { +#else + ulong h = 0; +#endif + + if (!options || +#ifdef ZEND_ENGINE_2 + (SUCCESS != zend_hash_quick_find(options, key, keylen, h, (void **) &zoption)) +#else + (SUCCESS != zend_hash_find(options, key, keylen, (void **) &zoption)) +#endif + ) { return NULL; } + + return http_request_option_cache_ex(r, key, keylen, h, zval_copy(type, *zoption)); +} +/* }}} */ - if (Z_TYPE_PP(zoption) != type) { - switch (type) - { - case IS_BOOL: convert_to_boolean_ex(zoption); break; - case IS_LONG: convert_to_long_ex(zoption); break; - case IS_DOUBLE: convert_to_double_ex(zoption); break; - case IS_STRING: convert_to_string_ex(zoption); break; - case IS_ARRAY: convert_to_array_ex(zoption); break; - case IS_OBJECT: convert_to_object_ex(zoption); break; - default: - break; +/* {{{ static inline zval *http_request_option_cache(http_request *, char *key, zval *) */ +static inline zval *_http_request_option_cache_ex(http_request *r, char *key, size_t keylen, ulong h, zval *opt TSRMLS_DC) +{ + ZVAL_ADDREF(opt); + +#ifdef ZEND_ENGINE_2 + if (h) { + _zend_hash_quick_add_or_update(&r->_cache.options, key, keylen, h, &opt, sizeof(zval *), NULL, + zend_hash_quick_exists(&r->_cache.options, key, keylen, h)?HASH_UPDATE:HASH_ADD ZEND_FILE_LINE_CC); + } + else +#endif + { + if (zend_hash_exists(&r->_cache.options, key, keylen)) { + zend_hash_update(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL); + } else { + zend_hash_add(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL); } } - ZVAL_ADDREF(*zoption); - _zend_hash_quick_add_or_update(&r->_cache.options, key, keylen, h, zoption, sizeof(zval *), NULL, - zend_hash_quick_exists(&r->_cache.options, key, keylen, h)?HASH_UPDATE:HASH_ADD ZEND_FILE_LINE_CC); - - return *zoption; + return opt; } /* }}} */