- add internal http_message_set_info()

[m6w6/ext-http] / http_message_api.c

diff --git a/http_message_api.c b/http_message_api.c
index 93c4bf1d5cbb1ba027511b45d3f2db12d769b59e..27f3d78228273ec502f2297387f60513e464043e 100644 (file)
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -37,22 +37,7 @@ static void _http_message_info_callback(http_message **message, HashTable **head
                (*headers) = &((*message)->hdrs);
        }
        
-       (*message)->http.version = info->http.version;
-       
-       switch (info->type)
-       {
-               case IS_HTTP_REQUEST:
-                       (*message)->type = HTTP_MSG_REQUEST;
-                       HTTP_INFO(*message).request.url = estrdup(HTTP_INFO(info).request.url);
-                       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;
-       }
+       http_message_set_info(*message, info);
 }
 
 #define http_message_init_type _http_message_init_type
@@ -119,6 +104,26 @@ PHP_HTTP_API void _http_message_set_type(http_message *message, http_message_typ
        }
 }
 
+PHP_HTTP_API void _http_message_set_info(http_message *message, http_info *info)
+{
+       message->http.version = info->http.version;
+       
+       switch (info->type)
+       {
+               case IS_HTTP_REQUEST:
+                       message->type = HTTP_MSG_REQUEST;
+                       HTTP_INFO(message).request.url = estrdup(HTTP_INFO(info).request.url);
+                       STR_SET(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;
+                       STR_SET(HTTP_INFO(message).response.status, estrdup(HTTP_INFO(info).response.status));
+                       break;
+       }
+}
+
 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;