X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=38eadf45f24343b653faa7aae58e5d748fbc59be;hp=534542fd4a31d59f7d3cc33349d5d87468cea6da;hb=6fc78f4b8ea8a34a40f06985648822fbaa7ffb30;hpb=9ee138af54714e0fba18766313d8a738b52196fe diff --git a/http_request_api.c b/http_request_api.c index 534542f..38eadf4 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -1,16 +1,13 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2005, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ @@ -19,25 +16,97 @@ # include "config.h" #endif -#ifdef PHP_WIN32 -# include -#endif - -#include +#define HTTP_WANT_CURL +#include "php_http.h" -#include "phpstr/phpstr.h" +#ifdef HTTP_HAVE_CURL -#include "php.h" -#include "php_http.h" -#include "php_http_std_defs.h" #include "php_http_api.h" #include "php_http_request_api.h" +#include "php_http_request_method_api.h" #include "php_http_url_api.h" -ZEND_EXTERN_MODULE_GLOBALS(http) +#ifdef ZEND_ENGINE_2 +# include "php_http_request_object.h" +#endif + +/* {{{ cruft for thread safe SSL crypto locks */ +#if defined(ZTS) && defined(HTTP_HAVE_SSL) +# ifdef PHP_WIN32 +# define HTTP_NEED_SSL_TSL +# define HTTP_NEED_OPENSSL_TSL +# include +# else /* !PHP_WIN32 */ +# if defined(HTTP_HAVE_OPENSSL) +# if defined(HAVE_OPENSSL_CRYPTO_H) +# define HTTP_NEED_SSL_TSL +# define HTTP_NEED_OPENSSL_TSL +# include +# else +# warning \ + "libcurl was compiled with OpenSSL support, but configure could not find " \ + "openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \ + "cause random crashes on SSL requests" +# endif +# elif defined(HTTP_HAVE_GNUTLS) +# if defined(HAVE_GCRYPT_H) +# define HTTP_NEED_SSL_TSL +# define HTTP_NEED_GNUTLS_TSL +# include +# else +# warning \ + "libcurl was compiled with GnuTLS support, but configure could not find " \ + "gcrypt.h; thus no SSL crypto locking callbacks will be set, which may " \ + "cause random crashes on SSL requests" +# endif +# else +# warning \ + "libcurl was compiled with SSL support, but configure could not determine which" \ + "library was used; thus no SSL crypto locking callbacks will be set, which may " \ + "cause random crashes on SSL requests" +# endif /* HTTP_HAVE_OPENSSL || HTTP_HAVE_GNUTLS */ +# endif /* PHP_WIN32 */ +#endif /* ZTS && HTTP_HAVE_SSL */ +/* }}} */ -#if LIBCURL_VERSION_NUM < 0x070c00 -# define curl_easy_strerror(code) HTTP_G(request).curl.error +ZEND_EXTERN_MODULE_GLOBALS(http); + +#ifdef HTTP_NEED_SSL_TSL +static inline void http_ssl_init(void); +static inline void http_ssl_cleanup(void); +#endif + +PHP_MINIT_FUNCTION(http_request) +{ +#ifdef HTTP_NEED_SSL_TSL + http_ssl_init(); +#endif + + if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) { + return FAILURE; + } + +#if LIBCURL_VERSION_NUM >= 0x070a05 + HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC); + HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST); + HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM); + HTTP_LONG_CONSTANT("HTTP_AUTH_ANY", CURLAUTH_ANY); +#endif /* LIBCURL_VERSION_NUM */ + + return SUCCESS; +} + +PHP_MSHUTDOWN_FUNCTION(http_request) +{ + curl_global_cleanup(); +#ifdef HTTP_NEED_SSL_TSL + http_ssl_cleanup(); +#endif + return SUCCESS; +} + +#ifndef HAVE_CURL_EASY_STRERROR +# define curl_easy_strerror(code) HTTP_G(request).error #endif #define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I) @@ -48,7 +117,7 @@ ZEND_EXTERN_MODULE_GLOBALS(http) { \ char *c; \ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &c)) { \ - add_assoc_string(&array, pretty_key(http_curl_copystr(#X), sizeof(#X)-1, 0, 0), c ? c : "", 1); \ + add_assoc_string(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), c ? c : "", 1); \ } \ } \ break; \ @@ -57,7 +126,7 @@ ZEND_EXTERN_MODULE_GLOBALS(http) { \ double d; \ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &d)) { \ - add_assoc_double(&array, pretty_key(http_curl_copystr(#X), sizeof(#X)-1, 0, 0), d); \ + add_assoc_double(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), d); \ } \ } \ break; \ @@ -66,7 +135,7 @@ ZEND_EXTERN_MODULE_GLOBALS(http) { \ long l; \ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &l)) { \ - add_assoc_long(&array, pretty_key(http_curl_copystr(#X), sizeof(#X)-1, 0, 0), l); \ + add_assoc_long(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), l); \ } \ } \ break; \ @@ -79,7 +148,7 @@ ZEND_EXTERN_MODULE_GLOBALS(http) #define HTTP_CURL_OPT_STRING_EX(keyname, optname) \ if (!strcasecmp(key, #keyname)) { \ convert_to_string_ex(param); \ - HTTP_CURL_OPT(optname, http_curl_copystr(Z_STRVAL_PP(param))); \ + HTTP_CURL_OPT(optname, http_request_data_copy(COPY_STRING, Z_STRVAL_PP(param))); \ key = NULL; \ continue; \ } @@ -94,18 +163,105 @@ ZEND_EXTERN_MODULE_GLOBALS(http) continue; \ } - -static const char *const http_request_methods[HTTP_MAX_REQUEST_METHOD + 1]; -#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_getopt(o, k, t) _http_curl_getopt_ex((o), (k), sizeof(k), (t) TSRMLS_CC) #define http_curl_getopt_ex(o, k, l, t) _http_curl_getopt_ex((o), (k), (l), (t) TSRMLS_CC) static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC); -static size_t http_curl_write_callback(char *, size_t, size_t, void *); +#define http_curl_defaults(ch) _http_curl_defaults((ch)) +static inline void _http_curl_defaults(CURL *ch); static size_t http_curl_read_callback(void *, size_t, size_t, void *); static int http_curl_progress_callback(void *, double, double, double, double); -static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void *); +static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *); +static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { return n*l; } + +/* {{{ http_request_callback_ctx http_request_callback_data(void *) */ +http_request_callback_ctx *_http_request_callback_data_ex(void *data, zend_bool cpy TSRMLS_DC) +{ + http_request_callback_ctx *ctx = emalloc(sizeof(http_request_callback_ctx)); + + TSRMLS_SET_CTX(ctx->tsrm_ctx); + ctx->data = data; + + if (cpy) { + return http_request_data_copy(COPY_CONTEXT, ctx); + } else { + return ctx; + } +} +/* }}} */ + +/* {{{ void *http_request_data_copy(int, void *) */ +void *_http_request_data_copy(int type, void *data TSRMLS_DC) +{ + switch (type) + { + case COPY_STRING: + { + char *new_str = estrdup(data); + zend_llist_add_element(&HTTP_G(request).copies.strings, &new_str); + return new_str; + } + + case COPY_SLIST: + { + zend_llist_add_element(&HTTP_G(request).copies.slists, &data); + return data; + } + + case COPY_CONTEXT: + { + zend_llist_add_element(&HTTP_G(request).copies.contexts, &data); + return data; + } + + case COPY_CONV: + { + zend_llist_add_element(&HTTP_G(request).copies.convs, &data); + return data; + } + + default: + { + return data; + } + } +} +/* }}} */ + +/* {{{ void http_request_data_free_string(char **) */ +void _http_request_data_free_string(void *string) +{ + efree(*((char **)string)); +} +/* }}} */ +/* {{{ void http_request_data_free_slist(struct curl_slist **) */ +void _http_request_data_free_slist(void *list) +{ + curl_slist_free_all(*((struct curl_slist **) list)); +} +/* }}} */ + +/* {{{ _http_request_data_free_context(http_request_callback_ctx **) */ +void _http_request_data_free_context(void *context) +{ + efree(*((http_request_callback_ctx **) context)); +} +/* }}} */ + +/* {{{ _http_request_data_free_conv(http_request_conv **) */ +void _http_request_data_free_conv(void *conv) +{ + efree(*((http_request_conv **) conv)); +} +/* }}} */ + +/* {{{ http_request_body *http_request_body_new() */ +PHP_HTTP_API http_request_body *_http_request_body_new(TSRMLS_D) +{ + http_request_body *body = ecalloc(1, sizeof(http_request_body)); + return body; +} +/* }}} */ /* {{{ STATUS http_request_body_fill(http_request_body *body, HashTable *, HashTable *) */ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *fields, HashTable *files TSRMLS_DC) @@ -114,21 +270,29 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable * char *key = NULL; ulong idx; zval **data; + HashPosition pos; struct curl_httppost *http_post_data[2] = {NULL, NULL}; /* normal data */ - FOREACH_HASH_KEYVAL(fields, key, idx, data) { + FOREACH_HASH_KEYVAL(pos, fields, key, idx, data) { CURLcode err; if (key) { + zval *orig = *data; + convert_to_string_ex(data); err = curl_formadd(&http_post_data[0], &http_post_data[1], CURLFORM_COPYNAME, key, CURLFORM_COPYCONTENTS, Z_STRVAL_PP(data), - CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(data), + CURLFORM_CONTENTSLENGTH, (long) Z_STRLEN_PP(data), CURLFORM_END ); + + if (orig != *data) { + zval_ptr_dtor(data); + } + if (CURLE_OK != err) { - http_error_ex(E_WARNING, HTTP_E_CURL, "Could not encode post fields: %s", curl_easy_strerror(err)); + http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post fields: %s", curl_easy_strerror(err)); curl_formfree(http_post_data[0]); return FAILURE; } @@ -139,25 +303,27 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable * } /* file data */ - FOREACH_HASH_VAL(files, data) { - CURLcode err; + FOREACH_HASH_VAL(pos, files, data) { zval **file, **type, **name; - if ( SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) && - SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) && - SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) { - err = curl_formadd(&http_post_data[0], &http_post_data[1], + + if (Z_TYPE_PP(data) != IS_ARRAY) { + http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Unrecognized type of post file array entry"); + } else if ( SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) || + SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) || + SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) { + http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry"); + } else { + CURLcode err = curl_formadd(&http_post_data[0], &http_post_data[1], CURLFORM_COPYNAME, Z_STRVAL_PP(name), CURLFORM_FILE, Z_STRVAL_PP(file), CURLFORM_CONTENTTYPE, Z_STRVAL_PP(type), CURLFORM_END ); if (CURLE_OK != err) { - http_error_ex(E_WARNING, HTTP_E_CURL, "Could not encode post files: %s", curl_easy_strerror(err)); + http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post files: %s", curl_easy_strerror(err)); curl_formfree(http_post_data[0]); return FAILURE; } - } else { - http_error(E_NOTICE, HTTP_E_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry"); } } @@ -170,7 +336,7 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable * size_t encoded_len; if (SUCCESS != http_urlencode_hash_ex(fields, 1, NULL, 0, &encoded, &encoded_len)) { - http_error(E_WARNING, HTTP_E_ENCODE, "Could not encode post data"); + http_error(HE_WARNING, HTTP_E_ENCODING, "Could not encode post data"); return FAILURE; } @@ -186,169 +352,161 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable * /* {{{ void http_request_body_dtor(http_request_body *) */ PHP_HTTP_API void _http_request_body_dtor(http_request_body *body TSRMLS_DC) { - switch (body->type) - { - case HTTP_REQUEST_BODY_CSTRING: - efree(body->data); - break; + if (body) { + switch (body->type) + { + case HTTP_REQUEST_BODY_CSTRING: + if (body->data) { + efree(body->data); + } + break; - case HTTP_REQUEST_BODY_CURLPOST: - curl_formfree(body->data); - break; + case HTTP_REQUEST_BODY_CURLPOST: + curl_formfree(body->data); + break; - case HTTP_REQUEST_BODY_UPLOADFILE: - php_stream_close(body->data); - break; + case HTTP_REQUEST_BODY_UPLOADFILE: + php_stream_close(body->data); + break; + } } } /* }}} */ -/* {{{ STATUS http_request_ex(CURL *, http_request_method, char *, http_request_body, HashTable, HashTable, phpstr *) */ -PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const char *url, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC) +/* {{{ void http_request_body_free(http_request_body *) */ +PHP_HTTP_API void _http_request_body_free(http_request_body **body TSRMLS_DC) +{ + if (*body) { + http_request_body_dtor(*body); + efree(*body); + *body = NULL; + } +} +/* }}} */ + +/* {{{ STATUS http_request_init(CURL *, http_request_method, char *, http_request_body *, HashTable *) */ +PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options TSRMLS_DC) { - CURLcode result = CURLE_OK; - STATUS status = SUCCESS; - zend_bool clean_curl = 0, range_req = 0; zval *zoption; + zend_bool range_req = 0; - /* check/init CURL handle */ - if (ch) { -#if LIBCURL_VERSION_NUM >= 0x070c01 - curl_easy_reset(ch); + /* reset CURL handle */ +#ifdef HAVE_CURL_EASY_RESET + curl_easy_reset(ch); #endif - } else { - if (ch = curl_easy_init()) { - clean_curl = 1; - } else { - http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl"); - return FAILURE; - } - } + http_curl_defaults(ch); /* set options */ if (url) { - HTTP_CURL_OPT(URL, url); + HTTP_CURL_OPT(URL, http_request_data_copy(COPY_STRING, url)); } HTTP_CURL_OPT(HEADER, 0); HTTP_CURL_OPT(FILETIME, 1); HTTP_CURL_OPT(AUTOREFERER, 1); HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback); - HTTP_CURL_OPT(WRITEFUNCTION, http_curl_write_callback); - HTTP_CURL_OPT(HEADERFUNCTION, http_curl_write_callback); + /* we'll get all data through the debug function */ + HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback); + HTTP_CURL_OPT(HEADERFUNCTION, NULL); - if (response) { - HTTP_CURL_OPT(WRITEDATA, response); - HTTP_CURL_OPT(WRITEHEADER, response); - } + HTTP_CURL_OPT(VERBOSE, 1); + HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_raw_callback); #if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00) HTTP_CURL_OPT(NOSIGNAL, 1); #endif #if LIBCURL_VERSION_NUM < 0x070c00 - HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).curl.error); + HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).error); #endif /* progress callback */ - if (zoption = http_curl_getopt(options, "onprogress", 0)) { + if ((zoption = http_curl_getopt(options, "onprogress", 0))) { HTTP_CURL_OPT(NOPROGRESS, 0); HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback); - HTTP_CURL_OPT(PROGRESSDATA, zoption); - } else { - HTTP_CURL_OPT(NOPROGRESS, 1); - } - - /* debug callback */ - if (zoption = http_curl_getopt(options, "ondebug", 0)) { - HTTP_CURL_OPT(VERBOSE, 1); - HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_debug_callback); - HTTP_CURL_OPT(DEBUGDATA, zoption); - } else { - HTTP_CURL_OPT(VERBOSE, 0); + HTTP_CURL_OPT(PROGRESSDATA, http_request_callback_data(zoption)); } /* proxy */ - if (zoption = http_curl_getopt(options, "proxyhost", IS_STRING)) { - HTTP_CURL_OPT(PROXY, http_curl_copystr(Z_STRVAL_P(zoption))); + if ((zoption = http_curl_getopt(options, "proxyhost", IS_STRING))) { + HTTP_CURL_OPT(PROXY, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); /* port */ - if (zoption = http_curl_getopt(options, "proxyport", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "proxyport", IS_LONG))) { HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption)); } /* user:pass */ - if (zoption = http_curl_getopt(options, "proxyauth", IS_STRING)) { - HTTP_CURL_OPT(PROXYUSERPWD, http_curl_copystr(Z_STRVAL_P(zoption))); + if ((zoption = http_curl_getopt(options, "proxyauth", IS_STRING))) { + HTTP_CURL_OPT(PROXYUSERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } #if LIBCURL_VERSION_NUM >= 0x070a07 /* auth method */ - if (zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG))) { HTTP_CURL_OPT(PROXYAUTH, Z_LVAL_P(zoption)); } #endif } /* outgoing interface */ - if (zoption = http_curl_getopt(options, "interface", IS_STRING)) { - HTTP_CURL_OPT(INTERFACE, http_curl_copystr(Z_STRVAL_P(zoption))); + if ((zoption = http_curl_getopt(options, "interface", IS_STRING))) { + HTTP_CURL_OPT(INTERFACE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } /* another port */ - if (zoption = http_curl_getopt(options, "port", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "port", IS_LONG))) { HTTP_CURL_OPT(PORT, Z_LVAL_P(zoption)); } /* auth */ - if (zoption = http_curl_getopt(options, "httpauth", IS_STRING)) { - HTTP_CURL_OPT(USERPWD, http_curl_copystr(Z_STRVAL_P(zoption))); + if ((zoption = http_curl_getopt(options, "httpauth", IS_STRING))) { + HTTP_CURL_OPT(USERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } #if LIBCURL_VERSION_NUM >= 0x070a06 - if (zoption = http_curl_getopt(options, "httpauthtype", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "httpauthtype", IS_LONG))) { HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption)); } #endif - /* compress, empty string enables deflate and gzip */ - if (zoption = http_curl_getopt(options, "compress", IS_BOOL)) { - if (Z_LVAL_P(zoption)) { - HTTP_CURL_OPT(ENCODING, http_curl_copystr("")); - } + /* compress, empty string enables all supported if libcurl was build with zlib support */ + if ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) { +#ifdef HTTP_HAVE_CURL_ZLIB + HTTP_CURL_OPT(ENCODING, ""); +#else + HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0.1"); +#endif } /* redirects, defaults to 0 */ - if (zoption = http_curl_getopt(options, "redirect", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "redirect", IS_LONG))) { HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0); HTTP_CURL_OPT(MAXREDIRS, Z_LVAL_P(zoption)); - if (zoption = http_curl_getopt(options, "unrestrictedauth", IS_BOOL)) { + if ((zoption = http_curl_getopt(options, "unrestrictedauth", IS_BOOL))) { HTTP_CURL_OPT(UNRESTRICTED_AUTH, Z_LVAL_P(zoption)); } - } else { - HTTP_CURL_OPT(FOLLOWLOCATION, 0); } /* referer */ - if (zoption = http_curl_getopt(options, "referer", IS_STRING)) { - HTTP_CURL_OPT(REFERER, http_curl_copystr(Z_STRVAL_P(zoption))); + if ((zoption = http_curl_getopt(options, "referer", IS_STRING))) { + HTTP_CURL_OPT(REFERER, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } /* useragent, default "PECL::HTTP/version (PHP/version)" */ - if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) { - HTTP_CURL_OPT(USERAGENT, http_curl_copystr(Z_STRVAL_P(zoption))); - } else { - HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")"); + if ((zoption = http_curl_getopt(options, "useragent", IS_STRING))) { + HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } /* additional headers, array('name' => 'value') */ - if (zoption = http_curl_getopt(options, "headers", IS_ARRAY)) { + if ((zoption = http_curl_getopt(options, "headers", IS_ARRAY))) { char *header_key; ulong header_idx; + HashPosition pos; struct curl_slist *headers = NULL; - FOREACH_KEY(zoption, header_key, header_idx) { + FOREACH_KEY(pos, zoption, header_key, header_idx) { if (header_key) { zval **header_val; - if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val)) { + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &header_val, &pos)) { char header[1024] = {0}; snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val)); - headers = curl_slist_append(headers, http_curl_copystr(header)); + headers = curl_slist_append(headers, http_request_data_copy(COPY_STRING, header)); } /* reset */ @@ -357,20 +515,21 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const c } if (headers) { - HTTP_CURL_OPT(HTTPHEADER, headers); + HTTP_CURL_OPT(HTTPHEADER, http_request_data_copy(COPY_SLIST, headers)); } } /* cookies, array('name' => 'value') */ - if (zoption = http_curl_getopt(options, "cookies", IS_ARRAY)) { + if ((zoption = http_curl_getopt(options, "cookies", IS_ARRAY))) { char *cookie_key = NULL; ulong cookie_idx = 0; + HashPosition pos; phpstr *qstr = phpstr_new(); - FOREACH_KEY(zoption, cookie_key, cookie_idx) { + FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) { if (cookie_key) { zval **cookie_val; - if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &cookie_val)) { + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) { phpstr_appendf(qstr, "%s=%s; ", cookie_key, Z_STRVAL_PP(cookie_val)); } @@ -381,53 +540,71 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const c if (qstr->used) { phpstr_fix(qstr); - HTTP_CURL_OPT(COOKIE, http_curl_copystr(qstr->data)); + HTTP_CURL_OPT(COOKIE, http_request_data_copy(COPY_STRING, qstr->data)); + } + phpstr_free(&qstr); + } + + /* session cookies */ + if ((zoption = http_curl_getopt(options, "cookiesession", IS_BOOL))) { + if (Z_LVAL_P(zoption)) { + /* accept cookies for this session */ + HTTP_CURL_OPT(COOKIEFILE, ""); + } else { + /* reset session cookies */ + HTTP_CURL_OPT(COOKIESESSION, 1); } - phpstr_free(qstr); } - /* cookiestore */ - if (zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) { - HTTP_CURL_OPT(COOKIEFILE, http_curl_copystr(Z_STRVAL_P(zoption))); - HTTP_CURL_OPT(COOKIEJAR, http_curl_copystr(Z_STRVAL_P(zoption))); + /* cookiestore, read initial cookies from that file and store cookies back into that file */ + if ((zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) { + HTTP_CURL_OPT(COOKIEFILE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); + HTTP_CURL_OPT(COOKIEJAR, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); } /* resume */ - if (zoption = http_curl_getopt(options, "resume", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "resume", IS_LONG)) && (Z_LVAL_P(zoption) != 0)) { range_req = 1; HTTP_CURL_OPT(RESUME_FROM, Z_LVAL_P(zoption)); } /* maxfilesize */ - if (zoption = http_curl_getopt(options, "maxfilesize", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "maxfilesize", IS_LONG))) { HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption)); } /* lastmodified */ - if (zoption = http_curl_getopt(options, "lastmodified", IS_LONG)) { - HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE); - HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption)); + if ((zoption = http_curl_getopt(options, "lastmodified", IS_LONG))) { + if (Z_LVAL_P(zoption)) { + if (Z_LVAL_P(zoption) > 0) { + HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption)); + } else { + HTTP_CURL_OPT(TIMEVALUE, time(NULL) + Z_LVAL_P(zoption)); + } + HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE); + } else { + HTTP_CURL_OPT(TIMECONDITION, CURL_TIMECOND_NONE); + } } - /* timeout */ - if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) { + /* timeout, defaults to 0 */ + if ((zoption = http_curl_getopt(options, "timeout", IS_LONG))) { HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption)); } - /* connecttimeout, defaults to 1 */ - if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) { + /* connecttimeout, defaults to 3 */ + if ((zoption = http_curl_getopt(options, "connecttimeout", IS_LONG))) { HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption)); - } else { - HTTP_CURL_OPT(CONNECTTIMEOUT, 1); } /* ssl */ - if (zoption = http_curl_getopt(options, "ssl", IS_ARRAY)) { + if ((zoption = http_curl_getopt(options, "ssl", IS_ARRAY))) { ulong idx; char *key = NULL; zval **param; + HashPosition pos; - FOREACH_KEYVAL(zoption, key, idx, param) { + FOREACH_KEYVAL(pos, zoption, key, idx, param) { if (key) { HTTP_CURL_OPT_SSL_STRING(CERT); #if LIBCURL_VERSION_NUM >= 0x070903 @@ -446,7 +623,6 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const c HTTP_CURL_OPT_SSL_LONG_(VERIFYHOST); HTTP_CURL_OPT_SSL_STRING_(CIPHER_LIST); - HTTP_CURL_OPT_STRING(CAINFO); #if LIBCURL_VERSION_NUM >= 0x070908 HTTP_CURL_OPT_STRING(CAPATH); @@ -458,10 +634,6 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const c key = NULL; } } - } else { - /* disable SSL verification by default */ - HTTP_CURL_OPT(SSL_VERIFYPEER, 0); - HTTP_CURL_OPT(SSL_VERIFYHOST, 0); } /* request method */ @@ -487,9 +659,8 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const c if (http_request_method_exists(0, meth, NULL)) { curl_easy_setopt(ch, CURLOPT_CUSTOMREQUEST, http_request_method_name(meth)); } else { - http_error_ex(E_WARNING, HTTP_E_CURL, "Unsupported request method: %d", meth); - status = FAILURE; - goto http_request_end; + http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unsupported request method: %d", meth); + return FAILURE; } break; } @@ -499,7 +670,7 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const c switch (body->type) { case HTTP_REQUEST_BODY_CSTRING: - curl_easy_setopt(ch, CURLOPT_POSTFIELDS, (char *) body->data); + curl_easy_setopt(ch, CURLOPT_POSTFIELDS, body->data); curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, body->size); break; @@ -508,293 +679,152 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const c break; case HTTP_REQUEST_BODY_UPLOADFILE: - case HTTP_REQUEST_BODY_UPLOADDATA: - curl_easy_setopt(ch, CURLOPT_READDATA, body); + curl_easy_setopt(ch, CURLOPT_READDATA, http_request_callback_data(body)); curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size); break; default: - http_error_ex(E_WARNING, HTTP_E_CURL, "Unknown request body type: %d", body->type); - status = FAILURE; - goto http_request_end; + /* shouldn't ever happen */ + http_error_ex(HE_ERROR, 0, "Unknown request body type: %d", body->type); + return FAILURE; break; } } + return SUCCESS; +} +/* }}} */ + +/* {{{ void http_request_conv(CURL *, phpstr *, phpstr *) */ +void _http_request_conv(CURL *ch, phpstr* response, phpstr *request TSRMLS_DC) +{ + http_request_conv *conv = emalloc(sizeof(http_request_conv)); + conv->response = response; + conv->request = request; + conv->last_info = -1; + HTTP_CURL_OPT(DEBUGDATA, http_request_callback_data(http_request_data_copy(COPY_CONV, conv))); +} +/* }}} */ + +/* {{{ STATUS http_request_exec(CURL *, HashTable *) */ +PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info, phpstr *response, phpstr *request TSRMLS_DC) +{ + CURLcode result; + + http_request_conv(ch, response, request); + /* perform request */ - if (CURLE_OK == (result = curl_easy_perform(ch))) { - /* get curl info */ - if (info) { - zval array; - Z_ARRVAL(array) = info; + if (CURLE_OK != (result = curl_easy_perform(ch))) { + http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(result)); + } + /* get curl info */ + if (info) { + http_request_info(ch, info); + } + /* always succeeds */ + return SUCCESS; +} +/* }}} */ - HTTP_CURL_INFO(EFFECTIVE_URL); +/* {{{ void http_request_info(CURL *, HashTable *) */ +PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC) +{ + zval array; + INIT_ZARR(array, info); + + HTTP_CURL_INFO(EFFECTIVE_URL); #if LIBCURL_VERSION_NUM >= 0x070a07 - HTTP_CURL_INFO(RESPONSE_CODE); + HTTP_CURL_INFO(RESPONSE_CODE); #else - HTTP_CURL_INFO_EX(HTTP_CODE, RESPONSE_CODE); + HTTP_CURL_INFO_EX(HTTP_CODE, RESPONSE_CODE); #endif - HTTP_CURL_INFO(HTTP_CONNECTCODE); + HTTP_CURL_INFO(HTTP_CONNECTCODE); #if LIBCURL_VERSION_NUM >= 0x070500 - HTTP_CURL_INFO(FILETIME); + HTTP_CURL_INFO(FILETIME); #endif - HTTP_CURL_INFO(TOTAL_TIME); - HTTP_CURL_INFO(NAMELOOKUP_TIME); - HTTP_CURL_INFO(CONNECT_TIME); - HTTP_CURL_INFO(PRETRANSFER_TIME); - HTTP_CURL_INFO(STARTTRANSFER_TIME); + HTTP_CURL_INFO(TOTAL_TIME); + HTTP_CURL_INFO(NAMELOOKUP_TIME); + HTTP_CURL_INFO(CONNECT_TIME); + HTTP_CURL_INFO(PRETRANSFER_TIME); + HTTP_CURL_INFO(STARTTRANSFER_TIME); #if LIBCURL_VERSION_NUM >= 0x070907 - HTTP_CURL_INFO(REDIRECT_TIME); - HTTP_CURL_INFO(REDIRECT_COUNT); + HTTP_CURL_INFO(REDIRECT_TIME); + HTTP_CURL_INFO(REDIRECT_COUNT); #endif - HTTP_CURL_INFO(SIZE_UPLOAD); - HTTP_CURL_INFO(SIZE_DOWNLOAD); - HTTP_CURL_INFO(SPEED_DOWNLOAD); - HTTP_CURL_INFO(SPEED_UPLOAD); - HTTP_CURL_INFO(HEADER_SIZE); - HTTP_CURL_INFO(REQUEST_SIZE); - HTTP_CURL_INFO(SSL_VERIFYRESULT); + HTTP_CURL_INFO(SIZE_UPLOAD); + HTTP_CURL_INFO(SIZE_DOWNLOAD); + HTTP_CURL_INFO(SPEED_DOWNLOAD); + HTTP_CURL_INFO(SPEED_UPLOAD); + HTTP_CURL_INFO(HEADER_SIZE); + HTTP_CURL_INFO(REQUEST_SIZE); + HTTP_CURL_INFO(SSL_VERIFYRESULT); #if LIBCURL_VERSION_NUM >= 0x070c03 - /*HTTP_CURL_INFO(SSL_ENGINES); todo: CURLINFO_SLIST */ + /*HTTP_CURL_INFO(SSL_ENGINES); todo: CURLINFO_SLIST */ #endif - HTTP_CURL_INFO(CONTENT_LENGTH_DOWNLOAD); - HTTP_CURL_INFO(CONTENT_LENGTH_UPLOAD); - HTTP_CURL_INFO(CONTENT_TYPE); + HTTP_CURL_INFO(CONTENT_LENGTH_DOWNLOAD); + HTTP_CURL_INFO(CONTENT_LENGTH_UPLOAD); + HTTP_CURL_INFO(CONTENT_TYPE); #if LIBCURL_VERSION_NUM >= 0x070a03 - /*HTTP_CURL_INFO(PRIVATE);*/ + /*HTTP_CURL_INFO(PRIVATE);*/ #endif #if LIBCURL_VERSION_NUM >= 0x070a08 - HTTP_CURL_INFO(HTTPAUTH_AVAIL); - HTTP_CURL_INFO(PROXYAUTH_AVAIL); + HTTP_CURL_INFO(HTTPAUTH_AVAIL); + HTTP_CURL_INFO(PROXYAUTH_AVAIL); #endif #if LIBCURL_VERSION_NUM >= 0x070c02 - /*HTTP_CURL_INFO(OS_ERRNO);*/ + /*HTTP_CURL_INFO(OS_ERRNO);*/ #endif #if LIBCURL_VERSION_NUM >= 0x070c03 - HTTP_CURL_INFO(NUM_CONNECTS); + HTTP_CURL_INFO(NUM_CONNECTS); #endif - } - } else { - http_error_ex(E_WARNING, HTTP_E_CURL, "Could not perform request: %s", curl_easy_strerror(result)); - status = FAILURE; - } - -http_request_end: - /* free strings copied with http_curl_copystr() */ - zend_llist_clean(&HTTP_G(request).curl.copies); - - /* clean curl handle if acquired */ - if (clean_curl) { - curl_easy_cleanup(ch); - ch = NULL; - } - - /* finalize response */ - if (response) { - phpstr_fix(PHPSTR(response)); - } - - return status; -} -/* }}} */ - -/* {{{ char *http_request_method_name(http_request_method) */ -PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_DC) -{ - zval **meth; - - if (HTTP_STD_REQUEST_METHOD(m)) { - return http_request_methods[m]; - } - - if (SUCCESS == zend_hash_index_find(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(m), (void **) &meth)) { - return Z_STRVAL_PP(meth); - } - - return http_request_methods[0]; -} -/* }}} */ - -/* {{{ unsigned long http_request_method_exists(zend_bool, unsigned long, char *) */ -PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsigned long id, const char *name TSRMLS_DC) -{ - if (by_name) { - unsigned i; - - for (i = HTTP_NO_REQUEST_METHOD + 1; i < HTTP_MAX_REQUEST_METHOD; ++i) { - if (!strcmp(name, http_request_methods[i])) { - return i; - } - } - { - zval **data; - char *key; - ulong idx; - - FOREACH_HASH_KEYVAL(&HTTP_G(request).methods.custom, key, idx, data) { - if (!strcmp(name, Z_STRVAL_PP(data))) { - return idx + HTTP_MAX_REQUEST_METHOD; - } - } - } - return 0; - } else { - return HTTP_STD_REQUEST_METHOD(id) || zend_hash_index_exists(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(id)) ? id : 0; - } } /* }}} */ -/* {{{ unsigned long http_request_method_register(char *) */ -PHP_HTTP_API unsigned long _http_request_method_register(const char *method TSRMLS_DC) -{ - zval array; - char *http_method; - unsigned long meth_num = HTTP_G(request).methods.custom.nNextFreeElement + HTTP_MAX_REQUEST_METHOD; - - Z_ARRVAL(array) = &HTTP_G(request).methods.custom; - add_next_index_string(&array, estrdup(method), 0); - - spprintf(&http_method, 0, "HTTP_%s", method); - zend_register_long_constant(http_method, strlen(http_method) + 1, meth_num, CONST_CS, http_module_number TSRMLS_CC); - efree(http_method); - - return meth_num; -} -/* }}} */ - -/* {{{ STATUS http_request_method_unregister(usngigned long) */ -PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_DC) +/* {{{ STATUS http_request_ex(CURL *, http_request_method, char *, http_request_body, HashTable, HashTable, phpstr *) */ +PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC) { - zval **zmethod; - char *http_method; + STATUS status; + zend_bool clean_curl = !ch; - if (SUCCESS != zend_hash_index_find(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(method), (void **) &zmethod)) { - http_error_ex(E_NOTICE, HTTP_E_PARAM, "Request method with id %lu does not exist", method); - return FAILURE; - } + HTTP_CHECK_CURL_INIT(ch, curl_easy_init(), return FAILURE); - spprintf(&http_method, 0, "HTTP_%s", Z_STRVAL_PP(zmethod)); + status = ((SUCCESS == http_request_init(ch, meth, url, body, options)) && + (SUCCESS == http_request_exec(ch, info, response, NULL))) ? SUCCESS : FAILURE; - if ( (SUCCESS != zend_hash_index_del(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(method))) - || (SUCCESS != zend_hash_del(EG(zend_constants), http_method, strlen(http_method) + 1))) { - http_error_ex(E_NOTICE, 0, "Could not unregister request method: %s", http_method); - efree(http_method); - return FAILURE; + if (clean_curl) { + curl_easy_cleanup(ch); } - - efree(http_method); - return SUCCESS; -} -/* }}} */ - -/* {{{ char *http_request_methods[] */ -static const char *const http_request_methods[] = { - "UNKOWN", - /* HTTP/1.1 */ - "GET", - "HEAD", - "POST", - "PUT", - "DELETE", - "OPTIONS", - "TRACE", - "CONNECT", - /* WebDAV - RFC 2518 */ - "PROPFIND", - "PROPPATCH", - "MKCOL", - "COPY", - "MOVE", - "LOCK", - "UNLOCK", - /* WebDAV Versioning - RFC 3253 */ - "VERSION-CONTROL", - "REPORT", - "CHECKOUT", - "CHECKIN", - "UNCHECKOUT", - "MKWORKSPACE", - "UPDATE", - "LABEL", - "MERGE", - "BASELINE-CONTROL", - "MKACTIVITY", - /* WebDAV Access Control - RFC 3744 */ - "ACL", - NULL -}; -/* }}} */ - -/* {{{ static inline char *http_curl_copystr(char *) */ -static inline char *_http_curl_copystr(const char *str TSRMLS_DC) -{ - char *new_str = estrdup(str); - zend_llist_add_element(&HTTP_G(request).curl.copies, &new_str); - return new_str; -} -/* }}} */ - -/* {{{ static size_t http_curl_write_callback(char *, size_t, size_t, void *) */ -static size_t http_curl_write_callback(char *buf, size_t len, size_t n, void *s) -{ - return s ? phpstr_append(PHPSTR(s), buf, len * n) : len * n; + return status; } /* }}} */ /* {{{ static size_t http_curl_read_callback(void *, size_t, size_t, void *) */ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s) { - static char *offset = NULL, *original = NULL; - http_request_body *body = (http_request_body *) s; + HTTP_REQUEST_CALLBACK_DATA(s, http_request_body *, body); - switch (body->type) - { - case HTTP_REQUEST_BODY_UPLOADFILE: - { - TSRMLS_FETCH(); - return php_stream_read((php_stream *) body->data, data, len * n); - } - break; - - case HTTP_REQUEST_BODY_UPLOADDATA: - { - size_t avail; - if (original != s) { - original = offset = s; - } - if ((avail = body->size - (offset - original)) < 1) { - return 0; - } - if (avail < (len * n)) { - memcpy(data, offset, avail); - offset += avail; - return avail; - } else { - memcpy(data, offset, len * n); - offset += len * n; - return len * n; - } - } - break; - - default: - return 0; - break; + if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) { + return 0; } + return php_stream_read((php_stream *) body->data, data, len * n); } /* }}} */ /* {{{ static int http_curl_progress_callback(void *, double, double, double, double) */ static int http_curl_progress_callback(void *data, double dltotal, double dlnow, double ultotal, double ulnow) { - zval *params_pass[4], params_local[4], retval, *func = (zval *) data; - TSRMLS_FETCH(); + zval *params_pass[4], params_local[4], retval; + HTTP_REQUEST_CALLBACK_DATA(data, zval *, func); 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); @@ -804,21 +834,60 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow, } /* }}} */ -static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string, size_t length, void *data) +/* {{{ static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *) */ +static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size_t length, void *ctx) { - zval *params_pass[2], params_local[2], retval, *func = (zval *) data; - TSRMLS_FETCH(); - - params_pass[0] = ¶ms_local[0]; - params_pass[1] = ¶ms_local[1]; + HTTP_REQUEST_CALLBACK_DATA(ctx, http_request_conv *, conv); - ZVAL_LONG(params_pass[0], type); - ZVAL_STRINGL(params_pass[1], string, length, 1); - - call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC); + switch (type) + { + case CURLINFO_DATA_IN: + if (conv->response && conv->last_info == CURLINFO_HEADER_IN) { + phpstr_appends(conv->response, HTTP_CRLF); + } + case CURLINFO_HEADER_IN: + if (conv->response) { + phpstr_append(conv->response, data, length); + } + break; + case CURLINFO_DATA_OUT: + if (conv->request && conv->last_info == CURLINFO_HEADER_OUT) { + phpstr_appends(conv->request, HTTP_CRLF); + } + case CURLINFO_HEADER_OUT: + if (conv->request) { + phpstr_append(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 (type) { + conv->last_info = type; + } return 0; } +/* }}} */ + /* {{{ static inline zval *http_curl_getopt(HashTable *, char *, size_t, int) */ static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC) { @@ -836,7 +905,7 @@ static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t k 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; + case IS_OBJECT: convert_to_object_ex(zoption); break; default: break; } @@ -846,6 +915,166 @@ static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t k } /* }}} */ +#ifdef HTTP_NEED_OPENSSL_TSL +/* {{{ */ +static MUTEX_T *http_openssl_tsl = NULL; + +static void http_ssl_lock(int mode, int n, const char * file, int line) +{ + if (mode & CRYPTO_LOCK) { + tsrm_mutex_lock(http_openssl_tsl[n]); + } else { + tsrm_mutex_unlock(http_openssl_tsl[n]); + } +} + +static ulong http_ssl_id(void) +{ + return (ulong) tsrm_thread_id(); +} + +static inline void http_ssl_init(void) +{ + int i, c = CRYPTO_num_locks(); + + http_openssl_tsl = malloc(c * sizeof(MUTEX_T)); + + for (i = 0; i < c; ++i) { + http_openssl_tsl[i] = tsrm_mutex_alloc(); + } + + CRYPTO_set_id_callback(http_ssl_id); + CRYPTO_set_locking_callback(http_ssl_lock); +} + +static inline void http_ssl_cleanup(void) +{ + if (http_openssl_tsl) { + int i, c = CRYPTO_num_locks(); + + CRYPTO_set_id_callback(NULL); + CRYPTO_set_locking_callback(NULL); + + for (i = 0; i < c; ++i) { + tsrm_mutex_free(http_openssl_tsl[i]); + } + + free(http_openssl_tsl); + http_openssl_tsl = NULL; + } +} +#endif /* HTTP_NEED_OPENSSL_TSL */ +/* }}} */ + +#ifdef HTTP_NEED_GNUTLS_TSL +/* {{{ */ +static int http_ssl_mutex_create(void **m) +{ + if (*((MUTEX_T *) m) = tsrm_mutex_alloc()) { + return SUCCESS; + } else { + return FAILURE; + } +} + +static int http_ssl_mutex_destroy(void **m) +{ + tsrm_mutex_free(*((MUTEX_T *) m)); + return SUCCESS; +} + +static int http_ssl_mutex_lock(void **m) +{ + return tsrm_mutex_lock(*((MUTEX_T *) m)); +} + +static int http_ssl_mutex_unlock(void **m) +{ + return tsrm_mutex_unlock(*((MUTEX_T *) m)); +} + +static struct gcry_thread_cbs http_gnutls_tsl = { + GCRY_THREAD_OPTIONS_USER, + NULL, + http_ssl_mutex_create, + http_ssl_mutex_destroy, + http_ssl_mutex_lock, + http_ssl_mutex_unlock +}; + +static inline void http_ssl_init(void) +{ + gcry_control(GCRYCTL_SET_THREAD_CBS, &http_gnutls_tsl); +} + +static inline void http_ssl_cleanup(void) +{ + return; +} +#endif /* HTTP_NEED_GNUTLS_TSL */ +/* }}} */ + +/* {{{ http_curl_defaults(CURL *) */ +static inline void _http_curl_defaults(CURL *ch) +{ + HTTP_CURL_OPT(URL, NULL); + HTTP_CURL_OPT(NOPROGRESS, 1); + HTTP_CURL_OPT(PROXY, NULL); + HTTP_CURL_OPT(PROXYPORT, 0); + HTTP_CURL_OPT(PROXYUSERPWD, NULL); +#if LIBCURL_VERSION_NUM >= 0x070a07 + HTTP_CURL_OPT(PROXYAUTH, 0); +#endif + HTTP_CURL_OPT(INTERFACE, NULL); + HTTP_CURL_OPT(PORT, 0); + HTTP_CURL_OPT(USERPWD, NULL); +#if LIBCURL_VERSION_NUM >= 0x070a06 + HTTP_CURL_OPT(HTTPAUTH, 0); +#endif + HTTP_CURL_OPT(ENCODING, 0); + 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); + HTTP_CURL_OPT(COOKIEFILE, NULL); + HTTP_CURL_OPT(COOKIEJAR, NULL); + HTTP_CURL_OPT(RESUME_FROM, 0); + HTTP_CURL_OPT(MAXFILESIZE, 0); + HTTP_CURL_OPT(TIMECONDITION, 0); + HTTP_CURL_OPT(TIMEVALUE, 0); + HTTP_CURL_OPT(TIMEOUT, 0); + HTTP_CURL_OPT(CONNECTTIMEOUT, 3); + HTTP_CURL_OPT(SSLCERT, NULL); +#if LIBCURL_VERSION_NUM >= 0x070903 + HTTP_CURL_OPT(SSLCERTTYPE, NULL); +#endif + HTTP_CURL_OPT(SSLCERTPASSWD, NULL); + HTTP_CURL_OPT(SSLKEY, NULL); + HTTP_CURL_OPT(SSLKEYTYPE, NULL); + HTTP_CURL_OPT(SSLKEYPASSWD, NULL); + HTTP_CURL_OPT(SSLENGINE, NULL); + HTTP_CURL_OPT(SSLVERSION, 0); + HTTP_CURL_OPT(SSL_VERIFYPEER, 0); + HTTP_CURL_OPT(SSL_VERIFYHOST, 0); + HTTP_CURL_OPT(SSL_CIPHER_LIST, NULL); + HTTP_CURL_OPT(CAINFO, NULL); +#if LIBCURL_VERSION_NUM >= 0x070908 + HTTP_CURL_OPT(CAPATH, NULL); +#endif + HTTP_CURL_OPT(RANDOM_FILE, NULL); + HTTP_CURL_OPT(EGDSOCKET, NULL); + HTTP_CURL_OPT(POSTFIELDS, NULL); + HTTP_CURL_OPT(POSTFIELDSIZE, 0); + HTTP_CURL_OPT(HTTPPOST, NULL); + HTTP_CURL_OPT(READDATA, NULL); + HTTP_CURL_OPT(INFILESIZE, 0); +} +/* }}} */ + +#endif /* HTTP_HAVE_CURL */ + /* * Local variables: * tab-width: 4