Changeset 41ca004 for protocols/http_client.c

Timestamp:

2006-05-19T07:55:53Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

68b518d6

Parents:

ac83732 (diff), 881fd4e (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 from main development tree.

File:

• protocols/http_client.c (modified) (2 diffs)

protocols/http_client.c

@@ -69 +69 @@
         
         return( req );
+}
+
+void *http_dorequest_url( char *url_string, http_input_function func, gpointer data )
+{
+        url_t *url = g_new0( url_t, 1 );
+        char *request;
+        void *ret;
+        
+        if( !url_set( url, url_string ) )
+        {
+                g_free( url );
+                return NULL;
+        }
+        
+        if( url->proto != PROTO_HTTP && url->proto != PROTO_HTTPS )
+        {
+                g_free( url );
+                return NULL;
+        }
+        
+        request = g_strdup_printf( "GET %s HTTP/1.0\r\n"
+                                   "Host: %s\r\n"
+                                   "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n"
+                                   "\r\n", url->file, url->host );
+        
+        ret = http_dorequest( url->host, url->port,
+                              url->proto == PROTO_HTTPS, request, func, data );
+        
+        g_free( url );
+        g_free( request );
+        return ret;
 }
 
@@ -222 +253 @@
                 evil_server = 1;
         }
-        else
+        else if( end1 )
         {
                 end1 += 2;
         }
-        
-        if( end1 )
-        {
-                *end1 = 0;
-                
-                if( evil_server )
-                        req->reply_body = end1 + 1;
-                else
-                        req->reply_body = end1 + 2;
-        }
+        else
+        {
+                goto cleanup;
+        }
+        
+        *end1 = 0;
+        
+        if( evil_server )
+                req->reply_body = end1 + 1;
+        else
+                req->reply_body = end1 + 2;
+        
+        req->body_size = req->reply_headers + req->bytes_read - req->reply_body;
         
         if( ( end1 = strchr( req->reply_headers, ' ' ) ) != NULL )