X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_curl_api.c;h=9bf3857ac1c704008d951c579a665d543f2dea25;hp=ec3934d5617fe0c47c3ccd14c87c2efbb17cd969;hb=ac1377e599c5333de70745bea2cc14e2d75b1921;hpb=a19a05825d04d634834f7898ec1a5247fdd6095c diff --git a/http_curl_api.c b/http_curl_api.c index ec3934d..9bf3857 100644 --- a/http_curl_api.c +++ b/http_curl_api.c @@ -33,23 +33,77 @@ #include "php_http.h" #include "php_http_api.h" #include "php_http_curl_api.h" +#include "php_http_std_defs.h" #include "ext/standard/php_smart_str.h" ZEND_DECLARE_MODULE_GLOBALS(http) -#define http_curl_initbuf() _http_curl_initbuf_ex(0 TSRMLS_CC) -#define http_curl_initbuf_ex(s) _http_curl_initbuf_ex((s) TSRMLS_CC) -static inline void _http_curl_initbuf_ex(size_t chunk_size TSRMLS_DC); - -#define http_curl_freebuf() _http_curl_freebuf(TSRMLS_C) -static inline void _http_curl_freebuf(TSRMLS_D); -#define http_curl_sizebuf(l) _http_curl_sizebuf((l) TSRMLS_CC) -static inline void _http_curl_sizebuf(size_t len TSRMLS_DC); -#define http_curl_movebuf(d, l) _http_curl_movebuf((d), (l) TSRMLS_CC) -static inline void _http_curl_movebuf(char **data, size_t *data_len TSRMLS_DC); -#define http_curl_copybuf(d, l) _http_curl_copybuf((d), (l) TSRMLS_CC) -static inline void _http_curl_copybuf(char **data, size_t *data_len TSRMLS_DC); +#define http_curl_startup(ch, clean_curl, URL, options) \ + if (!ch) { \ + if (!(ch = curl_easy_init())) { \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl"); \ + return FAILURE; \ + } \ + clean_curl = 1; \ + } \ + http_curl_initbuf(); \ + http_curl_setopts(ch, URL, options); + + +#define http_curl_cleanup(ch, clean_curl) \ + http_curl_freestr(); \ + http_curl_freebuf(); \ + if (clean_curl) { \ + curl_easy_cleanup(ch); \ + ch = NULL; \ + } + +#define http_curl_freestr() \ + zend_llist_clean(&HTTP_G(to_free)) + +#define http_curl_initbuf() http_curl_initbuf_ex(0) + +#define http_curl_initbuf_ex(chunk_size) \ + { \ + size_t size = (chunk_size > 0) ? chunk_size : HTTP_CURLBUF_SIZE; \ + http_curl_freebuf(); \ + HTTP_G(curlbuf).data = emalloc(size); \ + HTTP_G(curlbuf).free = size; \ + HTTP_G(curlbuf).size = size; \ + } + +#define http_curl_freebuf() \ + if (HTTP_G(curlbuf).data) { \ + efree(HTTP_G(curlbuf).data); \ + HTTP_G(curlbuf).data = NULL; \ + } \ + HTTP_G(curlbuf).used = 0; \ + HTTP_G(curlbuf).free = 0; \ + HTTP_G(curlbuf).size = 0; + +#define http_curl_copybuf(data, size) \ + * size = HTTP_G(curlbuf).used; \ + * data = ecalloc(1, HTTP_G(curlbuf).used + 1); \ + memcpy(* data, HTTP_G(curlbuf).data, * size); + +#define http_curl_sizebuf(for_size) \ + { \ + size_t size = (for_size); \ + if (size > HTTP_G(curlbuf).free) { \ + size_t bsize = HTTP_G(curlbuf).size; \ + while (size > bsize) { \ + bsize *= 2; \ + } \ + HTTP_G(curlbuf).data = erealloc(HTTP_G(curlbuf).data, HTTP_G(curlbuf).used + bsize); \ + HTTP_G(curlbuf).free += bsize; \ + } \ + } + + +#define http_curl_copystr(s) _http_curl_copystr((s) TSRMLS_CC) +static inline char *_http_curl_copystr(const char *str TSRMLS_DC); + #define http_curl_setopts(c, u, o) _http_curl_setopts((c), (u), (o) TSRMLS_CC) static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC); @@ -68,95 +122,46 @@ static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRML #define http_curl_getinfoname(i) _http_curl_getinfoname((i) TSRMLS_CC) static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC); -/* {{{ static inline void http_curl_initbuf(size_t chunk_size) */ -static inline void _http_curl_initbuf_ex(size_t chunk_size TSRMLS_DC) +/* {{{ static inline char *http_curl_copystr(char *) */ +static inline char *_http_curl_copystr(const char *str TSRMLS_DC) { - size_t size = (chunk_size > 0) ? chunk_size : HTTP_CURLBUF_SIZE; - - http_curl_freebuf(); - - HTTP_G(curlbuf).data = emalloc(size); - HTTP_G(curlbuf).free = size; - HTTP_G(curlbuf).size = size; + char *new_str = estrdup(str); + zend_llist_add_element(&HTTP_G(to_free), &new_str); + return new_str; } /* }}} */ -/* {{{ static inline void http_curl_freebuf(void) */ -static inline void _http_curl_freebuf(TSRMLS_D) +/* {{{ static size_t http_curl_body_callback(char *, size_t, size_t, void *) */ +static size_t http_curl_body_callback(char *buf, size_t len, size_t n, void *s) { - if (HTTP_G(curlbuf).data) { - efree(HTTP_G(curlbuf).data); - HTTP_G(curlbuf).data = NULL; - } - HTTP_G(curlbuf).used = 0; - HTTP_G(curlbuf).free = 0; - HTTP_G(curlbuf).size = 0; -} -/* }}} */ + TSRMLS_FETCH(); -/* {{{ static inline void http_curl_copybuf(char **, size_t *) */ -static inline void _http_curl_copybuf(char **data, size_t *data_len TSRMLS_DC) -{ - *data_len = HTTP_G(curlbuf).used; - - *data = ecalloc(1, HTTP_G(curlbuf).used + 1); - memcpy(*data, HTTP_G(curlbuf).data, *data_len); -} -/* }}} */ + http_curl_sizebuf(len *= n); -/* {{{ static inline void http_curl_movebuf(char **, size_t *) */ -static inline void _http_curl_movebuf(char **data, size_t *data_len TSRMLS_DC) -{ - http_curl_copybuf(data, data_len); - http_curl_freebuf(); + memcpy(HTTP_G(curlbuf).data + HTTP_G(curlbuf).used, buf, len); + HTTP_G(curlbuf).free -= len; + HTTP_G(curlbuf).used += len; + return len; } /* }}} */ -/* {{{ static inline void http_curl_sizebuf(size_t len) */ -static inline void _http_curl_sizebuf(size_t len TSRMLS_DC) +/* {{{ static size_t http_curl_hdrs_callback(char *, size_t, size_t, void *) */ +static size_t http_curl_hdrs_callback(char *buf, size_t len, size_t n, void *s) { - if (len > HTTP_G(curlbuf).free) { - size_t bsize = HTTP_G(curlbuf).size; - while (bsize < len) { - bsize *= 2; - } - HTTP_G(curlbuf).data = erealloc(HTTP_G(curlbuf).data, HTTP_G(curlbuf).used + bsize); - HTTP_G(curlbuf).free += bsize; - } -} -/* }}} */ + TSRMLS_FETCH(); -/* {{{ static size_t http_curl_body_callback(char *, size_t, size_t, void *) */ -static size_t http_curl_body_callback(char *buf, size_t len, size_t n, void *s) -{ - TSRMLS_FETCH(); - - http_curl_sizebuf(len *= n); - - memcpy(HTTP_G(curlbuf).data + HTTP_G(curlbuf).used, buf, len); - HTTP_G(curlbuf).free -= len; - HTTP_G(curlbuf).used += len; - return len; -} -/* }}} */ - -/* {{{ static size_t http_curl_hdrs_callback(char *, size_t, size_t, void *) */ -static size_t http_curl_hdrs_callback(char *buf, size_t len, size_t n, void *s) -{ - TSRMLS_FETCH(); - - /* discard previous headers */ - if ((HTTP_G(curlbuf).used) && (!strncmp(buf, "HTTP/1.", sizeof("HTTP/1.") - 1))) { - http_curl_initbuf(); + /* discard previous headers */ + if ((HTTP_G(curlbuf).used) && (!strncmp(buf, "HTTP/1.", sizeof("HTTP/1.") - 1))) { + http_curl_initbuf(); } http_curl_sizebuf(len *= n); - - memcpy(HTTP_G(curlbuf).data + HTTP_G(curlbuf).used, buf, len); - HTTP_G(curlbuf).free -= len; - HTTP_G(curlbuf).used += len; - return len; -} -/* }}} */ + + memcpy(HTTP_G(curlbuf).data + HTTP_G(curlbuf).used, buf, len); + HTTP_G(curlbuf).free -= len; + HTTP_G(curlbuf).used += len; + return len; +} +/* }}} */ /* {{{ static inline zval *http_curl_getopt(HashTable *, char *, int, ...) */ static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, int checks, ...) @@ -217,14 +222,14 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti /* proxy */ if (zoption = http_curl_getopt1(options, "proxyhost", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_PROXY, Z_STRVAL_P(zoption)); + curl_easy_setopt(ch, CURLOPT_PROXY, http_curl_copystr(Z_STRVAL_P(zoption))); /* port */ if (zoption = http_curl_getopt1(options, "proxyport", IS_LONG)) { curl_easy_setopt(ch, CURLOPT_PROXYPORT, Z_LVAL_P(zoption)); } /* user:pass */ if (zoption = http_curl_getopt1(options, "proxyauth", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_PROXYUSERPWD, Z_STRVAL_P(zoption)); + curl_easy_setopt(ch, CURLOPT_PROXYUSERPWD, http_curl_copystr(Z_STRVAL_P(zoption))); } #if LIBCURL_VERSION_NUM > 0x070a06 /* auth method */ @@ -236,7 +241,7 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti /* auth */ if (zoption = http_curl_getopt1(options, "httpauth", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_USERPWD, Z_STRVAL_P(zoption)); + curl_easy_setopt(ch, CURLOPT_USERPWD, http_curl_copystr(Z_STRVAL_P(zoption))); } #if LIBCURL_VERSION_NUM > 0x070a05 if (zoption = http_curl_getopt1(options, "httpauthtype", IS_LONG)) { @@ -249,8 +254,6 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti if (Z_LVAL_P(zoption)) { curl_easy_setopt(ch, CURLOPT_ENCODING, ""); } - } else { - curl_easy_setopt(ch, CURLOPT_ENCODING, ""); } /* another port */ @@ -260,12 +263,12 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti /* referer */ if (zoption = http_curl_getopt1(options, "referer", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_REFERER, Z_STRVAL_P(zoption)); + curl_easy_setopt(ch, CURLOPT_REFERER, http_curl_copystr(Z_STRVAL_P(zoption))); } /* useragent, default "PECL::HTTP/version (PHP/version)" */ if (zoption = http_curl_getopt1(options, "useragent", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_USERAGENT, Z_STRVAL_P(zoption)); + curl_easy_setopt(ch, CURLOPT_USERAGENT, http_curl_copystr(Z_STRVAL_P(zoption))); } else { curl_easy_setopt(ch, CURLOPT_USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")"); @@ -293,15 +296,15 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti smart_str_0(&qstr); if (qstr.c) { - curl_easy_setopt(ch, CURLOPT_COOKIE, qstr.c); - /* FIXXXME: mem-leak */ + curl_easy_setopt(ch, CURLOPT_COOKIE, http_curl_copystr(qstr.c)); + efree(qstr.c); } } /* cookiestore */ if (zoption = http_curl_getopt1(options, "cookiestore", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_COOKIEFILE, Z_STRVAL_P(zoption)); - curl_easy_setopt(ch, CURLOPT_COOKIEJAR, Z_STRVAL_P(zoption)); + curl_easy_setopt(ch, CURLOPT_COOKIEFILE, http_curl_copystr(Z_STRVAL_P(zoption))); + curl_easy_setopt(ch, CURLOPT_COOKIEJAR, http_curl_copystr(Z_STRVAL_P(zoption))); } /* additional headers, array('name' => 'value') */ @@ -317,7 +320,7 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti zend_hash_get_current_key(Z_ARRVAL_P(zoption), &header_key, NULL, 0); zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val); snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val)); - headers = curl_slist_append(headers, header); + headers = curl_slist_append(headers, http_curl_copystr(header)); zend_hash_move_forward(Z_ARRVAL_P(zoption)); } } @@ -331,7 +334,7 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti /* {{{ static inline char *http_curl_getinfoname(CURLINFO) */ static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC) { -#define CASE(I) case CURLINFO_ ##I : { static char I[] = #I; return pretty_key(I, sizeof(#I)-1, 0, 0); } +#define CASE(I) case CURLINFO_ ##I : { return pretty_key(http_curl_copystr(#I), sizeof(#I)-1, 0, 0); } switch (i) { /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */ @@ -497,124 +500,83 @@ static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC) } /* }}} */ - - -/* {{{ STATUS http_get(char *, HashTable *, HashTable *, char **, size_t *) */ -PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options, - HashTable *info, char **data, size_t *data_len TSRMLS_DC) -{ - STATUS rs; - CURL *ch = curl_easy_init(); - - if (!ch) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl"); - return FAILURE; - } - - rs = http_get_ex(ch, URL, options, info, data, data_len); - curl_easy_cleanup(ch); - return rs; -} -/* }}} */ - /* {{{ STATUS http_get_ex(CURL *, char *, HashTable *, HashTable *, char **, size_t *) */ PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC) { - http_curl_initbuf(); - http_curl_setopts(ch, URL, options); + zend_bool clean_curl = 0; + + http_curl_startup(ch, clean_curl, URL, options); curl_easy_setopt(ch, CURLOPT_NOBODY, 0); curl_easy_setopt(ch, CURLOPT_POST, 0); if (CURLE_OK != curl_easy_perform(ch)) { - http_curl_freebuf(); + http_curl_cleanup(ch, clean_curl); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request"); return FAILURE; } + if (info) { http_curl_getinfo(ch, info); } - http_curl_movebuf(data, data_len); - return SUCCESS; -} -/* {{{ STATUS http_head(char *, HashTable *, HashTable *, char **data, size_t *) */ -PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options, - HashTable *info, char **data, size_t *data_len TSRMLS_DC) -{ - STATUS rs; - CURL *ch = curl_easy_init(); - - if (!ch) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl"); - return FAILURE; - } + http_curl_copybuf(data, data_len); + http_curl_cleanup(ch, clean_curl); - rs = http_head_ex(ch, URL, options, info, data, data_len); - curl_easy_cleanup(ch); - return rs; + return SUCCESS; } -/* }}} */ /* {{{ STATUS http_head_ex(CURL *, char *, HashTable *, HashTable *, char **data, size_t *) */ PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC) { - http_curl_initbuf(); - http_curl_setopts(ch, URL, options); + zend_bool clean_curl = 0; + + http_curl_startup(ch, clean_curl, URL, options); curl_easy_setopt(ch, CURLOPT_NOBODY, 1); curl_easy_setopt(ch, CURLOPT_POST, 0); if (CURLE_OK != curl_easy_perform(ch)) { - http_curl_freebuf(); + http_curl_cleanup(ch, clean_curl); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request"); return FAILURE; } + if (info) { http_curl_getinfo(ch, info); } - http_curl_movebuf(data, data_len); - return SUCCESS; -} -/* {{{ STATUS http_post_data(char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */ -PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata, - size_t postdata_len, HashTable *options, HashTable *info, char **data, - size_t *data_len TSRMLS_DC) -{ - STATUS rs; - CURL *ch = curl_easy_init(); + http_curl_copybuf(data, data_len); + http_curl_cleanup(ch, clean_curl); - if (!ch) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl"); - return FAILURE; - } - rs = http_post_data_ex(ch, URL, postdata, postdata_len, options, info, data, data_len); - curl_easy_cleanup(ch); - return rs; + return SUCCESS; } -/* }}} */ /* {{{ STATUS http_post_data_ex(CURL *, char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */ PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata, size_t postdata_len, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC) { - http_curl_initbuf(); - http_curl_setopts(ch, URL, options); + zend_bool clean_curl = 0; + + http_curl_startup(ch, clean_curl, URL, options); curl_easy_setopt(ch, CURLOPT_POST, 1); curl_easy_setopt(ch, CURLOPT_POSTFIELDS, postdata); curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, postdata_len); if (CURLE_OK != curl_easy_perform(ch)) { - http_curl_freebuf(); + http_curl_cleanup(ch, clean_curl); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request"); return FAILURE; } + if (info) { http_curl_getinfo(ch, info); } - http_curl_movebuf(data, data_len); + + http_curl_copybuf(data, data_len); + http_curl_cleanup(ch, clean_curl); + return SUCCESS; } /* }}} */ @@ -638,11 +600,7 @@ PHP_HTTP_API STATUS _http_post_array_ex(CURL *ch, const char *URL, HashTable *po smart_str_0(&qstr); HTTP_URL_ARGSEP_RESTORE; - if (ch) { - status = http_post_data_ex(ch, URL, qstr.c, qstr.len, options, info, data, data_len); - } else { - status = http_post_data(URL, qstr.c, qstr.len, options, info, data, data_len); - } + status = http_post_data_ex(ch, URL, qstr.c, qstr.len, options, info, data, data_len); if (qstr.c) { efree(qstr.c); @@ -656,23 +614,28 @@ PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL, struct curl_httppost *curldata, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC) { - http_curl_initbuf(); - http_curl_setopts(ch, URL, options); + zend_bool clean_curl = 0; + + http_curl_startup(ch, clean_curl, URL, options); curl_easy_setopt(ch, CURLOPT_POST, 1); curl_easy_setopt(ch, CURLOPT_HTTPPOST, curldata); if (CURLE_OK != curl_easy_perform(ch)) { - http_curl_freebuf(); + http_curl_cleanup(ch, clean_curl); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request"); return FAILURE; } + if (info) { http_curl_getinfo(ch, info); } - http_curl_movebuf(data, data_len); - return SUCCESS;} -/* }}} */ + http_curl_copybuf(data, data_len); + http_curl_cleanup(ch, clean_curl); + + return SUCCESS; +} +/* }}} */ /* * Local variables: @@ -681,4 +644,4 @@ PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL, * End: * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 - */ + */ \ No newline at end of file