X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=9ccda2ca8e859ec83f668fc141b188097933dbf3;hp=289cac491d4ea003b0b082728dd960fd348a23b2;hb=976c6c8c58c93c4ab74e9c23e1cf5b31b2b1bd78;hpb=6b07ab3988f234f92d537e865648e823217d6575 diff --git a/http_request_api.c b/http_request_api.c index 289cac4..9ccda2c 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,11 +19,9 @@ #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" -#ifdef HTTP_HAVE_PERSISTENT_HANDLES -# include "php_http_persistent_handle_api.h" -#endif #ifdef ZEND_ENGINE_2 # include "php_http_request_object.h" @@ -112,11 +110,9 @@ PHP_MINIT_FUNCTION(http_request) return FAILURE; } -#ifdef HTTP_HAVE_PERSISTENT_HANDLES - if (SUCCESS != http_persistent_handle_provide("http_request", curl_easy_init, curl_easy_cleanup)) { + if (SUCCESS != http_persistent_handle_provide("http_request", curl_easy_init, curl_easy_cleanup, curl_easy_duphandle)) { return FAILURE; } -#endif HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC); HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST); @@ -185,18 +181,10 @@ static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { r static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *); /* }}} */ -#ifdef HTTP_HAVE_PERSISTENT_HANDLES -# define HTTP_CURL_HANDLE_CTOR(ch) (SUCCESS == http_persistent_handle_acquire("http_request", &(ch))) -# define HTTP_CURL_HANDLE_DTOR(chp) http_persistent_handle_release("http_request", (chp)) -#else -# define HTTP_CURL_HANDLE_CTOR(ch) ((ch) = curl_easy_init()) -# define HTTP_CURL_HANDLE_DTOR(chp) curl_easy_cleanup(*(chp)); *(chp) = NULL -#endif - /* {{{ 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 || HTTP_CURL_HANDLE_CTOR(ch)) { + if (ch || (SUCCESS == http_persistent_handle_acquire("http_request", &ch))) { #if defined(ZTS) curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L); #endif @@ -227,8 +215,20 @@ 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) { curl_easy_setopt(*ch, CURLOPT_NOPROGRESS, 1L); @@ -236,7 +236,7 @@ PHP_HTTP_API void _http_curl_free(CURL **ch) curl_easy_setopt(*ch, CURLOPT_VERBOSE, 0L); curl_easy_setopt(*ch, CURLOPT_DEBUGFUNCTION, NULL); - HTTP_CURL_HANDLE_DTOR(ch); + http_persistent_handle_release("http_request", ch); } } /* }}} */ @@ -271,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); @@ -375,8 +377,10 @@ PHP_HTTP_API void _http_request_defaults(http_request *request) HTTP_CURL_OPT(CURLOPT_LOW_SPEED_LIMIT, 0L); HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, 0L); #if HTTP_CURL_VERSION(7,15,5) + /* LFS weirdance HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) 0); HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) 0); + */ #endif /* crashes HTTP_CURL_OPT(CURLOPT_MAXCONNECTS, 5L); */ @@ -479,9 +483,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)); @@ -516,12 +518,14 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, Z_LVAL_P(zoption)); } #if HTTP_CURL_VERSION(7,15,5) + /* LSF weirdance if ((zoption = http_request_option(request, options, "max_send_speed", IS_LONG))) { HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption)); } if ((zoption = http_request_option(request, options, "max_recv_speed", IS_LONG))) { HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption)); } + */ #endif /* crashes if ((zoption = http_request_option(request, options, "maxconnects", IS_LONG))) { @@ -581,6 +585,18 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption)); } } + + /* retries, defaults to 0 */ + if ((zoption = http_request_option(request, options, "retrycount", IS_LONG))) { + request->_retry.count = Z_LVAL_P(zoption); + if ((zoption = http_request_option(request, options, "retrydelay", IS_DOUBLE))) { + request->_retry.delay = Z_DVAL_P(zoption); + } else { + request->_retry.delay = 0; + } + } else { + request->_retry.count = 0; + } /* referer */ if ((zoption = http_request_option(request, options, "referer", IS_STRING)) && Z_STRLEN_P(zoption)) { @@ -872,11 +888,37 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti /* {{{ void http_request_exec(http_request *) */ PHP_HTTP_API void _http_request_exec(http_request *request) { + uint tries = 0; CURLcode result; TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); +retry: if (CURLE_OK != (result = curl_easy_perform(request->ch))) { http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(result), request->_error, request->url); + + if (request->_retry.count > tries++) { + switch (result) { + case CURLE_COULDNT_RESOLVE_PROXY: + case CURLE_COULDNT_RESOLVE_HOST: + case CURLE_COULDNT_CONNECT: + case CURLE_WRITE_ERROR: + case CURLE_READ_ERROR: + case CURLE_OPERATION_TIMEDOUT: + case CURLE_SSL_CONNECT_ERROR: + case CURLE_GOT_NOTHING: + case CURLE_SSL_ENGINE_SETFAILED: + case CURLE_SEND_ERROR: + case CURLE_RECV_ERROR: + case CURLE_SSL_ENGINE_INITFAILED: + case CURLE_LOGIN_DENIED: + if (request->_retry.delay >= HTTP_DIFFSEC) { + http_sleep(request->_retry.delay); + } + goto retry; + default: + break; + } + } } } /* }}} */ @@ -1021,24 +1063,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; } /* }}} */ @@ -1047,19 +1081,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;