X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=a83cacfa6da3f0666d8890e1fc505414b15f5c19;hp=934bc87f5e58737523c8f4a9d25d4c59a1785c22;hb=6deee2e3d2d6282dd76e3725fe2de6c7833bd57f;hpb=b30c267318b2b1add1a01e783f9dbe561a649a7b

diff --git a/http_request_api.c b/http_request_api.c
index 934bc87..a83cacf 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -18,6 +18,15 @@
 #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"
+
+#include "phpstr/phpstr.h"
 
 #ifdef PHP_WIN32
 #	include <winsock2.h>
@@ -25,25 +34,14 @@
 
 #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
 
-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)
@@ -110,11 +108,6 @@ 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 *);
 
-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); \
@@ -123,10 +116,6 @@ typedef struct {
 #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); }
@@ -164,17 +153,23 @@ void *_http_request_data_copy(int type, void *data TSRMLS_DC)
 	{
 		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;
 		}
-		
+
 		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;
@@ -197,6 +192,13 @@ void _http_request_data_free_slist(void *list)
 }
 /* }}} */
 
+/* {{{ _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)
 {
@@ -316,7 +318,7 @@ PHP_HTTP_API void _http_request_body_free(http_request_body *body TSRMLS_DC)
 /* }}} */
 
 /* {{{ 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;
@@ -328,12 +330,13 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 
 	/* 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);
@@ -347,11 +350,12 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 	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)) {
+		HTTP_CURL_OPT(NOPROGRESS, 0);
 		HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
 		HTTP_CURL_OPT(PROGRESSDATA,  http_curl_callback_data(zoption));
 	} else {
@@ -407,10 +411,10 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 #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 */
@@ -427,13 +431,15 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 	/* 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') */
@@ -486,41 +492,67 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 			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 */
@@ -600,7 +632,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 		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;
 
@@ -609,8 +641,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 			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;
 
@@ -699,12 +730,25 @@ PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info 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, 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)
 {
-	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;
 }
 /* }}} */
 
@@ -798,142 +842,6 @@ PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_
 /* }}} */
 
 
-/* {{{ 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",
@@ -983,43 +891,12 @@ static size_t http_curl_write_callback(char *buf, size_t len, size_t n, void *s)
 /* {{{ 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);
 
-	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);
 }
 /* }}} */
 
@@ -1029,7 +906,7 @@ static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC)
 	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);
 }
 /* }}} */
 
@@ -1044,6 +921,10 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow,
 	params_pass[2] = &params_local[2];
 	params_pass[3] = &params_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);
@@ -1061,8 +942,10 @@ static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string,
 	params_pass[0] = &params_local[0];
 	params_pass[1] = &params_local[1];
 
+	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);