From a283ae769f481518a2be9da17c718b3d7a6ea24b Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 30 Nov 2007 02:27:10 +0000 Subject: new opaque type for message headers. Currently still a GHashTable * libsoup/soup-message-headers.c: new opaque type for message headers. Currently still a GHashTable underneath, for backward-compatibility, but that will change in the future. * libsoup/soup-message.c: Use SoupMessageHeaders. Deprecate the old header methods * ...: use SoupMessageHeaders * python/libsoup.defs: update for SoupMessageHeaders, add fields to SoupMessage svn path=/branches/libsoup-bindings/; revision=967 --- libsoup/soup-message-server-io.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'libsoup/soup-message-server-io.c') diff --git a/libsoup/soup-message-server-io.c b/libsoup/soup-message-server-io.c index 44373e4f..45881782 100644 --- a/libsoup/soup-message-server-io.c +++ b/libsoup/soup-message-server-io.c @@ -43,7 +43,7 @@ parse_request_headers (SoupMessage *msg, char *headers, guint headers_len, NULL); g_free (req_method); - expect = soup_message_get_header (msg->request_headers, "Expect"); + expect = soup_message_headers_find (msg->request_headers, "Expect"); if (expect && !strcmp (expect, "100-continue")) priv->msg_flags |= SOUP_MESSAGE_EXPECT_CONTINUE; @@ -53,7 +53,7 @@ parse_request_headers (SoupMessage *msg, char *headers, guint headers_len, *encoding = SOUP_TRANSFER_CONTENT_LENGTH; *content_len = 0; } else if (*encoding == SOUP_TRANSFER_UNKNOWN) { - if (soup_message_get_header (msg->request_headers, "Transfer-Encoding")) + if (soup_message_headers_find (msg->request_headers, "Transfer-Encoding")) return SOUP_STATUS_NOT_IMPLEMENTED; else return SOUP_STATUS_BAD_REQUEST; @@ -61,7 +61,7 @@ parse_request_headers (SoupMessage *msg, char *headers, guint headers_len, /* Generate correct context for request */ server = soup_server_message_get_server (SOUP_SERVER_MESSAGE (msg)); - req_host = soup_message_get_header (msg->request_headers, "Host"); + req_host = soup_message_headers_find (msg->request_headers, "Host"); if (*req_path != '/') { /* Check for absolute URI */ @@ -107,10 +107,9 @@ parse_request_headers (SoupMessage *msg, char *headers, guint headers_len, } static void -write_header (gpointer name, gpointer value, gpointer headers) +write_header (const char *name, const char *value, gpointer headers) { - g_string_append_printf (headers, "%s: %s\r\n", - (char *)name, (char *)value); + g_string_append_printf (headers, "%s: %s\r\n", name, value); } static void @@ -124,14 +123,14 @@ get_response_headers (SoupMessage *msg, GString *headers, g_string_append_printf (headers, "HTTP/1.1 %d %s\r\n", msg->status_code, msg->reason_phrase); - soup_message_foreach_header (msg->response_headers, - write_header, headers); + soup_message_headers_foreach (msg->response_headers, + write_header, headers); *encoding = soup_message_get_response_encoding (msg, NULL); claimed_encoding = soup_server_message_get_encoding (smsg); if (claimed_encoding == SOUP_TRANSFER_CONTENT_LENGTH && - !soup_message_get_header (msg->response_headers, "Content-Length")) { + !soup_message_headers_find (msg->response_headers, "Content-Length")) { g_string_append_printf (headers, "Content-Length: %d\r\n", msg->response.length); } else if (claimed_encoding == SOUP_TRANSFER_CHUNKED) -- cgit v1.2.1