X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=1da4e332b9ff4063b160c4bff23aa9d16d8d39a8;hp=8e7d0b0f3bf9a73443e4362d9cd23ef9a2bdd4ce;hb=890a33b0f67eceab9885db7a2a9f46de0ea961f5;hpb=fa1a275e2b5e1b9dfb5bcbf97b51ef2b568e433c

diff --git a/http_request_api.c b/http_request_api.c
index 8e7d0b0..1da4e33 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -168,7 +168,8 @@ PHP_MSHUTDOWN_FUNCTION(http_request)
 		} \
 	}
 
-#define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt(request->ch, CURLOPT_##OPTION, (p))
+#define HTTP_CURL_OPT(OPTION, p) HTTP_CURL_OPT_EX(request->ch, OPTION, (p))
+#define HTTP_CURL_OPT_EX(ch, OPTION, p) curl_easy_setopt((ch), CURLOPT_##OPTION, (p))
 #define HTTP_CURL_OPT_STRING(keyname, obdc) HTTP_CURL_OPT_STRING_EX(keyname, keyname, obdc)
 #define HTTP_CURL_OPT_SSL_STRING(keyname, obdc) HTTP_CURL_OPT_STRING_EX(keyname, SSL##keyname, obdc)
 #define HTTP_CURL_OPT_SSL_STRING_(keyname,obdc ) HTTP_CURL_OPT_STRING_EX(keyname, SSL_##keyname, obdc)
@@ -209,6 +210,55 @@ static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { r
 static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *);
 /* }}} */
 
+/* {{{ CURL *http_curl_init(http_request *) */
+PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
+{
+	if (ch || (ch = curl_easy_init())) {
+#if defined(ZTS)
+		HTTP_CURL_OPT_EX(ch, NOSIGNAL, 1);
+#endif
+		HTTP_CURL_OPT_EX(ch, HEADER, 0);
+		HTTP_CURL_OPT_EX(ch, FILETIME, 1);
+		HTTP_CURL_OPT_EX(ch, AUTOREFERER, 1);
+		HTTP_CURL_OPT_EX(ch, VERBOSE, 1);
+		HTTP_CURL_OPT_EX(ch, HEADERFUNCTION, NULL);
+		HTTP_CURL_OPT_EX(ch, DEBUGFUNCTION, http_curl_raw_callback);
+		HTTP_CURL_OPT_EX(ch, READFUNCTION, http_curl_read_callback);
+		HTTP_CURL_OPT_EX(ch, IOCTLFUNCTION, http_curl_ioctl_callback);
+		HTTP_CURL_OPT_EX(ch, WRITEFUNCTION, http_curl_dummy_callback);
+		
+		/* set context */
+		if (request) {
+			HTTP_CURL_OPT_EX(ch, PRIVATE, request);
+			HTTP_CURL_OPT_EX(ch, DEBUGDATA, request);
+			HTTP_CURL_OPT_EX(ch, ERRORBUFFER, request->_error);
+			
+			/* attach curl handle */
+			request->ch = ch;
+			/* set defaults (also in http_request_reset()) */
+			http_request_defaults(request);
+		}
+	}
+	
+	return ch;
+}
+/* }}} */
+
+/* {{{ void http_curl_free(CURL **) */
+PHP_HTTP_API void _http_curl_free(CURL **ch)
+{
+	if (*ch) {
+		/* avoid nasty segfaults with already cleaned up callbacks */
+		HTTP_CURL_OPT_EX(*ch, NOPROGRESS, 1);
+		HTTP_CURL_OPT_EX(*ch, PROGRESSFUNCTION, NULL);
+		HTTP_CURL_OPT_EX(*ch, VERBOSE, 0);
+		HTTP_CURL_OPT_EX(*ch, DEBUGFUNCTION, NULL);
+		curl_easy_cleanup(*ch);
+		*ch = NULL;
+	}
+}
+/* }}} */
+
 /* {{{ http_request *http_request_init(http_request *) */
 PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch, http_request_method meth, const char *url ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
 {
@@ -241,16 +291,7 @@ PHP_HTTP_API void _http_request_dtor(http_request *request)
 {
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
-	if (request->ch) {
-		/* avoid nasty segfaults with already cleaned up callbacks */
-		HTTP_CURL_OPT(NOPROGRESS, 1);
-		HTTP_CURL_OPT(PROGRESSFUNCTION, NULL);
-		HTTP_CURL_OPT(VERBOSE, 0);
-		HTTP_CURL_OPT(DEBUGFUNCTION, NULL);
-		curl_easy_cleanup(request->ch);
-		request->ch = NULL;
-	}
-	
+	http_curl_free(&request->ch);
 	http_request_reset(request);
 	
 	phpstr_dtor(&request->_cache.cookies);
@@ -288,6 +329,10 @@ PHP_HTTP_API void _http_request_reset(http_request *request)
 	phpstr_dtor(&request->conv.request);
 	phpstr_dtor(&request->conv.response);
 	http_request_body_dtor(request->body);
+	
+	if (request->ch) {
+		http_request_defaults(request);
+	}
 }
 /* }}} */
 
@@ -295,23 +340,6 @@ PHP_HTTP_API void _http_request_reset(http_request *request)
 PHP_HTTP_API void _http_request_defaults(http_request *request)
 {
 	if (request->ch) {
-#ifdef HAVE_CURL_EASY_RESET
-		curl_easy_reset(request->ch);
-#endif
-#if defined(ZTS)
-		HTTP_CURL_OPT(NOSIGNAL, 1);
-#endif
-		HTTP_CURL_OPT(PRIVATE, request);
-		HTTP_CURL_OPT(ERRORBUFFER, request->_error);
-		HTTP_CURL_OPT(HEADER, 0);
-		HTTP_CURL_OPT(FILETIME, 1);
-		HTTP_CURL_OPT(AUTOREFERER, 1);
-		HTTP_CURL_OPT(VERBOSE, 1);
-		HTTP_CURL_OPT(HEADERFUNCTION, NULL);
-		HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_raw_callback);
-		HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback);
-		HTTP_CURL_OPT(IOCTLFUNCTION, http_curl_ioctl_callback);
-		HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback);
 		HTTP_CURL_OPT(PROGRESSFUNCTION, NULL);
 		HTTP_CURL_OPT(URL, NULL);
 		HTTP_CURL_OPT(NOPROGRESS, 1);
@@ -363,6 +391,7 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(READDATA, NULL);
 		HTTP_CURL_OPT(INFILESIZE, 0);
 		HTTP_CURL_OPT(HTTP_VERSION, CURL_HTTP_VERSION_NONE);
+		HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
 	}
 }
 /* }}} */
@@ -394,12 +423,9 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
-	HTTP_CHECK_CURL_INIT(request->ch, curl_easy_init(), return FAILURE);
-	
-	http_request_defaults(request);
+	HTTP_CHECK_CURL_INIT(request->ch, http_curl_init(request), return FAILURE);
 	
 	/* set options */
-	HTTP_CURL_OPT(DEBUGDATA, request);
 	HTTP_CURL_OPT(URL, request->url);
 
 	/* progress callback */
@@ -460,8 +486,13 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	}
 
 	/* useragent, default "PECL::HTTP/version (PHP/version)" */
-	if ((zoption = http_request_option(request, options, "useragent", IS_STRING)) && Z_STRLEN_P(zoption)) {
-		HTTP_CURL_OPT(USERAGENT, Z_STRVAL_P(zoption));
+	if ((zoption = http_request_option(request, options, "useragent", IS_STRING))) {
+		/* allow to send no user agent, not even default one */
+		if (Z_STRLEN_P(zoption)) {
+			HTTP_CURL_OPT(USERAGENT, Z_STRVAL_P(zoption));
+		} else {
+			HTTP_CURL_OPT(USERAGENT, NULL);
+		}
 	}
 
 	/* additional headers, array('name' => 'value') */
@@ -612,22 +643,42 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	switch (request->meth)
 	{
 		case HTTP_GET:
+			HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
+			HTTP_CURL_OPT(NOBODY, 0);
+			HTTP_CURL_OPT(POST, 0);
+			HTTP_CURL_OPT(UPLOAD, 0);
 			HTTP_CURL_OPT(HTTPGET, 1);
 		break;
 
 		case HTTP_HEAD:
+			HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
+			HTTP_CURL_OPT(POST, 0);
+			HTTP_CURL_OPT(UPLOAD, 0);
+			HTTP_CURL_OPT(HTTPGET, 0);
 			HTTP_CURL_OPT(NOBODY, 1);
 		break;
 
 		case HTTP_POST:
+			HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
+			HTTP_CURL_OPT(UPLOAD, 0);
+			HTTP_CURL_OPT(HTTPGET, 0);
+			HTTP_CURL_OPT(NOBODY, 0);
 			HTTP_CURL_OPT(POST, 1);
 		break;
 
 		case HTTP_PUT:
+			HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
+			HTTP_CURL_OPT(HTTPGET, 0);
+			HTTP_CURL_OPT(NOBODY, 0);
+			HTTP_CURL_OPT(POST, 0);
 			HTTP_CURL_OPT(UPLOAD, 1);
 		break;
 
 		default:
+			HTTP_CURL_OPT(HTTPGET, 0);
+			HTTP_CURL_OPT(NOBODY, 0);
+			HTTP_CURL_OPT(POST, 0);
+			HTTP_CURL_OPT(UPLOAD, 0);
 			if (http_request_method_exists(0, request->meth, NULL)) {
 				HTTP_CURL_OPT(CUSTOMREQUEST, http_request_method_name(request->meth));
 			} else {
@@ -641,6 +692,10 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	if (request->body && (request->meth != HTTP_GET) && (request->meth != HTTP_HEAD) && (request->meth != HTTP_OPTIONS)) {
 		switch (request->body->type)
 		{
+			case HTTP_REQUEST_BODY_EMPTY:
+				/* nothing */
+			break;
+			
 			case HTTP_REQUEST_BODY_CSTRING:
 				HTTP_CURL_OPT(POSTFIELDS, request->body->data);
 				HTTP_CURL_OPT(POSTFIELDSIZE, request->body->size);