Changeset 6820

Timestamp:

Oct 1, 2008, 3:53:56 PM (13 years ago)

Author:

charles

Message:

add support for compressing the content served by the rpc server -- rpc responses and clutch html/css/js files

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• configure.ac (modified) (1 diff)
• daemon/remote.c (modified) (1 diff)
• libtransmission/rpc-server.c (modified) (8 diffs)
• m4/check-zlib.m4 (added)
• third-party/macosx-libevent-config.h (modified) (1 diff)
• third-party/macosx-libevent-event-config.h (modified) (1 diff)

trunk/NEWS

@@ -4 +4 @@
 http://trac.transmissionbt.com/query?group=component&milestone=1.40
 - All Platforms
+   + Rewritten bandwidth management code
    + Lazy bitfields
-   + Rewritten bandwidth management code
+   + Support compression when serving Web Interface content and RPC responses
 - Mac
    + Option to automatically update the blocklist weekly

trunk/configure.ac

@@ -69 +69 @@
 PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
 PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
+CHECK_ZLIB()
 
 AC_SYS_LARGEFILE

trunk/daemon/remote.c

@@ -1057 +1057 @@
     curl = curl_easy_init( );
     curl_easy_setopt( curl, CURLOPT_VERBOSE, debug );
+#ifdef HAVE_LIBZ
+    curl_easy_setopt( curl, CURLOPT_ENCODING, "deflate" );
+#endif
     curl_easy_setopt( curl, CURLOPT_USERAGENT,
                       MY_NAME "/" LONG_VERSION_STRING );

trunk/libtransmission/rpc-server.c

@@ -19 +19 @@
 #include <fcntl.h>     /* open */
 #include <unistd.h>    /* close */
+
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif
 
 #include <libevent/event.h>
@@ -204 +208 @@
 }
 
+#ifdef HAVE_LIBZ
+static void
+compress_evbuf( struct evbuffer * evbuf )
+{
+    static struct evbuffer *tmp;
+    static z_stream stream;
+    static unsigned char buffer[2048];
+    
+    if( !tmp ) {
+        tmp = evbuffer_new( );
+        deflateInit( &stream, Z_BEST_COMPRESSION );
+    }
+
+    deflateReset( &stream );
+    stream.next_in = EVBUFFER_DATA(evbuf);
+    stream.avail_in = EVBUFFER_LENGTH(evbuf);
+
+    do {
+        stream.next_out = buffer;
+        stream.avail_out = sizeof( buffer );
+        if( deflate( &stream, Z_FULL_FLUSH ) == Z_OK )
+            evbuffer_add( tmp, buffer, sizeof( buffer ) - stream.avail_out );
+        else
+            break;
+    } while (stream.avail_out == 0);
+
+/*fprintf( stderr, "deflated response from %zu to %zu bytes\n", EVBUFFER_LENGTH( evbuf ), EVBUFFER_LENGTH( tmp ) );*/
+    evbuffer_drain(evbuf, EVBUFFER_LENGTH(evbuf));
+    evbuffer_add_buffer(evbuf, tmp);
+}
+#endif
+
+static void
+maybe_deflate_response( struct evhttp_request * req, struct evbuffer * response )
+{
+#ifdef HAVE_LIBZ
+    const char * accept_encoding = evhttp_find_header( req->input_headers, "Accept-Encoding" );
+    const int do_deflate = accept_encoding && strstr( accept_encoding, "deflate" );
+    if( do_deflate ) {
+        evhttp_add_header( req->output_headers, "Content-Encoding", "deflate" );
+        compress_evbuf( response );
+    }
+#endif
+}
+
 static void
 serve_file( struct evhttp_request * req,
@@ -227 +276 @@
                               mimetype_guess(
                                   path ) );
+            maybe_deflate_response( req, buf );
             evhttp_send_reply( req, HTTP_OK, "OK", buf );
             evbuffer_free( buf );
@@ -266 +316 @@
 }
 
+
 static void
 handle_rpc( struct evhttp_request * req,
@@ -295 +346 @@
     buf = evbuffer_new( );
     evbuffer_add( buf, response, len );
+    maybe_deflate_response( req, buf );
     evhttp_add_header( req->output_headers, "Content-Type",
                        "application/json; charset=UTF-8" );
@@ -329 +381 @@
 {
     struct tr_rpc_server * server = arg;
-    fprintf( stderr, "%s:%d Got request: \"%s\"\n", __FILE__, __LINE__, req->uri );
 
     if( req && req->evcon )
@@ -395 +446 @@
         tr_free( user );
     }
-    fprintf( stderr, "%s:%d\n", __FILE__, __LINE__ );
 }
 
@@ -403 +453 @@
     tr_rpc_server * server  = vserver;
 
-    fprintf( stderr, "%s:%d in startServer; current context is %p\n", __FILE__, __LINE__, server->httpd );
-
     if( !server->httpd )
     {
-        int i;
         server->httpd = evhttp_new( tr_eventGetBase( server->session ) );
-        fprintf( stderr, "%s:%d in startServer; new context is %p\n", __FILE__, __LINE__, server->httpd );
-        i = evhttp_bind_socket( server->httpd, "0.0.0.0", server->port );
-        fprintf( stderr, "evhttp_bind_socket returned %d\n", i );
+        evhttp_bind_socket( server->httpd, "0.0.0.0", server->port );
         evhttp_set_gencb( server->httpd, handle_request, server );
     }

trunk/third-party/macosx-libevent-config.h

@@ -231 +231 @@
 
 /* Version number of package */
-#define VERSION "1.4.1-beta"
+#define VERSION "1.4.8-stable"
 
 /* Define to appropriate substitue if compiler doesnt have __func__ */

trunk/third-party/macosx-libevent-event-config.h

@@ -238 +238 @@
 
 /* Version number of package */
-#define _EVENT_VERSION "1.4.1-beta"
+#define _EVENT_VERSION "1.4.8-stable"
 
 /* Define to appropriate substitue if compiler doesnt have __func__ */