Changeset 1388d30

Timestamp:

2012-11-11T17:57:20Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2fb1262

Parents:

62f6b45

Message:

Mostly finished HTTP streaming support: Shrink the buffer and add a
http_close().

Files:

• lib/http_client.c (modified) (1 diff)
• lib/http_client.h (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (1 diff)

lib/http_client.c

@@ -568 +568 @@
 void http_flush_bytes( struct http_request *req, size_t len )
 {
-        if( len > 0 && len <= req->body_size )
-        {
-                req->reply_body += len;
-                req->body_size -= len;
-        }
+        if( len <= 0 || len > req->body_size || !( req->flags & HTTPC_STREAMING ) )
+                return;
+        
+        req->reply_body += len;
+        req->body_size -= len;
+        
+        if( req->reply_body - req->sbuf >= 512 )
+        {
+                printf( "Wasting %ld bytes, cleaning up stream buffer\n", req->reply_body - req->sbuf );
+                char *new = g_memdup( req->reply_body, req->body_size + 1 );
+                g_free( req->sbuf );
+                req->reply_body = req->sbuf = new;
+                req->sblen = req->body_size;
+        }
+}
+
+void http_close( struct http_request *req )
+{
+        if( !req )
+                return;
+        
+        if( req->ssl )
+                ssl_disconnect( req->ssl );
+        else
+                closesocket( req->fd );
+        
+        http_free( req );
 }
 

lib/http_client.h

@@ -89 +89 @@
 /* For streaming connections only; flushes len bytes at the start of the buffer. */
 void http_flush_bytes( struct http_request *req, size_t len );
+void http_close( struct http_request *req );

protocols/twitter/twitter.c

@@ -374 +374 @@
 
         if (td) {
+                http_close(td->stream);
                 oauth_info_free(td->oauth_info);
                 g_free(td->user);