X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=fd1a176f9f7805488a694d271f2f466956ef6394;hp=42a1199bc8377537b18a74c41f2d0eea71e3d06e;hb=05c863a6faa9a3ddd83ac1bdf62edbfc7a6ccf4f;hpb=cf24fb7a4a7140efa82a1ac15fac79347283d6fb diff --git a/http_request_api.c b/http_request_api.c index 42a1199..fd1a176 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -167,15 +167,25 @@ 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)); \ + int ok = 1; \ + zval *orig = *param; \ + convert_to_string_ex(param); \ + if (obdc) { \ + HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(param), ok = 0); \ + } \ key = NULL; \ - continue; \ + if (ok) { \ + HTTP_CURL_OPT(optname, Z_STRVAL_PP(param)); \ + if (orig != *param) zval_ptr_dtor(param); \ + continue; \ + } \ + if (orig != *param) zval_ptr_dtor(param); \ + return FAILURE; \ } #define HTTP_CURL_OPT_LONG(keyname) HTTP_OPT_SSL_LONG_EX(keyname, keyname) #define HTTP_CURL_OPT_SSL_LONG(keyname) HTTP_CURL_OPT_LONG_EX(keyname, SSL##keyname) @@ -202,14 +212,14 @@ 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)); @@ -222,7 +232,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 +273,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 +289,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); } /* }}} */ @@ -303,7 +314,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); @@ -314,7 +325,7 @@ 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); @@ -387,6 +398,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti if ((zoption = http_request_option(request, options, "onprogress", 0))) { HTTP_CURL_OPT(NOPROGRESS, 0); HTTP_CURL_OPT(PROGRESSDATA, request); + HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback); http_request_set_progress_callback(request, zoption); } @@ -425,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); @@ -454,16 +457,15 @@ 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; @@ -484,6 +486,10 @@ 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))) { @@ -530,6 +536,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)); } @@ -578,25 +585,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; @@ -704,7 +711,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);*/ @@ -830,9 +836,17 @@ 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))) { +#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; } @@ -850,10 +864,18 @@ static inline zval *_http_request_option_ex(http_request *r, HashTable *options, } } - 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); - + /* cache strings */ + if (type == IS_STRING) { + ZVAL_ADDREF(*zoption); +#ifdef ZEND_ENGINE_2 + _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); +#else + zend_hash_add_or_update(&r->_cache.options, key, keylen, zoption, sizeof(zval *), NULL, + zend_hash_exists(&r->_cache.options, key, keylen)?HASH_UPDATE:HASH_ADD); +#endif + } + return *zoption; } /* }}} */