Changeset 8457

Timestamp:

May 20, 2009, 10:06:33 PM (14 years ago)

Author:

charles

Message:

backports for 1.62.

ticketed items:

• #1188: comments and announce address are cut off
• #1432 lib: pause torrent when verifying
• #1451 gtk: make it clearer that the statusbar's ratio mode button is a button
• #1916 lib: phantom 'verifying' appears if another verify in progress
• #2061 web: toolbar z-index should be less than menus, dialogs
• #2065 lib: spelling mistake in libT log message
• #2072 qtr: Add-torrent-and-delete-source deletes the source even if there's an error
• #2073 web: can't upload new torrent file in web ui
• #2075 qtr: Incorrect initial torrent list
• #2077 qtr: Prefs dialog doesn't show or modify "Stop seeding torrents at ratio"
• #2085 web: torrents added by URL are always paused, regardless of preferences
• #2086 lib: JSON RPC messages can be 84% shorter, saving bandwidth and CPU
• #2088 lib: fix bug that could forget which port to use when connecting to some peers
• #2094 gtk: torrent comment box does not scroll, so long comments are partially hidden

nonticketed items:

• r8427 web: fix _leftUntilDone not updating when it hits 0
• r8399 lib: fix small memory leaks in libtransmission and in gtk client
• r8425 gtk: fix intltool build problem
• r8391 lib: remove dead code found by clang
• r8412 lib: speed up rpcimpl's torrentGet() by about 75%
• r8426 web : in the web client, use the correct filterbar image and style it properly

Location:

branches/1.6x

Files:

• Makefile.am (modified) (1 diff)
• NEWS (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• daemon/daemon.c (modified) (1 diff)
• daemon/remote.c (modified) (2 diffs)
• gtk/details.c (modified) (5 diffs)
• gtk/icons.c (modified) (1 diff)
• gtk/torrent-cell-renderer.c (modified) (1 diff)
• gtk/tr-core.c (modified) (2 diffs)
• gtk/tr-window.c (modified) (3 diffs)
• libtransmission/ConvertUTF.c (modified) (1 diff)
• libtransmission/bencode-test.c (modified) (1 diff)
• libtransmission/bencode.c (modified) (10 diffs)
• libtransmission/bencode.h (modified) (1 diff)
• libtransmission/json-test.c (modified) (1 diff)
• libtransmission/net.c (modified) (2 diffs)
• libtransmission/peer-mgr.h (modified) (1 diff)
• libtransmission/peer-msgs.c (modified) (1 diff)
• libtransmission/rpc-server.c (modified) (9 diffs)
• libtransmission/rpcimpl.c (modified) (8 diffs)
• libtransmission/session.c (modified) (1 diff)
• libtransmission/torrent-ctor.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (3 diffs)
• libtransmission/torrent.h (modified) (1 diff)
• libtransmission/verify.c (modified) (1 diff)
• libtransmission/web.c (modified) (1 diff)
• qt/options.cc (modified) (2 diffs)
• qt/options.h (modified) (1 diff)
• qt/prefs.cc (modified) (2 diffs)
• qt/prefs.h (modified) (1 diff)
• qt/session.cc (modified) (11 diffs)
• qt/session.h (modified) (4 diffs)
• qt/torrent.cc (modified) (1 diff)
• web/javascript/torrent.js (modified) (2 diffs)
• web/javascript/transmission.js (modified) (3 diffs)
• web/stylesheets/common.css (modified) (8 diffs)

branches/1.6x/Makefile.am

@@ -34 +34 @@
   README \
   autogen.sh \
-  Transmission.xcodeproj/project.pbxproj \
-  intltool-extract.in \
-  intltool-merge.in \
-  intltool-update.in
+  Transmission.xcodeproj/project.pbxproj
 
 clutchdir = $(datadir)/transmission/web

branches/1.6x/NEWS

@@ -1 +1 @@
 NEWS file for Transmission <http://www.transmissionbt.com/>
+
+1.62 (2009/xx/yy)
+<http://trac.transmissionbt.com/query?milestone=1.62&group=component&groupdesc=1&order=severity>
+- All Platforms
+   + fix bug that could forget which port to use when connecting to some peers
+   + pause torrent when verifying
+   + JSON RPC messages can be 84% shorter, saving bandwidth and CPU
+   + phantom 'verifying' appears if another verify in progress
+   + fix small memory leaks and remove dead code
+- Web Client
+   + fix 1.61 bug that broke adding torrents via the web client
+   + torrents added by URL were always paused, regardless of preferences
+   + comments and announce address are cut off in the inspector
+   + toolbar z-index should be less than menus, dialogs
+   + the "data remaining" field wasn't updated when the number reached 0
+   + use the correct filterbar image and style it properly
+- GTK+
+   + fix intltool build problem 
+   + make it clearer that the statusbar's ratio mode button is a button
+   + torrent comment box does not scroll, so long comments are partially hidden
+- Qt
+   + initial torrent list was sometimes incorrect
+   + add-torrent-and-delete-source deletes the source even if there's an error
+   + prefs dialog didn't show or modify "Stop seeding torrents at ratio"
 
 1.61 (2009/05/11)
@@ -13 +37 @@
 - Daemon
    + transmission-remote was unable to select torrents by their SHA1 hash
+
+1.54 (2009/xx/yy)
+- All Platforms
+   + fix bug that could forget which port to use when connecting to some peers
+   + phantom 'verifying' appears if another verify in progress
+   + fix small memory leaks and remove dead code
+- Web Client
+   + fix 1.53 bug that broke adding new torrents in the web client
+   + torrents added by URL were always paused, regardless of preferences
+   + in the inspector, comments and announce address were cut off
+   + toolbar z-index should be less than menus, dialogs
+   + the "data remaining" field wasn't updated when the number reached 0
+- GTK+
+   + Fix intltool build error
+   + Make it clearer that the statusbar's ratio mode button is a button
+   + Torrent comment box does not scroll, so long comments are partially hidden
 
 1.53 (2009/05/11)

branches/1.6x/configure.ac

@@ -264 +264 @@
 if test "x$enable_nls" = "xyes" ; then
     use_nls=yes
-    IT_PROG_INTLTOOL([0.23],[no-xml])
+    IT_PROG_INTLTOOL([0.40.0],[no-xml])
     AC_CHECK_HEADERS([libintl.h])
     GETTEXT_PACKAGE=transmission

branches/1.6x/daemon/daemon.c

@@ -298 +298 @@
         struct evbuffer * buf = tr_getBuffer( );
 
-        tr_bencSaveAsJSON( &settings, buf );
+        tr_bencSaveAsJSON( &settings, buf, TRUE );
         fprintf( stderr, "%s", (char*)EVBUFFER_DATA(buf) );
 

branches/1.6x/daemon/remote.c

@@ -603 +603 @@
         {
             struct evbuffer * buf = tr_getBuffer( );
-            reqs[reqCount++] = tr_strdup( tr_bencSaveAsJSON( &top, buf ) );
+            reqs[reqCount++] = tr_strdup( tr_bencSaveAsJSON( &top, buf, FALSE ) );
             tr_releaseBuffer( buf );
         }
@@ -1246 +1246 @@
 
     if( debug )
-        fprintf( stderr, "got response:\n--------\n%*.*s\n--------\n",
-                 (int)len, (int)len, (const char*) response );
+        fprintf( stderr, "got response (len %d):\n--------\n%*.*s\n--------\n",
+                 (int)len, (int)len, (int)len, (const char*) response );
 
     if( tr_jsonParse( response, len, &top, NULL ) )

branches/1.6x/gtk/details.c

@@ -526 +526 @@
 {
     guint tag;
-    int i, row;
+    int row;
     char *s;
     GSList *group;
@@ -547 +547 @@
 
     w = gtk_spin_button_new_with_range( 1, INT_MAX, 5 );
-    gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), i );
     tag = g_signal_connect( w, "value-changed", G_CALLBACK( down_speed_spun_cb ), d );
     d->downLimitSpinTag = tag;
@@ -559 +558 @@
 
     w = gtk_spin_button_new_with_range( 1, INT_MAX, 5 );
-    gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), i );
     tag = g_signal_connect( w, "value-changed", G_CALLBACK( up_speed_spun_cb ), d );
     d->upLimitSpinTag = tag;
@@ -1034 +1032 @@
     int row = 0;
     GtkTextBuffer * b;
-    GtkWidget *l, *w, *fr;
+    GtkWidget *l, *w, *fr, *sw;
     GtkWidget *t = hig_workarea_create( );
 
@@ -1061 +1059 @@
         gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( w ), GTK_WRAP_WORD );
         gtk_text_view_set_editable( GTK_TEXT_VIEW( w ), FALSE );
+        sw = gtk_scrolled_window_new( NULL, NULL );
+        gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( sw ),
+                                        GTK_POLICY_AUTOMATIC,
+                                        GTK_POLICY_AUTOMATIC );
+        gtk_container_add( GTK_CONTAINER( sw ), w );
         fr = gtk_frame_new( NULL );
         gtk_frame_set_shadow_type( GTK_FRAME( fr ), GTK_SHADOW_IN );
-        gtk_container_add( GTK_CONTAINER( fr ), w );
+        gtk_container_add( GTK_CONTAINER( fr ), sw );
         w = hig_workarea_add_row( t, &row, _( "Comment:" ), fr, NULL );
         gtk_misc_set_alignment( GTK_MISC( w ), 0.0f, 0.0f );

branches/1.6x/gtk/icons.c

@@ -263 +263 @@
     
     switch ( icon_size ) {
-        case GTK_ICON_SIZE_INVALID:       n = 0; break;
-        case GTK_ICON_SIZE_MENU:          n = 1; break;
-        case GTK_ICON_SIZE_SMALL_TOOLBAR: n = 2; break;
-        case GTK_ICON_SIZE_LARGE_TOOLBAR: n = 3; break;
-        case GTK_ICON_SIZE_BUTTON:        n = 4; break;
-        case GTK_ICON_SIZE_DND:           n = 5; break;
-        case GTK_ICON_SIZE_DIALOG:        n = 6; break; 
+        case GTK_ICON_SIZE_MENU:            n = 1; break;
+        case GTK_ICON_SIZE_SMALL_TOOLBAR:   n = 2; break;
+        case GTK_ICON_SIZE_LARGE_TOOLBAR:   n = 3; break;
+        case GTK_ICON_SIZE_BUTTON:          n = 4; break;
+        case GTK_ICON_SIZE_DND:             n = 5; break;
+        case GTK_ICON_SIZE_DIALOG:          n = 6; break; 
+        default /*GTK_ICON_SIZE_INVALID*/:  n = 0; break;
     }   
 

branches/1.6x/gtk/torrent-cell-renderer.c

@@ -51 +51 @@
     char *         str;
     double         seedRatio; 
-    gboolean       hasSeedRatio;
+    gboolean       hasSeedRatio = FALSE;
 
     if( !isDone )

branches/1.6x/gtk/tr-core.c

@@ -529 +529 @@
             g_free( filename );
         }
+        g_dir_close( dir );
     }
 }
@@ -1444 +1445 @@
 tr_core_exec( TrCore * core, const tr_benc * top )
 {
-    char * json = tr_bencToJSON( top );
+    char * json = tr_bencToJSON( top, FALSE );
     tr_core_exec_json( core, json );
     tr_free( json );

branches/1.6x/gtk/tr-window.c

@@ -282 +282 @@
 
 static void
-onYinYangReleased( GtkWidget * w           UNUSED,
-                   GdkEventButton * button UNUSED,
-                   gpointer                vprivate )
+onYinYangReleased( GtkWidget * w UNUSED, gpointer vprivate )
 {
     PrivateData * p = vprivate;
 
-    gtk_menu_popup( GTK_MENU(
-                       p->status_menu ), NULL, NULL, NULL, NULL, 0,
-                   gtk_get_current_event_time( ) );
+    gtk_menu_popup( GTK_MENU( p->status_menu ),
+                    NULL, NULL, NULL, NULL, 0,
+                    gtk_get_current_event_time( ) );
 }
 
@@ -800 +798 @@
     PrivateData * p;
     GtkWidget   *mainmenu, *toolbar, *filter, *list, *status;
-    GtkWidget *   vbox, *w, *self, *h, *c, *s, *hbox, *image, *menu;
+    GtkWidget *   vbox, *w, *self, *h, *s, *hbox, *image, *menu;
     GtkWindow *   win;
     GSList *      l;
@@ -947 +945 @@
             gtk_widget_set_size_request( w, GUI_PAD, 0u );
             gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-            w = gtk_image_new_from_stock( GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU );
-            c = gtk_event_box_new( );
-            gtk_container_add( GTK_CONTAINER( c ), w );
-            w = c;
-            g_signal_connect( w, "button-release-event", G_CALLBACK( onYinYangReleased ), p );
+            w = gtk_button_new( );
+            gtk_container_add( GTK_CONTAINER( w ), gtk_image_new_from_stock( GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU ) );
+            gtk_button_set_relief( GTK_BUTTON( w ), GTK_RELIEF_NONE );
+            g_signal_connect( w, "clicked", G_CALLBACK( onYinYangReleased ), p );
             gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
             w = p->stats_lb = gtk_label_new( NULL );

branches/1.6x/libtransmission/ConvertUTF.c

@@ -354 +354 @@
 {
     const UTF8* source = (const UTF8*) str;
-    const UTF8* sourceEnd = source;
+    const UTF8* sourceEnd;
 
     if( max_len == 0 )

branches/1.6x/libtransmission/bencode-test.c

@@ -325 +325 @@
 
     tr_bencLoad( benc_str, strlen( benc_str ), &top, NULL );
-    serialized = tr_bencSaveAsJSON( &top, buf );
+    serialized = tr_bencSaveAsJSON( &top, buf, TRUE );
     stripWhitespace( serialized );
 #if 0

branches/1.6x/libtransmission/bencode.c

@@ -14 +14 @@
 #include <ctype.h> /* isdigit, isprint, isspace */
 #include <errno.h>
+#include <math.h> /* fabs */
 #include <stdio.h>
 #include <stdlib.h>
@@ -1181 +1182 @@
 struct jsonWalk
 {
-    tr_list *          parents;
+    tr_bool doIndent;
+    tr_list * parents;
     struct evbuffer *  out;
 };
@@ -1188 +1190 @@
 jsonIndent( struct jsonWalk * data )
 {
-    char buf[1024];
-    const int width = tr_list_size( data->parents ) * 4;
-
-    buf[0] = '\n';
-    memset( buf+1, ' ', width );
-    evbuffer_add( data->out, buf, 1+width );
+    if( data->doIndent )
+    {
+        char buf[1024];
+        const int width = tr_list_size( data->parents ) * 4;
+
+        buf[0] = '\n';
+        memset( buf+1, ' ', width );
+        evbuffer_add( data->out, buf, 1+width );
+    }
 }
 
@@ -1209 +1214 @@
                 const int i = parentState->childIndex++;
                 if( !( i % 2 ) )
-                    evbuffer_add( data->out, ": ", 2 );
+                    evbuffer_add( data->out, ": ", data->doIndent ? 2 : 1 );
                 else
                 {
-                    evbuffer_add( data->out, ", ", 2 );
+                    evbuffer_add( data->out, ", ", data->doIndent ? 2 : 1 );
                     jsonIndent( data );
                 }
@@ -1221 +1226 @@
             {
                 ++parentState->childIndex;
-                evbuffer_add( data->out, ", ", 2 );
+                evbuffer_add( data->out, ", ", data->doIndent ? 2 : 1 );
                 jsonIndent( data );
                 break;
@@ -1279 +1284 @@
     char locale[128];
 
-    /* json requires a '.' decimal point regardless of locale */
-    tr_strlcpy( locale, setlocale( LC_NUMERIC, NULL ), sizeof( locale ) );
-    setlocale( LC_NUMERIC, "POSIX" );
-    evbuffer_add_printf( data->out, "%f", val->val.d );
-    setlocale( LC_NUMERIC, locale );
+    if( fabs( val->val.d ) < 0.00001 )
+        evbuffer_add( data->out, "0", 1 );
+    else {
+        /* json requires a '.' decimal point regardless of locale */
+        tr_strlcpy( locale, setlocale( LC_NUMERIC, NULL ), sizeof( locale ) );
+        setlocale( LC_NUMERIC, "POSIX" );
+        evbuffer_add_printf( data->out, "%.4f", val->val.d );
+        setlocale( LC_NUMERIC, locale );
+    }
 
     jsonChildFunc( data );
@@ -1397 +1406 @@
                                             
 char*
-tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out )
+tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out, tr_bool doIndent )
 {
     struct jsonWalk data;
@@ -1403 +1412 @@
     evbuffer_drain( out, EVBUFFER_LENGTH( out ) );
 
+    data.doIndent = doIndent;
     data.out = out;
     data.parents = NULL;
@@ -1415 +1425 @@
 
 char*
-tr_bencToJSON( const tr_benc * top )
+tr_bencToJSON( const tr_benc * top, tr_bool doIndent )
 {
     char * ret;
     struct evbuffer * buf = evbuffer_new( );
-    tr_bencSaveAsJSON( top, buf );
+    tr_bencSaveAsJSON( top, buf, doIndent );
     ret = tr_strndup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
     evbuffer_free( buf );
@@ -1562 +1572 @@
 {
     struct evbuffer * buf = tr_getBuffer( );
-    const char * json = tr_bencSaveAsJSON( b, buf );
+    const char * json = tr_bencSaveAsJSON( b, buf, TRUE );
     const int err = saveFile( filename, json, EVBUFFER_LENGTH( buf ) );
     tr_releaseBuffer( buf );

branches/1.6x/libtransmission/bencode.h

@@ -85 +85 @@
 char*     tr_bencSave( const tr_benc * val, int * len );
 
-char*     tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out );
-
-char*     tr_bencToJSON( const tr_benc * top );
+char*     tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out, tr_bool doIndent );
+
+char*     tr_bencToJSON( const tr_benc * top, tr_bool doIndent );
 
 int       tr_bencSaveFile( const char * filename, const tr_benc * );

branches/1.6x/libtransmission/json-test.c

@@ -75 +75 @@
     check( tr_bencDictFindStr( &top, "key", &str ) );
     check( !strcmp( str, "Letöltések" ) );
-    json = tr_bencSaveAsJSON( &top, buf );
+    json = tr_bencSaveAsJSON( &top, buf, TRUE );
     if( !err )
         tr_bencFree( &top );

branches/1.6x/libtransmission/net.c

@@ -531 +531 @@
     const int               type = SOCK_STREAM;
     int                     addrlen;
-    int                     retval;
 
 #if defined( SO_REUSEADDR ) || defined( SO_REUSEPORT ) || defined( IPV6_V6ONLY )
@@ -549 +548 @@
 #ifdef IPV6_V6ONLY
     if( addr->type == TR_AF_INET6 && 
-        ( retval = setsockopt( s, IPPROTO_IPV6, IPV6_V6ONLY, &optval,
+        ( setsockopt( s, IPPROTO_IPV6, IPV6_V6ONLY, &optval,
                              sizeof( optval ) ) ) == -1 ) {
         /* the kernel may not support this. if not, ignore it */

branches/1.6x/libtransmission/peer-mgr.h

@@ -83 +83 @@
     uint8_t                  encryption_preference;
     tr_port                  port;
+    tr_port                  dht_port;
     tr_address               addr;
     struct tr_peerIo       * io;

branches/1.6x/libtransmission/peer-msgs.c

@@ -1430 +1430 @@
         case BT_PORT:
             dbgmsg( msgs, "Got a BT_PORT" );
-            tr_peerIoReadUint16( msgs->peer->io, inbuf, &msgs->peer->port );
+            tr_peerIoReadUint16( msgs->peer->io, inbuf, &msgs->peer->dht_port );
             break;
 

branches/1.6x/libtransmission/rpc-server.c

@@ -33 +33 @@
 #include "list.h"
 #include "platform.h"
+#include "ptrarray.h"
 #include "rpcimpl.h"
 #include "rpc-server.h"
@@ -84 +85 @@
 
 
+/***
+****
+***/
+
+static char*
+get_current_session_id( struct tr_rpc_server * server )
+{
+    const time_t now = time( NULL );
+
+    if( !server->sessionId || ( now >= server->sessionIdExpiresAt ) )
+    {
+        int i;
+        const int n = 48;
+        const char * pool = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        const size_t pool_size = strlen( pool );
+        char * buf = tr_new( char, n+1 );
+
+        for( i=0; i<n; ++i )
+            buf[i] = pool[ tr_cryptoRandInt( pool_size ) ];
+        buf[n] = '\0';
+
+        tr_free( server->sessionId );
+        server->sessionId = buf;
+        server->sessionIdExpiresAt = now + (60*60); /* expire in an hour */
+    }
+
+    return server->sessionId;
+}
+
+
 /**
 ***
@@ -105 +136 @@
 
 static const char*
-tr_memmem( const char * s1,
-           size_t       l1,
-           const char * s2,
-           size_t       l2 )
+tr_memmem( const char * s1, size_t l1, /* haystack */
+           const char * s2, size_t l2 ) /* needle */
 {
     if( !l2 ) return s1;
@@ -122 +151 @@
 }
 
+struct tr_mimepart
+{
+    char * headers;
+    int headers_len;
+    char * body;
+    int body_len;
+};
+
+static void
+tr_mimepart_free( struct tr_mimepart * p )
+{
+    tr_free( p->body );
+    tr_free( p->headers );
+    tr_free( p );
+}
+
+static void
+extract_parts_from_multipart( const struct evkeyvalq * headers,
+                              const struct evbuffer * body,
+                              tr_ptrArray * setme_parts )
+{
+    const char * content_type = evhttp_find_header( headers, "Content-Type" );
+    const char * in = (const char*) EVBUFFER_DATA( body );
+    size_t inlen = EVBUFFER_LENGTH( body );
+
+    const char * boundary_key = "boundary=";
+    const char * boundary_key_begin = strstr( content_type, boundary_key );
+    const char * boundary_val = boundary_key_begin ? boundary_key_begin + strlen( boundary_key ) : "arglebargle";
+    char * boundary = tr_strdup_printf( "--%s", boundary_val );
+    const size_t boundary_len = strlen( boundary );
+
+    const char * delim = tr_memmem( in, inlen, boundary, boundary_len );
+    while( delim )
+    {
+        size_t part_len;
+        const char * part = delim + boundary_len;
+
+        inlen -= ( part - in );
+        in = part;
+
+        delim = tr_memmem( in, inlen, boundary, boundary_len );
+        part_len = delim ? (size_t)( delim - part ) : inlen;
+
+        if( part_len )
+        {
+            const char * rnrn = tr_memmem( part, part_len, "\r\n\r\n", 4 );
+            if( rnrn )
+            {
+                struct tr_mimepart * p = tr_new( struct tr_mimepart, 1 );
+                p->headers_len = rnrn - part;
+                p->headers = tr_strndup( part, p->headers_len );
+                p->body_len = (part+part_len) - (rnrn + 4);
+                p->body = tr_strndup( rnrn+4, p->body_len );
+                tr_ptrArrayAppend( setme_parts, p );
+            }
+        }
+    }
+
+    tr_free( boundary );
+}
+
 static void
 handle_upload( struct evhttp_request * req,
@@ -132 +222 @@
     else
     {
-        const char * content_type = evhttp_find_header( req->input_headers,
-                                                        "Content-Type" );
+        int i;
+        int n;
+        tr_bool hasSessionId = FALSE;
+        tr_ptrArray parts = TR_PTR_ARRAY_INIT;
 
         const char * query = strchr( req->uri, '?' );
-        const int    paused = query && strstr( query + 1, "paused=true" );
-
-        const char * in = (const char *) EVBUFFER_DATA( req->input_buffer );
-        size_t       inlen = EVBUFFER_LENGTH( req->input_buffer );
-
-        const char * boundary_key = "boundary=";
-        const char * boundary_key_begin = strstr( content_type,
-                                                  boundary_key );
-        const char * boundary_val =
-            boundary_key_begin ? boundary_key_begin +
-            strlen( boundary_key ) : "arglebargle";
-
-        char *       boundary = tr_strdup_printf( "--%s", boundary_val );
-        const size_t boundary_len = strlen( boundary );
-
-        const char * delim = tr_memmem( in, inlen, boundary, boundary_len );
-        while( delim )
-        {
-            size_t       part_len;
-            const char * part = delim + boundary_len;
-            inlen -= ( part - in );
-            in = part;
-            delim = tr_memmem( in, inlen, boundary, boundary_len );
-            part_len = delim ? (size_t)( delim - part ) : inlen;
-
-            if( part_len )
+        const tr_bool paused = query && strstr( query + 1, "paused=true" );
+
+        extract_parts_from_multipart( req->input_headers, req->input_buffer, &parts );
+        n = tr_ptrArraySize( &parts );
+
+        /* first look for the session id */
+        for( i=0; i<n; ++i ) {
+            struct tr_mimepart * p = tr_ptrArrayNth( &parts, i );
+            if( tr_memmem( p->headers, p->headers_len, TR_RPC_SESSION_ID_HEADER, strlen( TR_RPC_SESSION_ID_HEADER ) ) )
+                break;
+        }
+        if( i<n ) {
+            const struct tr_mimepart * p = tr_ptrArrayNth( &parts, i );
+            const char * ours = get_current_session_id( server );
+            const int ourlen = strlen( ours );
+            hasSessionId = ourlen<=p->body_len && !memcmp( p->body, ours, ourlen );
+        }
+
+        if( !hasSessionId )
+        {
+            send_simple_response( req, 409, NULL );
+        }
+        else for( i=0; i<n; ++i )
+        {
+            struct tr_mimepart * p = tr_ptrArrayNth( &parts, i );
+            if( strstr( p->headers, "filename=\"" ) )
             {
-                char * text = tr_strndup( part, part_len );
-                if( strstr( text, "filename=\"" ) )
-                {
-                    const char * body = strstr( text, "\r\n\r\n" );
-                    if( body )
-                    {
-                        char * b64;
-                        size_t  body_len;
-                        tr_benc top, *args;
-                        struct evbuffer * json = tr_getBuffer( );
-
-                        body += 4; /* walk past the \r\n\r\n */
-                        body_len = part_len - ( body - text );
-                        if( body_len >= 2
-                          && !memcmp( &body[body_len - 2], "\r\n", 2 ) )
-                            body_len -= 2;
-
-                        tr_bencInitDict( &top, 2 );
-                        args = tr_bencDictAddDict( &top, "arguments", 2 );
-                        tr_bencDictAddStr( &top, "method", "torrent-add" );
-                        b64 = tr_base64_encode( body, body_len, NULL );
-                        tr_bencDictAddStr( args, "metainfo", b64 );
-                        tr_bencDictAddBool( args, "paused", paused );
-                        tr_bencSaveAsJSON( &top, json );
-                        tr_rpc_request_exec_json( server->session,
-                                                  EVBUFFER_DATA( json ),
-                                                  EVBUFFER_LENGTH( json ),
-                                                  NULL, NULL );
-
-                        tr_releaseBuffer( json );
-                        tr_free( b64 );
-                        tr_bencFree( &top );
-                    }
-                }
-                tr_free( text );
+                char * b64;
+                int body_len = p->body_len;
+                tr_benc top, *args;
+                const char * body = p->body;
+                struct evbuffer * json = evbuffer_new( );
+
+                if( body_len >= 2 && !memcmp( &body[body_len - 2], "\r\n", 2 ) )
+                    body_len -= 2;
+
+                tr_bencInitDict( &top, 2 );
+                args = tr_bencDictAddDict( &top, "arguments", 2 );
+                tr_bencDictAddStr( &top, "method", "torrent-add" );
+                b64 = tr_base64_encode( body, body_len, NULL );
+                tr_bencDictAddStr( args, "metainfo", b64 );
+                tr_bencDictAddBool( args, "paused", paused );
+                tr_bencSaveAsJSON( &top, json, FALSE );
+                tr_rpc_request_exec_json( server->session,
+                                          EVBUFFER_DATA( json ),
+                                          EVBUFFER_LENGTH( json ),
+                                          NULL, NULL );
+
+                evbuffer_free( json );
+                tr_free( b64 );
+                tr_bencFree( &top );
             }
         }
 
-        tr_free( boundary );
+        tr_ptrArrayDestruct( &parts, (PtrArrayForeachFunc)tr_mimepart_free );
 
         /* use xml here because json responses to file uploads is trouble.
@@ -474 +555 @@
 }
 
-static char*
-get_current_session_id( struct tr_rpc_server * server )
-{
-    const time_t now = time( NULL );
-
-    if( !server->sessionId || ( now >= server->sessionIdExpiresAt ) )
-    {
-        int i;
-        const int n = 48;
-        const char * pool = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        const size_t pool_size = strlen( pool );
-        char * buf = tr_new( char, n+1 );
-
-        for( i=0; i<n; ++i )
-            buf[i] = pool[ tr_cryptoRandInt( pool_size ) ];
-        buf[n] = '\0';
-
-        tr_free( server->sessionId );
-        server->sessionId = buf;
-        server->sessionIdExpiresAt = now + (60*60); /* expire in an hour */
-    }
-
-    return server->sessionId;
-}
-
-
 static tr_bool
 test_session_id( struct tr_rpc_server * server, struct evhttp_request * req )
@@ -567 +622 @@
         {
             handle_clutch( req, server );
+        }
+        else if( !strncmp( req->uri, "/transmission/upload", 20 ) )
+        {
+            handle_upload( req, server );
         }
 #ifdef REQUIRE_SESSION_ID
@@ -594 +653 @@
             handle_rpc( req, server );
         }
-        else if( !strncmp( req->uri, "/transmission/upload", 20 ) )
-        {
-            handle_upload( req, server );
-        }
         else
         {
@@ -819 +874 @@
     deflateEnd( &s->stream );
 #endif
+    tr_free( s->sessionId );
     tr_free( s->whitelistStr );
     tr_free( s->username );

branches/1.6x/libtransmission/rpcimpl.c

@@ -93 +93 @@
     tr_bencDictAddStr( data->response, "result", result );
 
-    tr_bencSaveAsJSON( data->response, buf );
+    tr_bencSaveAsJSON( data->response, buf, FALSE );
     (*data->callback)( data->session, (const char*)EVBUFFER_DATA(buf),
                        EVBUFFER_LENGTH(buf), data->callback_user_data );
@@ -401 +401 @@
 }
 
+/* faster-than-strcmp() optimization.  this is kind of clumsy,
+   but addField() was in the profiler's top 10 list, and this
+   makes it 4x faster... */
+#define tr_streq(a,alen,b) ((alen+1==sizeof(b)) && !memcmp(a,b,alen))
+
 static void
-addField( const tr_torrent * tor,
-          tr_benc *          d,
-          const char *       key )
+addField( const tr_torrent * tor, tr_benc * d, const char * key )
 {
     const tr_info * inf = tr_torrentInfo( tor );
     const tr_stat * st = tr_torrentStat( (tr_torrent*)tor );
-
-    if( !strcmp( key, "activityDate" ) )
+    const size_t keylen = strlen( key );
+
+    if( tr_streq( key, keylen, "activityDate" ) )
         tr_bencDictAddInt( d, key, st->activityDate );
-    else if( !strcmp( key, "addedDate" ) )
+    else if( tr_streq( key, keylen, "addedDate" ) )
         tr_bencDictAddInt( d, key, st->addedDate );
-    else if( !strcmp( key, "announceResponse" ) )
+    else if( tr_streq( key, keylen, "announceResponse" ) )
         tr_bencDictAddStr( d, key, st->announceResponse );
-    else if( !strcmp( key, "announceURL" ) )
+    else if( tr_streq( key, keylen, "announceURL" ) )
         tr_bencDictAddStr( d, key, st->announceURL );
-    else if( !strcmp( key, "bandwidthPriority" ) )
+    else if( tr_streq( key, keylen, "bandwidthPriority" ) )
         tr_bencDictAddInt( d, key, tr_torrentGetPriority( tor ) );
-    else if( !strcmp( key, "comment" ) )
+    else if( tr_streq( key, keylen, "comment" ) )
         tr_bencDictAddStr( d, key, inf->comment ? inf->comment : "" );
-    else if( !strcmp( key, "corruptEver" ) )
+    else if( tr_streq( key, keylen, "corruptEver" ) )
         tr_bencDictAddInt( d, key, st->corruptEver );
-    else if( !strcmp( key, "creator" ) )
+    else if( tr_streq( key, keylen, "creator" ) )
         tr_bencDictAddStr( d, key, inf->creator ? inf->creator : "" );
-    else if( !strcmp( key, "dateCreated" ) )
+    else if( tr_streq( key, keylen, "dateCreated" ) )
         tr_bencDictAddInt( d, key, inf->dateCreated );
-    else if( !strcmp( key, "desiredAvailable" ) )
+    else if( tr_streq( key, keylen, "desiredAvailable" ) )
         tr_bencDictAddInt( d, key, st->desiredAvailable );
-    else if( !strcmp( key, "doneDate" ) )
+    else if( tr_streq( key, keylen, "doneDate" ) )
         tr_bencDictAddInt( d, key, st->doneDate );
-    else if( !strcmp( key, "downloadDir" ) )
+    else if( tr_streq( key, keylen, "downloadDir" ) )
         tr_bencDictAddStr( d, key, tr_torrentGetDownloadDir( tor ) );
-    else if( !strcmp( key, "downloadedEver" ) )
+    else if( tr_streq( key, keylen, "downloadedEver" ) )
         tr_bencDictAddInt( d, key, st->downloadedEver );
-    else if( !strcmp( key, "downloaders" ) )
+    else if( tr_streq( key, keylen, "downloaders" ) )
         tr_bencDictAddInt( d, key, st->downloaders );
-    else if( !strcmp( key, "downloadLimit" ) )
+    else if( tr_streq( key, keylen, "downloadLimit" ) )
         tr_bencDictAddInt( d, key, tr_torrentGetSpeedLimit( tor, TR_DOWN ) );
-    else if( !strcmp( key, "downloadLimited" ) )
+    else if( tr_streq( key, keylen, "downloadLimited" ) )
         tr_bencDictAddBool( d, key, tr_torrentUsesSpeedLimit( tor, TR_DOWN ) );
-    else if( !strcmp( key, "error" ) )
+    else if( tr_streq( key, keylen, "error" ) )
         tr_bencDictAddInt( d, key, st->error );
-    else if( !strcmp( key, "errorString" ) )
+    else if( tr_streq( key, keylen, "errorString" ) )
         tr_bencDictAddStr( d, key, st->errorString );
-    else if( !strcmp( key, "eta" ) )
+    else if( tr_streq( key, keylen, "eta" ) )
         tr_bencDictAddInt( d, key, st->eta );
-    else if( !strcmp( key, "files" ) )
+    else if( tr_streq( key, keylen, "files" ) )
         addFiles( tor, tr_bencDictAddList( d, key, inf->fileCount ) );
-    else if( !strcmp( key, "fileStats" ) )
+    else if( tr_streq( key, keylen, "fileStats" ) )
         addFileStats( tor, tr_bencDictAddList( d, key, inf->fileCount ) );
-    else if( !strcmp( key, "hashString" ) )
+    else if( tr_streq( key, keylen, "hashString" ) )
         tr_bencDictAddStr( d, key, tor->info.hashString );
-    else if( !strcmp( key, "haveUnchecked" ) )
+    else if( tr_streq( key, keylen, "haveUnchecked" ) )
         tr_bencDictAddInt( d, key, st->haveUnchecked );
-    else if( !strcmp( key, "haveValid" ) )
+    else if( tr_streq( key, keylen, "haveValid" ) )
         tr_bencDictAddInt( d, key, st->haveValid );
-    else if( !strcmp( key, "honorsSessionLimits" ) )
+    else if( tr_streq( key, keylen, "honorsSessionLimits" ) )
         tr_bencDictAddBool( d, key, tr_torrentUsesSessionLimits( tor ) );
-    else if( !strcmp( key, "id" ) )
+    else if( tr_streq( key, keylen, "id" ) )
         tr_bencDictAddInt( d, key, st->id );
-    else if( !strcmp( key, "isPrivate" ) )
+    else if( tr_streq( key, keylen, "isPrivate" ) )
         tr_bencDictAddBool( d, key, tr_torrentIsPrivate( tor ) );
-    else if( !strcmp( key, "lastAnnounceTime" ) )
+    else if( tr_streq( key, keylen, "lastAnnounceTime" ) )
         tr_bencDictAddInt( d, key, st->lastAnnounceTime );
-    else if( !strcmp( key, "lastScrapeTime" ) )
+    else if( tr_streq( key, keylen, "lastScrapeTime" ) )
         tr_bencDictAddInt( d, key, st->lastScrapeTime );
-    else if( !strcmp( key, "leechers" ) )
+    else if( tr_streq( key, keylen, "leechers" ) )
         tr_bencDictAddInt( d, key, st->leechers );
-    else if( !strcmp( key, "leftUntilDone" ) )
+    else if( tr_streq( key, keylen, "leftUntilDone" ) )
         tr_bencDictAddInt( d, key, st->leftUntilDone );
-    else if( !strcmp( key, "manualAnnounceTime" ) )
+    else if( tr_streq( key, keylen, "manualAnnounceTime" ) )
         tr_bencDictAddInt( d, key, st->manualAnnounceTime );
-    else if( !strcmp( key, "maxConnectedPeers" ) )
+    else if( tr_streq( key, keylen, "maxConnectedPeers" ) )
         tr_bencDictAddInt( d, key,  tr_torrentGetPeerLimit( tor ) );
-    else if( !strcmp( key, "name" ) )
+    else if( tr_streq( key, keylen, "name" ) )
         tr_bencDictAddStr( d, key, inf->name );
-    else if( !strcmp( key, "nextAnnounceTime" ) )
+    else if( tr_streq( key, keylen, "nextAnnounceTime" ) )
         tr_bencDictAddInt( d, key, st->nextAnnounceTime );
-    else if( !strcmp( key, "nextScrapeTime" ) )
+    else if( tr_streq( key, keylen, "nextScrapeTime" ) )
         tr_bencDictAddInt( d, key, st->nextScrapeTime );
-    else if( !strcmp( key, "percentDone" ) )
+    else if( tr_streq( key, keylen, "percentDone" ) )
         tr_bencDictAddReal( d, key, st->percentDone );
-    else if( !strcmp( key, "peer-limit" ) )
+    else if( tr_streq( key, keylen, "peer-limit" ) )
         tr_bencDictAddInt( d, key, tr_torrentGetPeerLimit( tor ) );
-    else if( !strcmp( key, "peers" ) )
+    else if( tr_streq( key, keylen, "peers" ) )
         addPeers( tor, tr_bencDictAdd( d, key ) );
-    else if( !strcmp( key, "peersConnected" ) )
+    else if( tr_streq( key, keylen, "peersConnected" ) )
         tr_bencDictAddInt( d, key, st->peersConnected );
-    else if( !strcmp( key, "peersFrom" ) )
+    else if( tr_streq( key, keylen, "peersFrom" ) )
     {
         tr_benc *   tmp = tr_bencDictAddDict( d, key, 4 );
@@ -498 +502 @@
         tr_bencDictAddInt( tmp, "fromTracker",  f[TR_PEER_FROM_TRACKER] );
     }
-    else if( !strcmp( key, "peersGettingFromUs" ) )
+    else if( tr_streq( key, keylen, "peersGettingFromUs" ) )
         tr_bencDictAddInt( d, key, st->peersGettingFromUs );
-    else if( !strcmp( key, "peersKnown" ) )
+    else if( tr_streq( key, keylen, "peersKnown" ) )
         tr_bencDictAddInt( d, key, st->peersKnown );
-    else if( !strcmp( key, "peersSendingToUs" ) )
+    else if( tr_streq( key, keylen, "peersSendingToUs" ) )
         tr_bencDictAddInt( d, key, st->peersSendingToUs );
-    else if( !strcmp( key, "pieces" ) ) {
+    else if( tr_streq( key, keylen, "pieces" ) ) {
         const tr_bitfield * pieces = tr_cpPieceBitfield( &tor->completion );
         char * str = tr_base64_encode( pieces->bits, pieces->byteCount, NULL );
@@ -510 +514 @@
         tr_free( str );
     }
-    else if( !strcmp( key, "pieceCount" ) )
+    else if( tr_streq( key, keylen, "pieceCount" ) )
         tr_bencDictAddInt( d, key, inf->pieceCount );
-    else if( !strcmp( key, "pieceSize" ) )
+    else if( tr_streq( key, keylen, "pieceSize" ) )
         tr_bencDictAddInt( d, key, inf->pieceSize );
-    else if( !strcmp( key, "priorities" ) )
+    else if( tr_streq( key, keylen, "priorities" ) )
     {
         tr_file_index_t i;
@@ -521 +525 @@
             tr_bencListAddInt( p, inf->files[i].priority );
     }
-    else if( !strcmp( key, "rateDownload" ) )
+    else if( tr_streq( key, keylen, "rateDownload" ) )
         tr_bencDictAddInt( d, key, (int)( st->pieceDownloadSpeed * 1024 ) );
-    else if( !strcmp( key, "rateUpload" ) )
+    else if( tr_streq( key, keylen, "rateUpload" ) )
         tr_bencDictAddInt( d, key, (int)( st->pieceUploadSpeed * 1024 ) );
-    else if( !strcmp( key, "recheckProgress" ) )
+    else if( tr_streq( key, keylen, "recheckProgress" ) )
         tr_bencDictAddReal( d, key, st->recheckProgress );
-    else if( !strcmp( key, "scrapeResponse" ) )
+    else if( tr_streq( key, keylen, "scrapeResponse" ) )
         tr_bencDictAddStr( d, key, st->scrapeResponse );
-    else if( !strcmp( key, "scrapeURL" ) )
+    else if( tr_streq( key, keylen, "scrapeURL" ) )
         tr_bencDictAddStr( d, key, st->scrapeURL );
-    else if( !strcmp( key, "seeders" ) )
+    else if( tr_streq( key, keylen, "seeders" ) )
         tr_bencDictAddInt( d, key, st->seeders );
-    else if( !strcmp( key, "seedRatioLimit" ) )
+    else if( tr_streq( key, keylen, "seedRatioLimit" ) )
         tr_bencDictAddReal( d, key, tr_torrentGetRatioLimit( tor ) );
-    else if( !strcmp( key, "seedRatioMode" ) )
+    else if( tr_streq( key, keylen, "seedRatioMode" ) )
         tr_bencDictAddInt( d, key, tr_torrentGetRatioMode( tor ) );
-    else if( !strcmp( key, "sizeWhenDone" ) )
+    else if( tr_streq( key, keylen, "sizeWhenDone" ) )
         tr_bencDictAddInt( d, key, st->sizeWhenDone );
-    else if( !strcmp( key, "startDate" ) )
+    else if( tr_streq( key, keylen, "startDate" ) )
         tr_bencDictAddInt( d, key, st->startDate );
-    else if( !strcmp( key, "status" ) )
+    else if( tr_streq( key, keylen, "status" ) )
         tr_bencDictAddInt( d, key, st->activity );
-    else if( !strcmp( key, "swarmSpeed" ) )
+    else if( tr_streq( key, keylen, "swarmSpeed" ) )
         tr_bencDictAddInt( d, key, (int)( st->swarmSpeed * 1024 ) );
-    else if( !strcmp( key, "timesCompleted" ) )
+    else if( tr_streq( key, keylen, "timesCompleted" ) )
         tr_bencDictAddInt( d, key, st->timesCompleted );
-    else if( !strcmp( key, "trackers" ) )
+    else if( tr_streq( key, keylen, "trackers" ) )
         addTrackers( inf, tr_bencDictAddList( d, key, inf->trackerCount ) );
-    else if( !strcmp( key, "torrentFile" ) )
+    else if( tr_streq( key, keylen, "torrentFile" ) )
         tr_bencDictAddStr( d, key, inf->torrent );
-    else if( !strcmp( key, "totalSize" ) )
+    else if( tr_streq( key, keylen, "totalSize" ) )
         tr_bencDictAddInt( d, key, inf->totalSize );
-    else if( !strcmp( key, "uploadedEver" ) )
+    else if( tr_streq( key, keylen, "uploadedEver" ) )
         tr_bencDictAddInt( d, key, st->uploadedEver );
-    else if( !strcmp( key, "uploadLimit" ) )
+    else if( tr_streq( key, keylen, "uploadLimit" ) )
         tr_bencDictAddInt( d, key, tr_torrentGetSpeedLimit( tor, TR_UP ) );
-    else if( !strcmp( key, "uploadLimited" ) )
+    else if( tr_streq( key, keylen, "uploadLimited" ) )
         tr_bencDictAddBool( d, key, tr_torrentUsesSpeedLimit( tor, TR_UP ) );
-    else if( !strcmp( key, "uploadRatio" ) )
+    else if( tr_streq( key, keylen, "uploadRatio" ) )
         tr_bencDictAddReal( d, key, st->ratio );
-    else if( !strcmp( key, "wanted" ) )
+    else if( tr_streq( key, keylen, "wanted" ) )
     {
         tr_file_index_t i;
@@ -568 +572 @@
             tr_bencListAddInt( w, inf->files[i].dnd ? 0 : 1 );
     }
-    else if( !strcmp( key, "webseeds" ) )
+    else if( tr_streq( key, keylen, "webseeds" ) )
         addWebseeds( inf, tr_bencDictAddList( d, key, inf->trackerCount ) );
-    else if( !strcmp( key, "webseedsSendingToUs" ) )
+    else if( tr_streq( key, keylen, "webseedsSendingToUs" ) )
         tr_bencDictAddInt( d, key, st->webseedsSendingToUs );
 }
@@ -1296 +1300 @@
         if( tr_bencDictFindInt( request, "tag", &tag ) )
             tr_bencDictAddInt( &response, "tag", tag );
-        tr_bencSaveAsJSON( &response, buf );
+        tr_bencSaveAsJSON( &response, buf, FALSE );
         (*callback)( session, (const char*)EVBUFFER_DATA(buf),
                      EVBUFFER_LENGTH( buf ), callback_user_data );
@@ -1318 +1322 @@
         if( tr_bencDictFindInt( request, "tag", &tag ) )
             tr_bencDictAddInt( &response, "tag", tag );
-        tr_bencSaveAsJSON( &response, buf );
+        tr_bencSaveAsJSON( &response, buf, FALSE );
         (*callback)( session, (const char*)EVBUFFER_DATA(buf),
                      EVBUFFER_LENGTH(buf), callback_user_data );

branches/1.6x/libtransmission/session.c

@@ -661 +661 @@
         tr_socketListAppend( socketList, &address );
     else
-        tr_inf( _( "System does not seem to support IPv6. Not listening on"
-                   "an IPv6 address" ) );
+        tr_inf( _( "System does not seem to support IPv6. Not listening on an IPv6 address" ) );
 
     session->shared = tr_sharedInit( session, boolVal, session->peerPort,

branches/1.6x/libtransmission/torrent-ctor.c

@@ -172 +172 @@
 
     switch( priority ) {
-        case TR_PRI_NORMAL: myfiles = &ctor->normal; mycount = &ctor->normalSize; break;
         case TR_PRI_LOW: myfiles = &ctor->low; mycount = &ctor->lowSize; break;
         case TR_PRI_HIGH: myfiles = &ctor->high; mycount = &ctor->highSize; break;
+        default /*TR_PRI_NORMAL*/: myfiles = &ctor->normal; mycount = &ctor->normalSize; break;
     }
 

branches/1.6x/libtransmission/torrent.c

@@ -240 +240 @@
             break;
 
-        case TR_RATIOLIMIT_UNLIMITED:
+        default: /* TR_RATIOLIMIT_UNLIMITED */
             isLimited = FALSE;
             break;
@@ -845 +845 @@
     int                     usableSeeds = 0;
     uint64_t                now;
-    double                  downloadedForRatio, seedRatio;
+    double                  downloadedForRatio, seedRatio=0;
     tr_bool                 checkSeedRatio;
 
@@ -1287 +1287 @@
 {
     assert( tr_isTorrent( tor ) );
-
+    tr_globalLock( tor->session );
+
+    /* if the torrent's already being verified, stop it */
     tr_verifyRemove( tor );
 
-    tr_globalLock( tor->session );
-
+    /* if the torrent's running, stop it & set the restart-after-verify flag */
+    if( tor->isRunning ) {
+        tr_torrentStop( tor );
+        tor->startAfterVerify = TRUE;
+    }
+
+    /* add the torrent to the recheck queue */
     tr_torrentUncheck( tor );
     tr_verifyAdd( tor, torrentRecheckDoneCB );

branches/1.6x/libtransmission/torrent.h

@@ -198 +198 @@
     tr_bool                    isDeleting;
     tr_bool                    needsSeedRatioCheck;
+    tr_bool                    startAfterVerify; 
 
     uint16_t                   maxConnectedPeers;

branches/1.6x/libtransmission/verify.c

@@ -252 +252 @@
 
         tr_lockLock( getVerifyLock( ) );
-        tr_torrentSetVerifyState( tor, verifyList ? TR_VERIFY_WAIT : TR_VERIFY_NOW );
+        tr_torrentSetVerifyState( tor, TR_VERIFY_WAIT );
         tr_list_append( &verifyList, node );
         if( verifyThread == NULL )

branches/1.6x/libtransmission/web.c

@@ -85 +85 @@
 getSockinfo( tr_web * web, int fd, tr_bool createIfMissing )
 {
-    tr_list * l = web->fds;
+    tr_list * l;
 
     for( l=web->fds; l!=NULL; l=l->next ) {

branches/1.6x/qt/options.cc

@@ -252 +252 @@
     // rpc spec section 3.4 "adding a torrent"
 
+    const int64_t tag = mySession.getUniqueTag( );
     tr_benc top;
     tr_bencInitDict( &top, 3 );
     tr_bencDictAddStr( &top, "method", "torrent-add" );
-    tr_bencDictAddInt( &top, "tag", Session::ADD_TORRENT_TAG );
+    tr_bencDictAddInt( &top, "tag", tag );
     tr_benc * args( tr_bencDictAddDict( &top, "arguments", 10 ) );
 
@@ -302 +303 @@
     }
 
+    // maybe delete the source .torrent
+    if( myTrashCheck->isChecked( ) ) {
+        FileAdded * fileAdded = new FileAdded( tag, myFile );
+        connect( &mySession, SIGNAL(executed(int64_t,const QString&, struct tr_benc*)),
+                 fileAdded, SLOT(executed(int64_t,const QString&, struct tr_benc*)));
+    }
+
     mySession.exec( &top );
 
     tr_bencFree( &top );
     deleteLater( );
-
-    // maybe the source .torrent
-    if( myTrashCheck->isChecked( ) )
-        QFile(myFile).remove( );
 }
 

branches/1.6x/qt/options.h

@@ -32 +32 @@
 class QCheckBox;
 class Session;
+
+extern "C" { struct tr_benc; };
+
+class FileAdded: public QObject
+{
+        Q_OBJECT
+        const int64_t myTag;
+        QString myDelFile;
+
+    public:
+        FileAdded( int tag, const QString file ): myTag(tag), myDelFile(file) { }
+        ~FileAdded( ) { }
+
+    public slots:
+        void executed( int64_t tag, const QString& result, struct tr_benc * arguments ) {
+            Q_UNUSED( arguments );
+            if( tag == myTag ) {
+                if( result == "success" )
+                    QFile( myDelFile ).remove( );
+                deleteLater();
+            }
+        }
+};
 
 class Options: public QDialog

branches/1.6x/qt/prefs.cc

@@ -106 +106 @@
     { RPC_WHITELIST_ENABLED, TR_PREFS_KEY_RPC_WHITELIST_ENABLED, QVariant::Bool },
     { RPC_WHITELIST, TR_PREFS_KEY_RPC_WHITELIST, QVariant::String },
-    { SEED_RATIO_LIMIT, TR_PREFS_KEY_RATIO, QVariant::Double },
-    { SEED_RATIO_LIMITED, TR_PREFS_KEY_RATIO_ENABLED, QVariant::Bool },
     { USPEED_ENABLED, TR_PREFS_KEY_USPEED_ENABLED, QVariant::Bool },
     { USPEED, TR_PREFS_KEY_USPEED, QVariant::Int },
@@ -220 +218 @@
 
     /* write back out the serialized preferences */
-    char * json = tr_bencToJSON( &top );
+    char * json = tr_bencToJSON( &top, TRUE );
     if( json && *json ) {
         file.open( QIODevice::WriteOnly | QIODevice::Text );

branches/1.6x/qt/prefs.h

@@ -110 +110 @@
             RPC_WHITELIST_ENABLED,
             RPC_WHITELIST,
-            SEED_RATIO_LIMIT,
-            SEED_RATIO_LIMITED,
             USPEED_ENABLED,
             USPEED,

branches/1.6x/qt/session.cc

@@ -48 +48 @@
         TAG_BLOCKLIST_UPDATE,
         TAG_ADD_TORRENT,
-        TAG_PORT_TEST
+        TAG_PORT_TEST,
+
+        FIRST_UNIQUE_TAG
     };
 }
@@ -122 +124 @@
         case Prefs :: PEER_LIMIT_GLOBAL:
         case Prefs :: PEER_LIMIT_TORRENT:
-        case Prefs :: SEED_RATIO_LIMIT:
-        case Prefs :: SEED_RATIO_LIMITED:
         case Prefs :: USPEED_ENABLED:
         case Prefs :: USPEED:
@@ -132 +132 @@
         case Prefs :: PEER_PORT:
         case Prefs :: PEER_PORT_RANDOM_ON_START:
+            sessionSet( myPrefs.keyStr(key), myPrefs.variant(key) );
+            break;
+
         case Prefs :: RATIO:
+            sessionSet( "seedRatioLimit", myPrefs.variant(key) );           
+            break;           
         case Prefs :: RATIO_ENABLED:
-            sessionSet( myPrefs.keyStr(key), myPrefs.variant(key) );
+            sessionSet( "seedRatioLimited", myPrefs.variant(key) );
             break;
 
@@ -176 +181 @@
 
 Session :: Session( const char * configDir, Prefs& prefs ):
+    nextUniqueTag( FIRST_UNIQUE_TAG ),
     myBlocklistSize( -1 ),
     myPrefs( prefs ),
@@ -320 +326 @@
 }
 
-const int Session :: ADD_TORRENT_TAG = TAG_ADD_TORRENT;
-
 void
 Session :: torrentSet( const QSet<int>& ids, const QString& key, double value )
@@ -515 +519 @@
 Session :: exec( const tr_benc * request )
 {
-    char * str( tr_bencToJSON( request ) );
+    char * str( tr_bencToJSON( request, FALSE ) );
     exec( str );
     tr_free( str );
@@ -537 +541 @@
     else if( !myUrl.isEmpty( ) )
     {
-        const QByteArray data( request, strlen( request ) );
         static const QString path( "/transmission/rpc" );
         QHttpRequestHeader header( "POST", path );
@@ -544 +547 @@
         if( !mySessionId.isEmpty( ) )
             header.setValue( TR_RPC_SESSION_ID_HEADER, mySessionId );
-        myHttp.setProperty( "current-request", data );
-        myHttp.request( header, data, &myBuffer );
+        QBuffer * reqbuf = new QBuffer; 
+        reqbuf->setData( QByteArray( request ) ); 
+        myHttp.request( header, reqbuf, &myBuffer ); 
 #ifdef DEBUG_HTTP
         std::cerr << "sending " << qPrintable(header.toString()) << "\nBody:\n" << request << std::endl;
@@ -564 +568 @@
 {
     Q_UNUSED( id );
+    QIODevice * sourceDevice = myHttp.currentSourceDevice( ); 
 
     QHttpResponseHeader response = myHttp.lastResponse();
@@ -580 +585 @@
         // update it and resubmit the request.
         mySessionId = response.value( TR_RPC_SESSION_ID_HEADER );
-        exec( myHttp.property("current-request").toByteArray().constData() );
+        exec( qobject_cast<QBuffer*>(sourceDevice)->buffer().constData() ); 
     }
     else if( error )
@@ -608 +613 @@
     if( !err )
     {
-        int64_t tag;
+        int64_t tag = -1;
+        const char * result = NULL;
+        tr_benc * args = NULL;
+
+        tr_bencDictFindInt ( &top, "tag", &tag );
+        tr_bencDictFindStr ( &top, "result", &result );
+        tr_bencDictFindDict( &top, "arguments", &args );
+
+        emit executed( tag, result, args );
+
+        tr_benc * torrents;
         const char * str;
-        tr_benc *args, *torrents;
+
         if( tr_bencDictFindInt( &top, "tag", &tag ) )
         {

branches/1.6x/qt/session.h

@@ -41 +41 @@
         ~Session( );
 
-        static const int ADD_TORRENT_TAG;
-
     public:
         void stop( );
@@ -79 +77 @@
         void exec( const char * request );
         void exec( const struct tr_benc * request );
+
+    public:
+        int64_t getUniqueTag( ) { return nextUniqueTag++; }
 
     private:
@@ -117 +118 @@
 
     signals:
+        void executed( int64_t tag, const QString& result, struct tr_benc * arguments );
         void sourceChanged( );
         void portTested( bool isOpen );
@@ -129 +131 @@
 
     private:
+        int64_t nextUniqueTag;
         int64_t myBlocklistSize;
         Prefs& myPrefs;

branches/1.6x/qt/torrent.cc

@@ -341 +341 @@
 
         case TR_RATIOLIMIT_GLOBAL:
-            if(( isLimited = myPrefs.getBool( Prefs :: SEED_RATIO_LIMITED )))
-                ratio = myPrefs.getDouble( Prefs :: SEED_RATIO_LIMIT );
+            if(( isLimited = myPrefs.getBool( Prefs :: RATIO_ENABLED )))
+                ratio = myPrefs.getDouble( Prefs :: RATIO );
             break;
 

branches/1.6x/web/javascript/torrent.js

@@ -288 +288 @@
                 if (data.creator)       this._creator       = data.creator;
                 if (data.dateCreated)   this._creator_date  = data.dateCreated;
-                if (data.leftUntilDone) this._leftUntilDone = data.leftUntilDone;
                 if (data.sizeWhenDone)  this._sizeWhenDone  = data.sizeWhenDone;
                 if (data.path)          this._torrent_file  = data.path;//FIXME
@@ -300 +299 @@
                 this._completed             = data.haveUnchecked + data.haveValid;
                 this._verified              = data.haveValid;
+                this._leftUntilDone         = data.leftUntilDone;
                 this._download_total        = data.downloadedEver;
                 this._upload_total          = data.uploadedEver;

branches/1.6x/web/javascript/transmission.js

@@ -988 +988 @@
                 setInnerHTML( $(ti+'name')[0], name );
                 setInnerHTML( $(ti+'size')[0], torrents.length ? Math.formatBytes( total_size ) : 'N/A' );
-                setInnerHTML( $(ti+'tracker')[0], total_tracker );
+                setInnerHTML( $(ti+'tracker')[0], total_tracker.replace(/\//g, '/​') ); 
                 setInnerHTML( $(ti+'hash')[0], hash );
                 setInnerHTML( $(ti+'state')[0], total_state );
@@ -1005 +1005 @@
                 setInnerHTML( $(ti+'creator_date')[0], date_created );
                 setInnerHTML( $(ti+'progress')[0], torrents.length ? Math.ratio( sizeDone*100, sizeWhenDone ) + '%' : 'N/A' );
-                setInnerHTML( $(ti+'comment')[0], comment );
+                setInnerHTML( $(ti+'comment')[0], comment.replace(/\//g, '/​') ); 
                 setInnerHTML( $(ti+'creator')[0], creator );
                 setInnerHTML( $(ti+'error')[0], error );
@@ -1244 +1244 @@
                         var args = { };
                         if ('' != $('#torrent_upload_url').val()) {
-                                tr.remote.addTorrentByUrl($('#torrent_upload_url').val(), { paused: !this[Prefs._Autostart] });
+                                tr.remote.addTorrentByUrl($('#torrent_upload_url').val(), { paused: !this[Prefs._AutoStart] });
                         } else {
                                 args.url = '/transmission/upload?paused=' + (this[Prefs._AutoStart] ? 'false' : 'true');
                                 args.type = 'POST';
+                                args.data = { 'X-Transmission-Session-Id' : tr.remote._token };
                                 args.dataType = 'xml';
                                 args.iframe = true;

branches/1.6x/web/stylesheets/common.css

@@ -703 +703 @@
         right: 0px;
         bottom: 0;
-        z-index: 2;
+        z-index: 3;
         color: #000;
         text-shadow: 0 1px 0 #ccc;
@@ -750 +750 @@
         width: 100%;
         height: 100%;
-        z-index: 2;
         text-align: center;
         color: black;
@@ -758 +757 @@
 div.dialog_container div.dialog_window {
         background-color: #eee;
-        margin: -210px auto 0;
+        margin: 0 auto;
         filter: alpha(opacity=95);
         -moz-opacity: .95;
@@ -765 +764 @@
         text-align: left;
         width: 420px;
+        z-index: 4;
         overflow: hidden;
         position: relative;
         -webkit-box-shadow: 0 3px 6px rgba(0,0,0,0.7);
-        top: 50%;
+        top: 80px;
 }
 @media screen and (-webkit-min-device-pixel-ratio:0) {
@@ -774 +774 @@
                 top: 0;
                 margin-top: 71px;
+                z-index: 2
         }
 } 
@@ -780 +781 @@
         width: 410px;
         padding: 0 15px;
-        line-height: 14pt;
 }
 
@@ -813 +813 @@
         border: 1px solid #787878;
         width: 50px;
+        height: 15px;
         text-align: center;
         font-weight: bold;
@@ -824 +825 @@
 div.dialog_container div.dialog_window a:hover,
 div.dialog_container div.dialog_window a:active {
-        background: #C0C8D6 url('../images/graphics/filter_bar_bg.png') repeat-x;
-}
-
-div#upload_container div.dialog_window {
-        height: 200px !important;
-        position: relative;
-}
-
-div#upload_container div.dialog_window div.dialog_message {
-        height: 110px;
+        background: #C0C8D6 url('../images/graphics/filter_bar.png') bottom repeat-x;
 }