X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_message_api.c;h=01aa0e316110c56f47b403538ffdbb91fb4fe925;hb=4546a3572ba7944441f49136fec96c4afd490396;hp=5a2302b5205f890cebdbc212e0517b40c3737a73;hpb=7fef44c902c86eebce30f36003a27905fbaeba65;p=m6w6%2Fext-http

diff --git a/http_message_api.c b/http_message_api.c
index 5a2302b..01aa0e3 100644
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -131,6 +131,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 	zend_bool free_msg = msg ? 0 : 1;
 
 	if ((!message) || (message_length < HTTP_MSG_MIN_SIZE)) {
+		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Empty or too short HTTP message: '%s'", message);
 		return NULL;
 	}
 
@@ -140,9 +141,10 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 		if (free_msg) {
 			http_message_free(&msg);
 		}
+		http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse message headers");
 		return NULL;
 	}
-
+	
 	/* header parsing stops at (CR)LF (CR)LF */
 	if ((body = http_locate_body(message))) {
 		zval *c;
@@ -526,7 +528,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 				uri = http_absolute_uri(message->http.info.request.URI);
 			}
 
-			if (request.meth = http_request_method_exists(1, 0, message->http.info.request.method)) {
+			if ((request.meth = http_request_method_exists(1, 0, message->http.info.request.method))) {
 				http_request_body body = {HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message)};
 				
 				http_request_init_ex(&request, NULL, request.meth, uri);
@@ -534,6 +536,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 				if (SUCCESS == (rs = http_request_prepare(&request, NULL))) {
 					http_request_exec(&request);
 				}
+				request.body = NULL;
 				http_request_dtor(&request);
 			} else {
 				http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD,