Changeset 4346c3f4 for lib

Timestamp:

2010-07-16T23:31:55Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e437366

Parents:

3709301 (diff), ef14a83 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

Location:

lib

Files:

• http_client.c (modified) (4 diffs)
• http_client.h (modified) (2 diffs)

lib/http_client.c

@@ -35 +35 @@
 static gboolean http_ssl_connected( gpointer data, void *source, b_input_condition cond );
 static gboolean http_incoming_data( gpointer data, int source, b_input_condition cond );
-
-
-void *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data )
+static void http_free( struct http_request *req );
+
+
+struct http_request *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data )
 {
         struct http_request *req;
@@ -67 +68 @@
         req->request = g_strdup( request );
         req->request_length = strlen( request );
+        req->redir_ttl = 3;
         
         return( req );
 }
 
-void *http_dorequest_url( char *url_string, http_input_function func, gpointer data )
+struct http_request *http_dorequest_url( char *url_string, http_input_function func, gpointer data )
 {
         url_t *url = g_new0( url_t, 1 );
@@ -311 +313 @@
         }
         
-        if( req->status_code == 301 || req->status_code == 302 )
+        if( ( req->status_code == 301 || req->status_code == 302 ) && req->redir_ttl-- > 0 )
         {
                 char *loc, *new_request, *new_host;
@@ -445 +447 @@
 }
 
-void http_free( struct http_request *req )
+static void http_free( struct http_request *req )
 {
         g_free( req->request );

lib/http_client.h

@@ -61 +61 @@
         int finished;           /* Set to non-0 if the request was completed
                                    successfully. */
+        int redir_ttl;          /* You can set it to 0 if you don't want
+                                   http_client to follow them. */
         
         http_input_function func;
@@ -79 +81 @@
    you want to add some extra headers. As you can see, HTTPS connections
    are also supported (using ssl_client). */
-void *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data );
-void *http_dorequest_url( char *url_string, http_input_function func, gpointer data );
-
-void http_free( struct http_request *req );
+struct http_request *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data );
+struct http_request *http_dorequest_url( char *url_string, http_input_function func, gpointer data );