Changes in lib/http_client.c [e046390:516a9c6]

File:

• lib/http_client.c (modified) (6 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 );
@@ -149 +151 @@
         if( req->bytes_written < req->request_length )
                 req->inpa = b_input_add( source,
-                                         req->ssl ? ssl_getdirection( req->ssl ) : B_EV_IO_WRITE,
+                                         req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_WRITE,
                                          http_connected, req );
         else
-                req->inpa = b_input_add( source, B_EV_IO_READ, http_incoming_data, req );
+                req->inpa = b_input_add( source, GAIM_INPUT_READ, http_incoming_data, req );
         
         return FALSE;
@@ -234 +236 @@
         /* There will be more! */
         req->inpa = b_input_add( req->fd,
-                                 req->ssl ? ssl_getdirection( req->ssl ) : B_EV_IO_READ,
+                                 req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_READ,
                                  http_incoming_data, req );
         
@@ -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 );