X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_message_api.c;h=0b5908ecab8d5ea4598241fe440ad62929457af5;hb=1052c4986a794b051dc48ba4118dbd6fd8f83c49;hp=27f3d78228273ec502f2297387f60513e464043e;hpb=d5930114b227ce9c9ce71d3930291f333750c192;p=m6w6%2Fext-http

diff --git a/http_message_api.c b/http_message_api.c
index 27f3d78..0b5908e 100644
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -108,19 +108,20 @@ PHP_HTTP_API void _http_message_set_info(http_message *message, http_info *info)
 {
 	message->http.version = info->http.version;
 	
-	switch (info->type)
+	switch (message->type = 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;
+		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;
+		break;
+		
+		default:
+		break;
 	}
 }
 
@@ -490,7 +491,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 					parts.host = estrndup(Z_STRVAL_PP(zhost), Z_STRLEN_PP(zhost));
 				}
 				
-				http_build_url(url, &parts, NULL, &uri, NULL);
+				http_build_url(HTTP_URL_REPLACE, url, &parts, NULL, &uri, NULL);
 				php_url_free(url);
 				efree(parts.host);
 			} else {