X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=280302e99ccd92dcbcdd6931003e8c0ccf16bedc;hp=797e9a2a54744e6881ea7fc430baf080513ac3db;hb=aa5986c4d10f1be10cbda475dc59adff95b01dbf;hpb=798c9bcc3be9879c108f032cf354f83e243da1fb diff --git a/http_request_api.c b/http_request_api.c index 797e9a2..280302e 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-2006, Michael Wallner | + | Copyright (c) 2004-2007, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -19,6 +19,7 @@ #ifdef HTTP_HAVE_CURL #include "php_http_api.h" +#include "php_http_persistent_handle_api.h" #include "php_http_request_api.h" #include "php_http_url_api.h" @@ -109,6 +110,10 @@ PHP_MINIT_FUNCTION(http_request) return FAILURE; } + if (SUCCESS != http_persistent_handle_provide("http_request", curl_easy_init, curl_easy_cleanup, curl_easy_duphandle)) { + return FAILURE; + } + HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC); HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST); HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM); @@ -177,9 +182,9 @@ static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *); /* }}} */ /* {{{ CURL *http_curl_init(http_request *) */ -PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request) +PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request TSRMLS_DC) { - if (ch || (ch = curl_easy_init())) { + if (ch || (SUCCESS == http_persistent_handle_acquire("http_request", &ch))) { #if defined(ZTS) curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L); #endif @@ -210,17 +215,28 @@ PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request) } /* }}} */ +/* {{{ CURL *http_curl_copy(CURL *) */ +PHP_HTTP_API CURL *_http_curl_copy(CURL *ch TSRMLS_DC) +{ + CURL *copy; + + if (SUCCESS == http_persistent_handle_accrete("http_request", ch, ©)) { + return copy; + } + return NULL; +} +/* }}} */ + /* {{{ void http_curl_free(CURL **) */ -PHP_HTTP_API void _http_curl_free(CURL **ch) +PHP_HTTP_API void _http_curl_free(CURL **ch TSRMLS_DC) { if (*ch) { - /* avoid nasty segfaults with already cleaned up callbacks */ curl_easy_setopt(*ch, CURLOPT_NOPROGRESS, 1L); curl_easy_setopt(*ch, CURLOPT_PROGRESSFUNCTION, NULL); curl_easy_setopt(*ch, CURLOPT_VERBOSE, 0L); curl_easy_setopt(*ch, CURLOPT_DEBUGFUNCTION, NULL); - curl_easy_cleanup(*ch); - *ch = NULL; + + http_persistent_handle_release("http_request", ch); } } /* }}} */ @@ -255,6 +271,8 @@ PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch /* {{{ void http_request_dtor(http_request *) */ PHP_HTTP_API void _http_request_dtor(http_request *request) { + TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); + http_curl_free(&request->ch); http_request_reset(request); @@ -463,9 +481,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti /* proxy */ if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) { - if (Z_STRLEN_P(zoption)) { - HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption)); - } + HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption)); /* type */ if ((zoption = http_request_option(request, options, "proxytype", IS_LONG))) { HTTP_CURL_OPT(CURLOPT_PROXYTYPE, Z_LVAL_P(zoption)); @@ -639,14 +655,14 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti FOREACH_KEYVAL(pos, zoption, header_key, header_val) { if (header_key.type == HASH_KEY_IS_STRING) { - char header[1024] = {0}; + char header[1024]; ZVAL_ADDREF(*header_val); convert_to_string_ex(header_val); if (!strcasecmp(header_key.str, "range")) { range_req = 1; } - snprintf(header, lenof(header), "%s: %s", header_key.str, Z_STRVAL_PP(header_val)); + snprintf(header, sizeof(header), "%s: %s", header_key.str, Z_STRVAL_PP(header_val)); request->_cache.headers = curl_slist_append(request->_cache.headers, header); zval_ptr_dtor(header_val); } @@ -654,12 +670,12 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti } /* etag */ if ((zoption = http_request_option(request, options, "etag", IS_STRING)) && Z_STRLEN_P(zoption)) { - char match_header[1024] = {0}, *quoted_etag = NULL; + char match_header[1024], *quoted_etag = NULL; if ((Z_STRVAL_P(zoption)[0] != '"') || (Z_STRVAL_P(zoption)[Z_STRLEN_P(zoption)-1] != '"')) { spprintf("ed_etag, 0, "\"%s\"", Z_STRVAL_P(zoption)); } - snprintf(match_header, lenof(match_header), "%s: %s", range_req?"If-Match":"If-None-Match", quoted_etag?quoted_etag:Z_STRVAL_P(zoption)); + snprintf(match_header, sizeof(match_header), "%s: %s", range_req?"If-Match":"If-None-Match", quoted_etag?quoted_etag:Z_STRVAL_P(zoption)); request->_cache.headers = curl_slist_append(request->_cache.headers, match_header); STR_FREE(quoted_etag); } @@ -739,15 +755,25 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti HTTP_CURL_OPT(CURLOPT_HTTP_VERSION, Z_LVAL_P(zoption)); } +#if HTTP_CURL_VERSION(7,16,2) + /* timeout, defaults to 0 */ + if ((zoption = http_request_option(request, options, "timeout", IS_DOUBLE))) { + HTTP_CURL_OPT(CURLOPT_TIMEOUT_MS, (long)(Z_DVAL_P(zoption)*1000)); + } + /* connecttimeout, defaults to 0 */ + if ((zoption = http_request_option(request, options, "connecttimeout", IS_DOUBLE))) { + HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT_MS, (long)(Z_DVAL_P(zoption)*1000)); + } +#else /* timeout, defaults to 0 */ if ((zoption = http_request_option(request, options, "timeout", IS_LONG))) { HTTP_CURL_OPT(CURLOPT_TIMEOUT, Z_LVAL_P(zoption)); } - /* connecttimeout, defaults to 0 */ if ((zoption = http_request_option(request, options, "connecttimeout", IS_LONG))) { HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption)); } +#endif /* ssl */ if ((zoption = http_request_option(request, options, "ssl", IS_ARRAY))) { @@ -947,7 +973,7 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size { http_request *request = (http_request *) ctx; -#define EMPTY_HEADER(d, l) ((l == 1 && d[0] == '\n') || (l == 2 && d[0] == '\r' && d[1] == '\n')) +#define EMPTY_HEADER(d, l) (!l || (l == 1 && d[0] == '\n') || (l == 2 && d[0] == '\r' && d[1] == '\n')) switch (type) { case CURLINFO_DATA_IN: if (request->conv.last_type == CURLINFO_HEADER_IN) { @@ -961,40 +987,28 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size } break; case CURLINFO_DATA_OUT: - if (request->conv.last_type == CURLINFO_HEADER_OUT) { - phpstr_appends(&request->conv.request, HTTP_CRLF); - } - phpstr_append(&request->conv.request, data, length); - break; case CURLINFO_HEADER_OUT: - if (!EMPTY_HEADER(data, length)) { - phpstr_append(&request->conv.request, data, length); - } + phpstr_append(&request->conv.request, data, length); break; default: -#if 0 - fprintf(stderr, "## ", type); - if (!type) { - fprintf(stderr, "%s", data); - } else { - ulong i; - for (i = 1; i <= length; ++i) { - fprintf(stderr, "%02X ", data[i-1] & 0xFF); - if (!(i % 20)) { - fprintf(stderr, "\n## "); - } - } - fprintf(stderr, "\n"); - } - if (data[length-1] != 0xa) { - fprintf(stderr, "\n"); - } -#endif break; } #if 0 - fprintf(stderr, "DEBUG: %3d (%5zu) %.*s%s", type, length, length, data, data[length-1]=='\n'?"":"\n"); + { + const char _sym[] = "><><><"; + if (type) { + for (fprintf(stderr, "%c ", _sym[type-1]); length--; data++) { + fprintf(stderr, HTTP_IS_CTYPE(print, *data)?"%c":"\\x%02X", (int) *data); + if (*data == '\n' && length) { + fprintf(stderr, "\n%c ", _sym[type-1]); + } + } + fprintf(stderr, "\n"); + } else { + fprintf(stderr, "# %s", data); + } + } #endif if (type) { @@ -1007,24 +1021,16 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size /* {{{ static inline zval *http_request_option(http_request *, HashTable *, char *, size_t, int) */ 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); -#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; + if (options) { + zval **zoption; + ulong h = zend_hash_func(key, keylen); + + if (SUCCESS == zend_hash_quick_find(options, key, keylen, h, (void *) &zoption)) { + return http_request_option_cache_ex(r, key, keylen, h, zval_copy(type, *zoption)); + } } - return http_request_option_cache_ex(r, key, keylen, h, zval_copy(type, *zoption)); + return NULL; } /* }}} */ @@ -1033,19 +1039,10 @@ static inline zval *_http_request_option_cache_ex(http_request *r, char *key, si { 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); - } + zend_hash_quick_update(&r->_cache.options, key, keylen, h, &opt, sizeof(zval *), NULL); + } else { + zend_hash_update(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL); } return opt;