From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 6 Jan 2006 21:23:02 +0000 (+0000)
Subject: Added "protocol" option that allows changing of the HTTP protocol used for
X-Git-Tag: RELEASE_1_0_4~20
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=08bec19979c75a45978c7c7a7c6d7926a9d5322e;p=m6w6%2Fext-http

Added "protocol" option that allows changing of the HTTP protocol used for
requests.
Do not try to send POST request components when making an OPTIONS request.
---

diff --git a/http_request_api.c b/http_request_api.c
index 605b6be..00f4b9d 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -358,6 +358,7 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(IOCTLDATA, NULL);
 		HTTP_CURL_OPT(READDATA, NULL);
 		HTTP_CURL_OPT(INFILESIZE, 0);
+		HTTP_CURL_OPT(HTTP_VERSION, CURL_HTTP_VERSION_NONE);
 	}
 }
 /* }}} */
@@ -534,6 +535,11 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption));
 	}
 
+	/* http protocol */
+	if ((zoption = http_request_option(request, options, "protocol", IS_LONG))) {
+		HTTP_CURL_OPT(HTTP_VERSION, Z_LVAL_P(zoption));
+	}
+
 	/* lastmodified */
 	if ((zoption = http_request_option(request, options, "lastmodified", IS_LONG))) {
 		if (Z_LVAL_P(zoption)) {
@@ -623,7 +629,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	}
 
 	/* attach request body */
-	if (request->body && (request->meth != HTTP_GET) && (request->meth != HTTP_HEAD)) {
+	if (request->body && (request->meth != HTTP_GET) && (request->meth != HTTP_HEAD) && (request->meth != HTTP_OPTIONS)) {
 		switch (request->body->type)
 		{
 			case HTTP_REQUEST_BODY_CSTRING:
diff --git a/http_request_object.c b/http_request_object.c
index 7eb00d4..5e233ad 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -403,6 +403,11 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D)
 	/* WebDAV Access Control - RFC 3744 */
 	DCL_CONST(long, "METH_ACL", HTTP_ACL);
 
+	/* cURL HTTP protocol versions */
+	DCL_CONST(long, "VERSION_1_0", CURL_HTTP_VERSION_1_0);
+	DCL_CONST(long, "VERSION_1_1", CURL_HTTP_VERSION_1_1);
+	DCL_CONST(long, "VERSION_NONE", CURL_HTTP_VERSION_NONE);
+
 	/*
 	 * Auth Constants
 	 */