Changeset 55ccc9a0

Timestamp:

2012-09-22T11:52:01Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d0752e8

Parents:

daf544a

Message:

Solve a whole bunch of Twitter module crashes: Twitter responses seem to
be getting truncated sometimes. Treat this as an error in http_client
already instead of returning partial data.

Location:

lib

Files:

• http_client.c (modified) (3 diffs)
• http_client.h (modified) (1 diff)
• misc.c (modified) (1 diff)
• misc.h (modified) (1 diff)

lib/http_client.c

@@ -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 )

lib/http_client.h

@@ -59 +59 @@
         char *reply_body;
         int body_size;          /* The number of bytes in reply_body. */
-        int finished;           /* Set to non-0 if the request was completed
+        /* 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

lib/misc.c

@@ -730 +730 @@
 }
 
-char *get_rfc822_header( char *text, char *header, int len )
+char *get_rfc822_header( const char *text, const char *header, int len )
 {
         int hlen = strlen( header ), i;
-        char *ret;
+        const char *ret;
         
         if( text == NULL )

lib/misc.h

@@ -68 +68 @@
 G_MODULE_EXPORT int md5_verify_password( char *password, char *hash );
 G_MODULE_EXPORT char **split_command_parts( char *command );
-G_MODULE_EXPORT char *get_rfc822_header( char *text, char *header, int len );
+G_MODULE_EXPORT char *get_rfc822_header( const char *text, const char *header, int len );
 
 #endif