Changeset 9c77fbf for lib/http_client.c

Timestamp:

2012-09-22T12:47:55Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6bef211

Parents:

c6fc24a (diff), 11ec078 (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:

Merge mainline.

File:

• lib/http_client.c (modified) (4 diffs)

lib/http_client.c

@@ -73 +73 @@
                 printf( "About to send HTTP request:\n%s\n", req->request );
         
-        return( req );
+        return req;
 }
 
@@ -198 +198 @@
         int evil_server = 0;
         char buffer[2048];
-        char *end1, *end2;
+        char *end1, *end2, *s;
+        size_t content_length;
         int st;
         
@@ -481 +482 @@
         /* Assume that a closed connection means we're finished, this indeed
            breaks with keep-alive connections and faulty connections. */
-        req->finished = 1;
+        /* req->finished = 1; */
 
 cleanup:
@@ -488 +489 @@
         else
                 closesocket( req->fd );
+        
+        if( ( s = get_rfc822_header( req->reply_headers, "Content-Length", 0 ) ) &&
+            sscanf( s, "%zd", &content_length ) == 1 )
+        {
+                if( content_length < req->body_size )
+                {
+                        req->status_code = -1;
+                        g_free( req->status_string );
+                        req->status_string = g_strdup( "Response truncated" );
+                }
+        }
+        g_free( s );
         
         if( getenv( "BITLBEE_DEBUG" ) && req )