X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=5bb5b6580ad203939f80d56d1a34fcdeb75987e9;hp=13a14e4e3b1cffff310b60ac37eef81b9cc20cee;hb=e00740ccbf98e53bc1aa4aad31fa76560a32bfa4;hpb=3f8d6ea256f520d439cebc37c46bb93c30b2660e

diff --git a/http_request_api.c b/http_request_api.c
index 13a14e4..5bb5b65 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -20,6 +20,8 @@
 #endif
 #include "php.h"
 
+#ifdef HTTP_HAVE_CURL
+
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
@@ -39,10 +41,6 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-#ifndef HTTP_CURL_USE_ZEND_MM
-#	define HTTP_CURL_USE_ZEND_MM 0
-#endif
-
 #if LIBCURL_VERSION_NUM < 0x070c00
 #	define curl_easy_strerror(code) HTTP_G(request).error
 #endif
@@ -101,12 +99,6 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 		continue; \
 	}
 
-typedef struct _http_curl_conv {
-	phpstr *response;
-	phpstr *request;
-	curl_infotype last_info;
-} http_curl_conv;
-
 static const char *const http_request_methods[HTTP_MAX_REQUEST_METHOD + 1];
 #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)
@@ -125,35 +117,6 @@ static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { r
 static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC);
 
 
-#if HTTP_CURL_USE_ZEND_MM
-static void http_curl_free(void *p)					{ efree(p); }
-static char *http_curl_strdup(const char *p)		{ return estrdup(p); }
-static void *http_curl_malloc(size_t s)				{ return emalloc(s); }
-static void *http_curl_realloc(void *p, size_t s)	{ return erealloc(p, s); }
-static void *http_curl_calloc(size_t n, size_t s)	{ return ecalloc(n, s); }
-#endif
-
-/* {{{ STATUS http_request_global_init() */
-STATUS _http_request_global_init(void)
-{
-#if HTTP_CURL_USE_ZEND_MM
-	if (CURLE_OK != curl_global_init_mem(CURL_GLOBAL_ALL,
-			http_curl_malloc,
-			http_curl_free,
-			http_curl_realloc,
-			http_curl_strdup,
-			http_curl_calloc)) {
-		return FAILURE;
-	}
-#else
-	if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
-		return FAILURE;
-	}
-#endif
-	return SUCCESS;
-}
-/* }}} */
-
 /* {{{ void *http_request_data_copy(int, void *) */
 void *_http_request_data_copy(int type, void *data TSRMLS_DC)
 {
@@ -178,6 +141,12 @@ void *_http_request_data_copy(int type, void *data TSRMLS_DC)
 			return data;
 		}
 
+		case COPY_CONV:
+		{
+			zend_llist_add_element(&HTTP_G(request).copies.convs, &data);
+			return data;
+		}
+
 		default:
 		{
 			return data;
@@ -207,6 +176,13 @@ void _http_request_data_free_context(void *context)
 }
 /* }}} */
 
+/* {{{ _http_request_data_free_conv(http_curl_conv **) */
+void _http_request_data_free_conv(void *conv)
+{
+	efree(*((http_curl_conv **) conv));
+}
+/* }}} */
+
 /* {{{ http_request_body *http_request_body_new() */
 PHP_HTTP_API http_request_body *_http_request_body_new(TSRMLS_D)
 {
@@ -236,7 +212,7 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 					CURLFORM_END
 				);
 				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;
 				}
@@ -260,12 +236,12 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 					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");
+				http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
 			}
 		}
 
@@ -278,7 +254,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;
 		}
 
@@ -618,7 +594,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 			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);
+				http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unsupported request method: %d", meth);
 				return FAILURE;
 			}
 		break;
@@ -643,7 +619,8 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 			break;
 
 			default:
-				http_error_ex(E_WARNING, HTTP_E_CURL, "Unknown request body type: %d", body->type);
+				/* shouldn't ever happen */
+				http_error_ex(HE_ERROR, 0, "Unknown request body type: %d", body->type);
 				return FAILURE;
 			break;
 		}
@@ -653,17 +630,27 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 }
 /* }}} */
 
+/* {{{ void http_request_conv(CURL *, phpstr *, phpstr *) */
+void _http_request_conv(CURL *ch, phpstr* response, phpstr *request TSRMLS_DC)
+{
+	http_curl_conv *conv = emalloc(sizeof(http_curl_conv));
+	conv->response = response;
+	conv->request = request;
+	conv->last_info = -1;
+	HTTP_CURL_OPT(DEBUGDATA, http_curl_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_curl_conv conv = {response, request, -1};
 
-	HTTP_CURL_OPT(DEBUGDATA, http_curl_callback_data(&conv));
+	http_request_conv(ch, response, request);
 
 	/* perform request */
 	if (CURLE_OK != (result = curl_easy_perform(ch))) {
-		http_error_ex(E_WARNING, HTTP_E_CURL, "Could not perform request: %s", curl_easy_strerror(result));
+		http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not perform request: %s", curl_easy_strerror(result));
 		return FAILURE;
 	} else {
 		/* get curl info */
@@ -737,7 +724,7 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *u
 
 	if ((clean_curl = (!ch))) {
 		if (!(ch = curl_easy_init())) {
-			http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl.");
+			http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initialize curl.");
 			return FAILURE;
 		}
 	}
@@ -823,7 +810,7 @@ PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_
 	char *http_method;
 
 	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);
+		http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Request method with id %lu does not exist", method);
 		return FAILURE;
 	}
 
@@ -831,7 +818,7 @@ PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_
 
 	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);
+		http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Could not unregister request method: %s", http_method);
 		efree(http_method);
 		return FAILURE;
 	}
@@ -987,6 +974,8 @@ static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t k
 }
 /* }}} */
 
+#endif
+
 /*
  * Local variables:
  * tab-width: 4