#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#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_url_api.h"
+#ifdef ZEND_ENGINE_2
+# include "php_http_request_object.h"
+#endif
+
+#include "phpstr/phpstr.h"
#ifdef PHP_WIN32
# include <winsock2.h>
#include <curl/curl.h>
-#include "phpstr/phpstr.h"
-
-#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_object.h"
-#include "php_http_requestpool_object.h"
-#include "php_http_url_api.h"
+ZEND_EXTERN_MODULE_GLOBALS(http);
#ifndef HTTP_CURL_USE_ZEND_MM
# define HTTP_CURL_USE_ZEND_MM 0
#endif
-#ifndef HTTP_DEBUG_REQPOOLS
-# define HTTP_DEBUG_REQPOOLS 0
-#endif
-
-ZEND_EXTERN_MODULE_GLOBALS(http)
-
#if LIBCURL_VERSION_NUM < 0x070c00
# define curl_easy_strerror(code) HTTP_G(request).error
#endif
#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_freehandle(zval **request, http_request_pool *pool TSRMLS_DC);
#if HTTP_CURL_USE_ZEND_MM
static void http_curl_free(void *p) { efree(p); }
{
case COPY_STRING:
{
- char *new_str = estrdup((const char*) data);
+ char *new_str = estrdup(data);
zend_llist_add_element(&HTTP_G(request).copies.strings, &new_str);
return new_str;
}
/* }}} */
/* {{{ STATUS http_request_init(CURL *, http_request_method, char *, http_request_body *, HashTable *, phpstr *) */
-PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const char *url, http_request_body *body, HashTable *options, phpstr *response TSRMLS_DC)
+PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options, phpstr *response TSRMLS_DC)
{
zval *zoption;
zend_bool range_req = 0;
/* set options */
if (url) {
- HTTP_CURL_OPT(URL, http_request_data_copy(COPY_STRING, (void *) url));
+ HTTP_CURL_OPT(URL, http_request_data_copy(COPY_STRING, url));
}
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);
/* progress callback */
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, http_curl_callback_data(zoption));
} else {
#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_request_data_copy(COPY_STRING, ""));
- }
+ if ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
+ HTTP_CURL_OPT(ENCODING, "");
+ } else {
+ HTTP_CURL_OPT(ENCODING, 0);
}
/* redirects, defaults to 0 */
/* referer */
if (zoption = http_curl_getopt(options, "referer", IS_STRING)) {
HTTP_CURL_OPT(REFERER, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
+ } else {
+ HTTP_CURL_OPT(REFERER, NULL);
}
/* useragent, default "PECL::HTTP/version (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)));
} else {
- HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")"));
+ HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")");
}
/* additional headers, array('name' => 'value') */
HTTP_CURL_OPT(COOKIE, http_request_data_copy(COPY_STRING, qstr->data));
}
phpstr_free(qstr);
+ } else {
+ HTTP_CURL_OPT(COOKIE, NULL);
+ }
+
+ /* 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);
+ }
+ } else {
+ HTTP_CURL_OPT(COOKIEFILE, NULL);
}
- /* cookiestore */
- if (zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) {
+ /* 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)));
+ } else {
+ HTTP_CURL_OPT(COOKIEFILE, NULL);
+ HTTP_CURL_OPT(COOKIEJAR, NULL);
}
/* resume */
if (zoption = http_curl_getopt(options, "resume", IS_LONG)) {
range_req = 1;
HTTP_CURL_OPT(RESUME_FROM, Z_LVAL_P(zoption));
+ } else {
+ HTTP_CURL_OPT(RESUME_FROM, 0);
}
/* maxfilesize */
if (zoption = http_curl_getopt(options, "maxfilesize", IS_LONG)) {
HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption));
+ } else {
+ HTTP_CURL_OPT(MAXFILESIZE, 0);
}
/* 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));
+ } else {
+ HTTP_CURL_OPT(TIMEVALUE, 0);
}
- /* timeout */
+ /* timeout, defaults to 3 */
if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) {
HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption));
+ } else {
+ HTTP_CURL_OPT(TIMEOUT, 3);
}
- /* connecttimeout, defaults to 1 */
+ /* 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);
+ HTTP_CURL_OPT(CONNECTTIMEOUT, 3);
}
/* ssl */
/* }}} */
/* {{{ 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)
+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)
{
STATUS status;
zend_bool clean_curl;
}
/* }}} */
-#ifdef ZEND_ENGINE_2
-/* {{{ 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 HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Initializing request pool\n");
-#endif
- 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);
-#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Initialized request pool %p\n", pool);
-#endif
- 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 HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Attaching request %p to pool %p\n", req, pool);
-#endif
- if (req->pool) {
- 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)) {
- http_error_ex(E_WARNING, HTTP_E_CURL, "Could not initialize HttpRequest object for attaching to the HttpRequestPool");
- } else {
- code = curl_multi_add_handle(pool->ch, req->ch);
- if ((CURLM_OK != code) && (CURLM_CALL_MULTI_PERFORM != code)) {
- http_error_ex(E_WARNING, HTTP_E_CURL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code));
- } else {
- req->pool = pool;
- zval_add_ref(&request);
- zend_llist_add_element(&pool->handles, &request);
- zend_llist_add_element(&pool->bodies, &body);
- return SUCCESS;
- }
- }
- efree(body);
- }
- 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 HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Detaching request %p (pool: %p) from pool %p\n", req, req->pool, pool);
-#endif
- if (req->pool != pool) {
- http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to this 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->pool = NULL;
- zval_ptr_dtor(&request);
- return SUCCESS;
- }
- }
- return FAILURE;
-}
-/* }}} */
-
-/* {{{ void http_request_pool_detach_all(http_request_pool *) */
-PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC)
-{
-#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Detaching all requests from pool %p\n", pool);
-#endif
- zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_freehandle, pool TSRMLS_CC);
-}
-
-
-/* {{{ STATUS http_request_pool_send(http_request_pool *) */
-PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
-{
-#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Attempt to send requests of pool %p\n", pool);
-#endif
- while (http_request_pool_perform(pool)) {
-#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "%d unfinished requests of pool %p remaining\n", pool->unfinished, pool);
-#endif
- if (SUCCESS != http_request_pool_select(pool)) {
- http_error(E_WARNING, HTTP_E_CURL, "Socket error");
- return FAILURE;
- }
- }
- zend_llist_apply(&pool->handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC);
- return SUCCESS;
-}
-/* }}} */
-
-/* {{{ void http_request_pool_dtor(http_request_pool *) */
-PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC)
-{
-#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Destructing request pool %p\n", pool);
-#endif
- pool->unfinished = 0;
- zend_llist_clean(&pool->handles);
- zend_llist_clean(&pool->bodies);
- curl_multi_cleanup(pool->ch);
-}
-/* }}} */
-
-/* {{{ STATUS http_request_pool_select(http_request_pool *) */
-PHP_HTTP_API 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;
-}
-/* }}} */
-
-/* {{{ int http_request_pool_perform(http_request_pool *) */
-PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool)
-{
- while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished));
- return pool->unfinished;
-}
-/* }}} */
-
-/* {{{ void http_request_pool_responsehandler(zval **) */
-void _http_request_pool_responsehandler(zval **req TSRMLS_DC)
-{
- getObjectEx(http_request_object, obj, *req);
-#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Fetching data from request %p of pool %p\n", obj, obj->pool);
-#endif
- http_request_object_responsehandler(obj, *req);
-}
-/* }}} */
-
-/*#*/
-
-/* {{{ static void http_request_pool_freebody(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_freehandle(zval **, http_request_pool *) */
-static void http_request_pool_freehandle(zval **request, http_request_pool *pool TSRMLS_DC)
-{
- getObjectEx(http_request_object, req, *request);
- if (req->pool) {
- http_request_pool_detach(pool, *request);
- }
-#if HTTP_DEBUG_REQPOOLS
- else fprintf(stderr, "Request %p (pool: %p) is not (anymore) attached to pool %p\n", req, req->pool, pool);
-#endif
-}
-/* }}} */
-#endif /* ZEND_ENGINE_2 */
/* {{{ char *http_request_methods[] */
static const char *const http_request_methods[] = {
/* {{{ 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_CURL_CALLBACK_DATA(s, http_request_body *, body);
if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) {
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);
}
/* }}} */
+/* {{{ static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void *) */
static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string, size_t length, void *data)
{
zval *params_pass[2], params_local[2], retval;
params_pass[0] = ¶ms_local[0];
params_pass[1] = ¶ms_local[1];
+ INIT_PZVAL(&retval);
+ INIT_PZVAL(params_pass[0]);
+ INIT_PZVAL(params_pass[1]);
ZVAL_LONG(params_pass[0], type);
- ZVAL_STRINGL(params_pass[1], string, length, 1);
+ ZVAL_STRINGL(params_pass[1], string, length, 0);
- call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC);
+#ifdef ZEND_ENGINE_2
+ /* ensure we can call private HttpRequest::debugWrapper() */
+ {
+ void *sc = EG(scope);
+ EG(scope) = http_request_object_ce;
+#endif
+ call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC);
+#ifdef ZEND_ENGINE_2
+ EG(scope) = sc;
+ }
+#endif
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)
{
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;
}
projects / m6w6 / ext-http / blobdiff