#include "php_http_std_defs.h"
#include "php_http_api.h"
#include "php_http_request_api.h"
-#include "php_http_request_object.h"
-#include "php_http_requestpool_object.h"
#include "php_http_url_api.h"
#ifndef HTTP_CURL_USE_ZEND_MM
ZEND_EXTERN_MODULE_GLOBALS(http)
#if LIBCURL_VERSION_NUM < 0x070c00
-# define curl_easy_strerror(code) HTTP_G(request).curl.error
+# define curl_easy_strerror(code) HTTP_G(request).error
#endif
#define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I)
static int http_curl_progress_callback(void *, double, double, double, double);
static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void *);
-typedef struct {
- void ***tsrm_ctx;
- void *data;
-} http_curl_callback_ctx;
-
#define HTTP_CURL_CALLBACK_DATA(from, type, var) \
http_curl_callback_ctx *__CTX = (http_curl_callback_ctx *) (from); \
TSRMLS_FETCH_FROM_CTX(__CTX->tsrm_ctx); \
#define http_curl_callback_data(data) _http_curl_callback_data((data) TSRMLS_CC)
static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC);
-static void http_request_pool_freebody(http_request_body **body);
-static void http_request_pool_responsehandler(zval **req TSRMLS_DC);
-static inline STATUS http_request_pool_select(http_request_pool *pool);
-static inline void http_request_pool_perform(http_request_pool *pool);
#if HTTP_CURL_USE_ZEND_MM
static void http_curl_free(void *p) { efree(p); }
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;
+ }
+
default:
{
return data;
}
/* }}} */
+/* {{{ _http_request_data_free_context(http_curl_callback_ctx **) */
+void _http_request_data_free_context(void *context)
+{
+ efree(*((http_curl_callback_ctx **) context));
+}
+/* }}} */
+
/* {{{ http_request_body *http_request_body_new() */
PHP_HTTP_API http_request_body *_http_request_body_new(TSRMLS_D)
{
}
if (response) {
- HTTP_CURL_OPT(WRITEDATA, http_curl_callback_data(response));
- HTTP_CURL_OPT(WRITEHEADER, http_curl_callback_data(response));
+ http_curl_callback_ctx *response_ctx = http_curl_callback_data(response);
+ HTTP_CURL_OPT(WRITEDATA, response_ctx);
+ HTTP_CURL_OPT(WRITEHEADER, response_ctx);
}
HTTP_CURL_OPT(HEADER, 0);
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 */
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;
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_curl_callback_data(body));
curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size);
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)
{
- if (SUCCESS != http_request_init(ch, meth, url, body, options, response)) {
- return FAILURE;
+ STATUS status;
+ zend_bool clean_curl;
+
+ if ((clean_curl = (!ch))) {
+ if (!(ch = curl_easy_init())) {
+ http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl.");
+ return FAILURE;
+ }
+ }
+
+ status = ((SUCCESS == http_request_init(ch, meth, url, body, options, response)) &&
+ (SUCCESS == http_request_exec(ch, info))) ? SUCCESS : FAILURE;
+
+ if (clean_curl) {
+ curl_easy_cleanup(ch);
}
- return http_request_exec(ch, info);
+ return status;
}
/* }}} */
/* }}} */
-/* {{{ http_request_pool *http_request_pool_init(http_request_pool *) */
-PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC)
-{
- zend_bool free_pool;
-
- if ((free_pool = (!pool))) {
- pool = emalloc(sizeof(http_request_pool));
- pool->ch = NULL;
- }
-
- if (!pool->ch) {
- if (!(pool->ch = curl_multi_init())) {
- http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl");
- if (free_pool) {
- efree(pool);
- }
- return NULL;
- }
- }
-
- pool->unfinished = 0;
- zend_llist_init(&pool->handles, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0);
- zend_llist_init(&pool->bodies, sizeof(http_request_body *), (llist_dtor_func_t) http_request_pool_freebody, 0);
-
- return pool;
-}
-/* }}} */
-
-/* {{{ STATUS http_request_pool_attach(http_request_pool *, zval *) */
-PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request TSRMLS_DC)
-{
- getObjectEx(http_request_object, req, request);
-
- if (req->attached) {
- http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is already member of an HttpRequestPool");
- } else {
- CURLMcode code;
- http_request_body *body = http_request_body_new();
- zval *info = GET_PROP_EX(req, request, responseInfo);
-
- if (SUCCESS != http_request_object_requesthandler(req, request, body)) {
- efree(body);
- http_error_ex(E_WARNING, HTTP_E_CURL, "Could not initialize HttpRequest object for attaching to the HttpRequestPool");
- } else if (CURLM_OK != (code = curl_multi_add_handle(pool->ch, req->ch))) {
- http_error_ex(E_WARNING, HTTP_E_CURL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code));
- } else {
- req->attached = 1;
- zval_add_ref(&request);
- zend_llist_add_element(&pool->handles, &request);
- zend_llist_add_element(&pool->bodies, &body);
- return SUCCESS;
- }
- }
- return FAILURE;
-}
-/* }}} */
-
-/* {{{ STATUS http_request_pool_detach(http_request_pool *, zval *) */
-PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC)
-{
- getObjectEx(http_request_object, req, request);
-
- if (!req->attached) {
- http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to an HttpRequestPool");
- } else {
- CURLMcode code;
-
- if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->ch))) {
- http_error_ex(E_WARNING, HTTP_E_CURL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code));
- } else {
- req->attached = 0;
- zval_ptr_dtor(&request);
- return SUCCESS;
- }
- }
- return FAILURE;
-}
-/* }}} */
-
-/* {{{ STATUS http_request_pool_send(http_request_pool *) */
-PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
-{
- http_request_pool_perform(pool);
- while (pool->unfinished) {
- if (SUCCESS != http_request_pool_select(pool)) {
- http_error(E_WARNING, HTTP_E_CURL, "Socket error");
- return FAILURE;
- }
- http_request_pool_perform(pool);
- }
- zend_llist_apply(&pool->handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC);
- return SUCCESS;
-}
-/* }}} */
-
-/*#*/
-
-/* {{{ static void http_request_pool_free_body(http_request_body *) */
-static void http_request_pool_freebody(http_request_body **body)
-{
- TSRMLS_FETCH();
- http_request_body_free(*body);
-}
-/* }}} */
-
-/* {{{ static void http_request_pool_responsehandler(zval **) */
-static void http_request_pool_responsehandler(zval **req TSRMLS_DC)
-{
- getObjectEx(http_request_object, obj, *req);
- http_request_object_responsehandler(obj, *req, NULL);
-}
-/* }}} */
-
-/* {{{ static inline STATUS http_request_pool_select(http_request_pool *) */
-static inline STATUS http_request_pool_select(http_request_pool *pool)
-{
- int MAX;
- fd_set R, W, E;
- struct timeval timeout = {1, 0};
-
- FD_ZERO(&R);
- FD_ZERO(&W);
- FD_ZERO(&E);
-
- curl_multi_fdset(pool->ch, &R, &W, &E, &MAX);
- return (-1 != select(MAX + 1, &R, &W, &E, &timeout)) ? SUCCESS : FAILURE;
-}
-/* }}} */
-
-/* {{{ static inline void http_request_pool_perform(http_request_pool *) */
-static inline void http_request_pool_perform(http_request_pool *pool)
-{
- while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished));
-}
-/* }}} */
-
/* {{{ char *http_request_methods[] */
static const char *const http_request_methods[] = {
"UNKOWN",
static char *offset = NULL, *original = NULL;
HTTP_CURL_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);
}
/* }}} */
http_curl_callback_ctx *ctx = emalloc(sizeof(http_curl_callback_ctx));
TSRMLS_SET_CTX(ctx->tsrm_ctx);
ctx->data = data;
- return ctx;
+ return http_request_data_copy(COPY_CONTEXT, ctx);
}
/* }}} */
projects / m6w6 / ext-http / blobdiff