X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_api.c;h=36b3098737ce0e672137d881b8214bc74d1bd115;hp=e4ded1e799ca0204817826e47401436508d52e83;hb=39feb7a7e30bb4b393a6f76aa2f35d4e9275523e;hpb=3f8d6ea256f520d439cebc37c46bb93c30b2660e

diff --git a/http_message_api.c b/http_message_api.c
index e4ded1e..36b3098 100644
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -31,61 +31,53 @@
 
 #include "phpstr/phpstr.h"
 
-#define http_message_headers_cb _http_message_headers_cb
-static void _http_message_headers_cb(const char *http_line, HashTable **headers, void **message TSRMLS_DC)
-{
-	size_t line_length;
-	char *crlf = NULL;
-	http_message *new, *old = (http_message *) *message;
-
-	if (crlf = strstr(http_line, HTTP_CRLF)) {
-		line_length = crlf - http_line;
-	} else {
-		line_length = strlen(http_line);
-	}
+ZEND_EXTERN_MODULE_GLOBALS(http);
 
+#define http_message_info_callback _http_message_info_callback
+static void _http_message_info_callback(http_message **message, HashTable **headers, http_info *info TSRMLS_DC)
+{
+	http_message *old = *message;
+	
+	/* advance message */
 	if (old->type || zend_hash_num_elements(&old->hdrs) || PHPSTR_LEN(old)) {
-		new = http_message_new();
-
-		new->parent = old;
-		*message = new;
-		*headers = &new->hdrs;
-	} else {
-		new = old;
+		(*message) = http_message_new();
+		(*message)->parent = old;
+		(*headers) = &((*message)->hdrs);
 	}
-
-	while (isspace(http_line[line_length-1])) --line_length;
-
-	// response
-	if (!strncmp(http_line, "HTTP/1.", lenof("HTTP/1."))) {
-		new->type = HTTP_MSG_RESPONSE;
-		new->info.response.http_version = atof(http_line + lenof("HTTP/"));
-		new->info.response.code = atoi(http_line + lenof("HTTP/1.1 "));
-	} else
-	// request
-	if (!strncmp(http_line + line_length - lenof("HTTP/1.1"), "HTTP/1.", lenof("HTTP/1."))) {
-		const char *method_sep_uri = strchr(http_line, ' ');
-		new->type = HTTP_MSG_REQUEST;
-		new->info.request.http_version = atof(http_line + line_length - lenof("1.1"));
-		new->info.request.method = estrndup(http_line, method_sep_uri - http_line);
-		new->info.request.URI = estrndup(method_sep_uri + 1, http_line + line_length - method_sep_uri - 1 - lenof(" HTTP/1.1"));
+	
+	(*message)->http.version = info->http.version;
+	
+	switch (info->type)
+	{
+		case IS_HTTP_REQUEST:
+			(*message)->type = HTTP_MSG_REQUEST;
+			HTTP_INFO(*message).request.URI = estrdup(HTTP_INFO(info).request.URI);
+			HTTP_INFO(*message).request.method = estrdup(HTTP_INFO(info).request.method);
+		break;
+		
+		case IS_HTTP_RESPONSE:
+			(*message)->type = HTTP_MSG_RESPONSE;
+			HTTP_INFO(*message).response.code = HTTP_INFO(info).response.code;
+			HTTP_INFO(*message).response.status = estrdup(HTTP_INFO(info).response.status);
+		break;
 	}
 }
 
 #define http_message_init_type _http_message_init_type
 static inline void _http_message_init_type(http_message *message, http_message_type type)
 {
+	message->http.version = .0;
+	
 	switch (message->type = type)
 	{
 		case HTTP_MSG_RESPONSE:
-			message->info.response.http_version = .0;
-			message->info.response.code = 0;
+			message->http.info.response.code = 0;
+			message->http.info.response.status = NULL;
 		break;
 
 		case HTTP_MSG_REQUEST:
-			message->info.request.http_version = .0;
-			message->info.request.method = NULL;
-			message->info.request.URI = NULL;
+			message->http.info.request.method = NULL;
+			message->http.info.request.URI = NULL;
 		break;
 
 		case HTTP_MSG_NONE:
@@ -115,13 +107,19 @@ PHP_HTTP_API void _http_message_set_type(http_message *message, http_message_typ
 	if (type != message->type) {
 
 		/* free request info */
-		if (message->type == HTTP_MSG_REQUEST) {
-			if (message->info.request.method) {
-				efree(message->info.request.method);
-			}
-			if (message->info.request.URI) {
-				efree(message->info.request.URI);
-			}
+		switch (message->type)
+		{
+			case HTTP_MSG_REQUEST:
+				STR_FREE(message->http.info.request.method);
+				STR_FREE(message->http.info.request.URI);
+			break;
+			
+			case HTTP_MSG_RESPONSE:
+				STR_FREE(message->http.info.response.status);
+			break;
+			
+			default:
+			break;
 		}
 
 		/* init */
@@ -131,40 +129,27 @@ PHP_HTTP_API void _http_message_set_type(http_message *message, http_message_typ
 
 PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t message_length TSRMLS_DC)
 {
-	char *body = NULL;
+	const char *body = NULL;
 	zend_bool free_msg = msg ? 0 : 1;
 
-	if (message_length < HTTP_MSG_MIN_SIZE) {
-		return NULL;
-	}
-
-	if (!message) {
+	if ((!message) || (message_length < HTTP_MSG_MIN_SIZE)) {
 		return NULL;
 	}
 
 	msg = http_message_init(msg);
 
-	if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, http_message_headers_cb, (void **) &msg)) {
+	if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, (void **) &msg)) {
 		if (free_msg) {
-			http_message_free(msg);
+			http_message_free(&msg);
 		}
 		return NULL;
 	}
 
-	/* header parsing stops at CRLF CRLF */
-	if (body = strstr(message, HTTP_CRLF HTTP_CRLF)) {
+	/* header parsing stops at (CR)LF (CR)LF */
+	if (body = http_locate_body(message)) {
 		zval *c;
 		const char *continue_at = NULL;
 
-		body += lenof(HTTP_CRLF HTTP_CRLF);
-
-		/* message has content-length header */
-		if (c = http_message_header(msg, "Content-Length")) {
-			long len = atol(Z_STRVAL_P(c));
-			phpstr_from_string_ex(PHPSTR(msg), body, len);
-			continue_at = body + len;
-		} else
-
 		/* message has chunked transfer encoding */
 		if (c = http_message_header(msg, "Transfer-Encoding")) {
 			if (!strcasecmp("chunked", Z_STRVAL_P(c))) {
@@ -190,6 +175,13 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 			}
 		} else
 
+		/* message has content-length header */
+		if (c = http_message_header(msg, "Content-Length")) {
+			long len = atol(Z_STRVAL_P(c));
+			phpstr_from_string_ex(PHPSTR(msg), body, len);
+			continue_at = body + len;
+		} else
+
 		/* message has content-range header */
 		if (c = http_message_header(msg, "Content-Range")) {
 			ulong start = 0, end = 0;
@@ -240,15 +232,17 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_
 	{
 		case HTTP_MSG_REQUEST:
 			phpstr_appendf(&str, "%s %s HTTP/%1.1f" HTTP_CRLF,
-				msg->info.request.method,
-				msg->info.request.URI,
-				msg->info.request.http_version);
+				msg->http.info.request.method,
+				msg->http.info.request.URI,
+				msg->http.version);
 		break;
 
 		case HTTP_MSG_RESPONSE:
-			phpstr_appendf(&str, "HTTP/%1.1f %d" HTTP_CRLF,
-				msg->info.response.http_version,
-				msg->info.response.code);
+			phpstr_appendf(&str, "HTTP/%1.1f %d%s%s" HTTP_CRLF,
+				msg->http.version,
+				msg->http.info.response.code,
+				*msg->http.info.response.status ? " ":"",
+				msg->http.info.response.status);
 		break;
 
 		case HTTP_MSG_NONE:
@@ -313,6 +307,52 @@ PHP_HTTP_API void _http_message_serialize(http_message *message, char **string,
 	phpstr_dtor(&str);
 }
 
+PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj TSRMLS_DC)
+{
+	zval strct;
+	zval *headers;
+	
+	INIT_ZARR(strct, HASH_OF(obj));
+	
+	add_assoc_long(&strct, "type", msg->type);
+	add_assoc_double(&strct, "httpVersion", msg->http.version);
+	switch (msg->type)
+	{
+		case HTTP_MSG_RESPONSE:
+			add_assoc_long(&strct, "responseCode", msg->http.info.response.code);
+			add_assoc_string(&strct, "responseStatus", msg->http.info.response.status, 1);
+		break;
+		
+		case HTTP_MSG_REQUEST:
+			add_assoc_string(&strct, "requestMethod", msg->http.info.request.method, 1);
+			add_assoc_string(&strct, "requestUri", msg->http.info.request.URI, 1);
+		break;
+	}
+	
+	MAKE_STD_ZVAL(headers);
+	array_init(headers);
+	zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+	add_assoc_zval(&strct, "headers", headers);
+	
+	add_assoc_stringl(&strct, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg), 1);
+	
+	if (msg->parent) {
+		zval *parent;
+		
+		MAKE_STD_ZVAL(parent);
+		if (Z_TYPE_P(obj) == IS_ARRAY) {
+			array_init(parent);
+		} else {
+			object_init(parent);
+		}
+		add_assoc_zval(&strct, "parentMessage", parent);
+		http_message_tostruct_recursive(msg->parent, parent);
+		zval_ptr_dtor(&parent);
+	} else {
+		add_assoc_null(&strct, "parentMessage");
+	}
+}
+
 PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 {
 	STATUS rs = FAILURE;
@@ -327,14 +367,21 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 
 			FOREACH_HASH_KEYVAL(&message->hdrs, key, idx, val) {
 				if (key) {
-					char *header;
-					spprintf(&header, 0, "%s: %s", key, Z_STRVAL_PP(val));
-					http_send_header(header);
-					efree(header);
+					if (Z_TYPE_PP(val) == IS_ARRAY) {
+						zend_bool first = 1;
+						zval **data;
+						
+						FOREACH_VAL(*val, data) {
+							http_send_header_ex(key, strlen(key), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL);
+							first = 0;
+						}
+					} else {
+						http_send_header_ex(key, strlen(key), Z_STRVAL_PP(val), Z_STRLEN_PP(val), 1, NULL);
+					}
 					key = NULL;
 				}
 			}
-			rs =	SUCCESS == http_send_status(message->info.response.code) &&
+			rs =	SUCCESS == http_send_status(message->http.info.response.code) &&
 					SUCCESS == http_send_data(PHPSTR_VAL(message), PHPSTR_LEN(message)) ?
 					SUCCESS : FAILURE;
 		}
@@ -346,6 +393,8 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 			char *uri = NULL;
 			zval **zhost, options, headers;
 
+			INIT_PZVAL(&options);
+			INIT_PZVAL(&headers);
 			array_init(&options);
 			array_init(&headers);
 			zend_hash_copy(Z_ARRVAL(headers), &message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
@@ -365,38 +414,38 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 					host = estrndup(Z_STRVAL_PP(zhost), host_len = Z_STRLEN_PP(zhost));
 				}
 				uri = http_absolute_uri_ex(
-					message->info.request.URI, strlen(message->info.request.URI),
+					message->http.info.request.URI, strlen(message->http.info.request.URI),
 					NULL, 0, host, host_len, port);
 				efree(host);
 			} else {
-				uri = http_absolute_uri(message->info.request.URI);
+				uri = http_absolute_uri(message->http.info.request.URI);
 			}
 
-			if (!strcasecmp("POST", message->info.request.method)) {
+			if (!strcasecmp("POST", message->http.info.request.method)) {
 				http_request_body body = {HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message)};
 				rs = http_post(uri, &body, Z_ARRVAL(options), NULL, NULL);
 			} else
-			if (!strcasecmp("GET", message->info.request.method)) {
+			if (!strcasecmp("GET", message->http.info.request.method)) {
 				rs = http_get(uri, Z_ARRVAL(options), NULL, NULL);
 			} else
-			if (!strcasecmp("HEAD", message->info.request.method)) {
+			if (!strcasecmp("HEAD", message->http.info.request.method)) {
 				rs = http_head(uri, Z_ARRVAL(options), NULL, NULL);
 			} else {
-				http_error_ex(E_WARNING, HTTP_E_MSG,
+				http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD,
 					"Cannot send HttpMessage. Request method %s not supported",
-					message->info.request.method);
+					message->http.info.request.method);
 			}
 
 			efree(uri);
 #else
-			http_error(E_WARNING, HTTP_E_MSG, "HTTP requests not supported - ext/http was not linked against libcurl.");
+			http_error(HE_WARNING, HTTP_E_RUNTIME, "HTTP requests not supported - ext/http was not linked against libcurl.");
 #endif
 		}
 		break;
 
 		case HTTP_MSG_NONE:
 		default:
-			http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is neither of type HTTP_MSG_REQUEST nor HTTP_MSG_RESPONSE");
+			http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is neither of type HTTP_MSG_REQUEST nor HTTP_MSG_RESPONSE");
 		break;
 	}
 
@@ -423,28 +472,33 @@ PHP_HTTP_API void _http_message_dtor(http_message *message)
 	if (message) {
 		zend_hash_destroy(&message->hdrs);
 		phpstr_dtor(PHPSTR(message));
-		if (HTTP_MSG_TYPE(REQUEST, message)) {
-			if (message->info.request.method) {
-				efree(message->info.request.method);
-				message->info.request.method = NULL;
-			}
-			if (message->info.request.URI) {
-				efree(message->info.request.URI);
-				message->info.request.URI = NULL;
-			}
+		
+		switch (message->type)
+		{
+			case HTTP_MSG_REQUEST:
+				STR_SET(message->http.info.request.method, NULL);
+				STR_SET(message->http.info.request.URI, NULL);
+			break;
+			
+			case HTTP_MSG_RESPONSE:
+				STR_SET(message->http.info.response.status, NULL);
+			break;
+			
+			default:
+			break;
 		}
 	}
 }
 
-PHP_HTTP_API void _http_message_free(http_message *message)
+PHP_HTTP_API void _http_message_free(http_message **message)
 {
-	if (message) {
-		if (message->parent) {
-			http_message_free(message->parent);
-			message->parent = NULL;
+	if (*message) {
+		if ((*message)->parent) {
+			http_message_free(&(*message)->parent);
 		}
-		http_message_dtor(message);
-		efree(message);
+		http_message_dtor(*message);
+		efree(*message);
+		*message = NULL;
 	}
 }
 
@@ -456,3 +510,4 @@ PHP_HTTP_API void _http_message_free(http_message *message)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+