- implement more of those useful allocation relays

[m6w6/ext-http] / http_message_api.c

diff --git a/http_message_api.c b/http_message_api.c
index 6b88cc56f9b6c2b8c5cbf2b6af7125fe1d12580f..cd9a9514655f7107fcc5a0ed5c6fdd355086a04d 100644 (file)
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -84,10 +84,10 @@ static inline void _http_message_init_type(http_message *message, http_message_t
        }
 }
 
-PHP_HTTP_API http_message *_http_message_init_ex(http_message *message, http_message_type type)
+PHP_HTTP_API http_message *_http_message_init_ex(http_message *message, http_message_type type ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
        if (!message) {
-               message = ecalloc(1, sizeof(http_message));
+               message = ecalloc_rel(1, sizeof(http_message));
        }
 
        http_message_init_type(message, type);
@@ -125,12 +125,13 @@ 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)
+PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t message_length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
 {
        const char *body = NULL;
        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;
@@ -164,6 +166,8 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                                MAKE_STD_ZVAL(len);
                                ZVAL_STRINGL(len, tmp, tmp_len, 0);
 
+                               ZVAL_ADDREF(c);
+                               zend_hash_add(&msg->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &c, sizeof(zval *), NULL);
                                zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
                                zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length"));
                                zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
@@ -493,6 +497,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
                {
 #ifdef HTTP_HAVE_CURL
                        char *uri = NULL;
+                       http_request request;
                        zval **zhost, options, headers;
 
                        INIT_PZVAL(&options);
@@ -523,21 +528,20 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
                                uri = http_absolute_uri(message->http.info.request.URI);
                        }
 
-                       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->http.info.request.method)) {
-                               rs = http_get(uri, Z_ARRVAL(options), NULL, NULL);
-                       } else
-                       if (!strcasecmp("HEAD", message->http.info.request.method)) {
-                               rs = http_head(uri, Z_ARRVAL(options), NULL, NULL);
+                       if ((request.meth = http_request_method_exists(1, 0, message->http.info.request.method))) {
+                               http_request_body body;
+                               
+                               http_request_init_ex(&request, NULL, request.meth, uri);
+                               request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message), 0);
+                               if (SUCCESS == (rs = http_request_prepare(&request, NULL))) {
+                                       http_request_exec(&request);
+                               }
+                               http_request_dtor(&request);
                        } else {
                                http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD,
                                        "Cannot send HttpMessage. Request method %s not supported",
                                        message->http.info.request.method);
                        }
-
                        efree(uri);
 #else
                        http_error(HE_WARNING, HTTP_E_RUNTIME, "HTTP requests not supported - ext/http was not linked against libcurl.");