Impl. Use instead of custom header free funcs throughout.

2001-10-05  Alex Graveley  <alex@ximian.com>

	* src/libsoup/soup-message.c (soup_message_clear_headers):
	Impl. Use instead of custom header free funcs throughout.
	(soup_message_foreach_header): Impl.
	(global_handlers): Handle redirects before authenticating.
	(redirect_handler): Use soup_message_get_header.
	(run_handler): Ditto.

diff --git a/ChangeLog b/ChangeLog
index 737ab2e..eaf5851 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-05  Alex Graveley  <alex@ximian.com>
+
+       * src/libsoup/soup-message.c (soup_message_clear_headers):
+       Impl. Use instead of custom header free funcs throughout.
+       (soup_message_foreach_header): Impl.
+       (global_handlers): Handle redirects before authenticating.
+
 2001-10-04  Alex Graveley  <alex@ximian.com>
 
        * src/libsoup/soup-socket-unix.c (soup_address_new_cb): Ugg. Don't

diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c
index 5013e43..80f3a95 100644 (file)
--- a/libsoup/soup-message.c
+++ b/libsoup/soup-message.c
@@ -120,14 +120,6 @@ soup_message_cleanup (SoupMessage *req)
 }
 
 static void
-free_header (gchar *name, GSList *vals, gpointer unused)
-{
-       g_free (name);
-       g_slist_foreach (vals, (GFunc) g_free, NULL);
-       g_slist_free (vals);
-}
-
-static void
 finalize_message (SoupMessage *req)
 {
        soup_context_unref (req->context);
@@ -140,19 +132,11 @@ finalize_message (SoupMessage *req)
        if (req->priv->req_header) 
                g_string_free (req->priv->req_header, TRUE);
 
-       if (req->request_headers) {
-               g_hash_table_foreach (req->request_headers,
-                                     (GHFunc) free_header,
-                                     NULL);
-               g_hash_table_destroy (req->request_headers);
-       }
+       soup_message_clear_headers (req->request_headers);
+       g_hash_table_destroy (req->request_headers);
 
-       if (req->response_headers) {
-               g_hash_table_foreach (req->response_headers,
-                                     (GHFunc) free_header,
-                                     NULL);
-               g_hash_table_destroy (req->response_headers);
-       }
+       soup_message_clear_headers (req->response_headers);
+       g_hash_table_destroy (req->response_headers);
 
        g_slist_foreach (req->priv->content_handlers, (GFunc) g_free, NULL);
        g_slist_free (req->priv->content_handlers);
@@ -226,6 +210,26 @@ soup_message_cancel (SoupMessage *msg)
        soup_message_issue_callback (msg);
 }
 
+static gboolean 
+foreach_free_header_list (gchar *name, GSList *vals, gpointer notused)
+{
+       g_free (name);
+       g_slist_foreach (vals, (GFunc) g_free, NULL);
+       g_slist_free (vals);
+
+       return TRUE;
+}
+
+void
+soup_message_clear_headers       (GHashTable        *hash)
+{
+       g_return_if_fail (hash != NULL);
+
+       g_hash_table_foreach_remove (hash, 
+                                    (GHRFunc) foreach_free_header_list, 
+                                    NULL);
+}
+
 void 
 soup_message_add_header (GHashTable  *hash,
                         const gchar *name,
@@ -253,7 +257,7 @@ soup_message_add_header (GHashTable  *hash,
                                                     g_strdup (value)));
        else if (!value && exists) {
                g_hash_table_remove (hash, name);
-               free_header (old_name, old_value, NULL);
+               foreach_free_header_list (old_name, old_value, NULL);
        } 
 }
 
@@ -302,6 +306,36 @@ soup_message_get_header_list (GHashTable  *hash,
        return g_hash_table_lookup (hash, name);
 }
 
+typedef struct {
+       GHFunc   func;
+       gpointer user_data;
+} ForeachData;
+
+static void 
+foreach_value_in_list (gchar *name, GSList *vals, ForeachData *data)
+{
+       while (vals) {
+               gchar *v = vals->data;
+
+               (*data->func) (name, v, data->user_data);
+
+               vals = vals->next;
+       }
+}
+
+void
+soup_message_foreach_header      (GHashTable        *hash,
+                                 GHFunc             func,
+                                 gpointer           user_data)
+{
+       ForeachData data = { func, user_data };
+
+       g_return_if_fail (hash != NULL);
+       g_return_if_fail (func != NULL);
+
+       g_hash_table_foreach (hash, (GHFunc) foreach_value_in_list, &data);
+}
+
 /**
  * soup_message_set_request_header:
  * @req: a %SoupMessage.
@@ -536,7 +570,7 @@ redirect_handler (SoupMessage *msg, gpointer user_data)
        if (msg->errorclass != SOUP_ERROR_CLASS_REDIRECT || 
            msg->priv->msg_flags & SOUP_MESSAGE_NO_REDIRECT) return;
 
-       new_url = soup_message_get_response_header (msg, "Location");
+       new_url = soup_message_get_header (msg->response_headers, "Location");
 
        if (new_url) {
                SoupContext *new_ctx, *old_ctx;
@@ -581,6 +615,16 @@ typedef struct {
 
 static SoupHandlerData global_handlers [] = {
        /* 
+        * Handle redirect response codes 300, 301, 302, 303, and 305.
+        */
+       {
+               SOUP_HANDLER_PRE_BODY,
+               redirect_handler, 
+               NULL, 
+               RESPONSE_HEADER_HANDLER, 
+               { (guint) "Location" }
+       },
+       /* 
         * Handle authorization.
         */
        {
@@ -600,16 +644,6 @@ static SoupHandlerData global_handlers [] = {
                RESPONSE_ERROR_CODE_HANDLER, 
                { 407 }
        },
-       /* 
-        * Handle redirect response codes 300, 301, 302, 303, and 305.
-        */
-       {
-               SOUP_HANDLER_PRE_BODY,
-               redirect_handler, 
-               NULL, 
-               RESPONSE_HEADER_HANDLER, 
-               { (guint) "Location" }
-       },
        { 0 }
 };
 
@@ -622,8 +656,8 @@ run_handler (SoupMessage     *msg,
 
        switch (data->kind) {
        case RESPONSE_HEADER_HANDLER:
-               if (!soup_message_get_response_header (msg,
-                                                      data->data.header))
+               if (!soup_message_get_header (msg->response_headers,
+                                             data->data.header))
                        return;
                break;
        case RESPONSE_ERROR_CODE_HANDLER:

diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h
index 0035b8f..a4442df 100644 (file)
--- a/libsoup/soup-message.h
+++ b/libsoup/soup-message.h
@@ -209,6 +209,12 @@ const gchar   *soup_message_get_header          (GHashTable        *hash,
 const GSList  *soup_message_get_header_list     (GHashTable        *hash,
                                                 const gchar       *name);
 
+void           soup_message_foreach_header      (GHashTable        *hash,
+                                                GHFunc             func,
+                                                gpointer           user_data);
+
+void           soup_message_clear_headers       (GHashTable        *hash);
+
 /** DEPRECATED **/
 void           soup_message_set_request_header  (SoupMessage       *req,
                                                 const gchar       *name,

diff --git a/libsoup/soup-queue.c b/libsoup/soup-queue.c
index fa6e343..3cea04e 100644 (file)
--- a/libsoup/soup-queue.c
+++ b/libsoup/soup-queue.c
@@ -523,15 +523,6 @@ soup_idle_handle_new_requests (gpointer unused)
        return FALSE;
 }
 
-static gboolean
-soup_queue_remove_header (gchar *name, GSList *vals, gpointer unused)
-{
-       g_free (name);
-       g_slist_foreach (vals, (GFunc) g_free, NULL);
-       g_slist_free (vals);
-       return TRUE;
-}
-
 void 
 soup_queue_message (SoupMessage    *req,
                    SoupCallbackFn  callback, 
@@ -574,9 +565,7 @@ soup_queue_message (SoupMessage    *req,
        req->response.body = NULL;
        req->response.length = 0;
 
-       g_hash_table_foreach_remove (req->response_headers,
-                                    (GHRFunc) soup_queue_remove_header,
-                                    NULL);
+       soup_message_clear_headers (req->response_headers);
 
        if (req->errorphrase) {
                g_free ((gchar *) req->errorphrase);

diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
index b1cb7d8..5bf577e 100644 (file)
--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
@@ -273,7 +273,7 @@ read_done_cb (const SoupDataBuffer *data,
        req->status = SOUP_STATUS_FINISHED;
 
        /* FIXME: Do this in soap handler 
-       action = soup_message_get_request_header (req, "SOAPAction");
+       action = soup_message_get_header (req->request_headers, "SOAPAction");
        if (!action) {
                g_print ("No SOAPAction found in request.\n");
                set_response_error (

diff --git a/libsoup/soup-socket.h b/libsoup/soup-socket.h
index c1a6e5e..f34dc31 100644 (file)
--- a/libsoup/soup-socket.h
+++ b/libsoup/soup-socket.h
@@ -106,7 +106,6 @@ SoupSocket          *soup_socket_connect_sync   (const gchar        *hostname,
                                                 const gint          port);
 
 
-
 typedef gpointer SoupSocketNewId;
 
 typedef enum {