mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-09 13:50:00 +00:00
Code Issues Releases Wiki Activity

(rpc) uploading files via an http form w/file inputs works now.

Browse source
This commit is contained in:
Charles Kerr 2008-07-01 02:33:31 +00:00
parent 212ea5e119
commit 51535b4bf9
1 changed files with 8 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libtransmission/rpc-server.c
View file

@ -76,10 +76,8 @@ handle_upload( struct shttpd_arg * arg )
if( !EVBUFFER_LENGTH( s->out ) ) if( !EVBUFFER_LENGTH( s->out ) )
{ {
/* if we haven't finished reading the POST, read more now */ /* if we haven't finished reading the POST, read more now */
if( arg->in.len ) { evbuffer_add( s->in, arg->in.buf, arg->in.len );
evbuffer_add( s->in, arg->in.buf, arg->in.len ); arg->in.num_bytes = arg->in.len;
arg->in.num_bytes = arg->in.len;
}
if( arg->flags & SHTTPD_MORE_POST_DATA ) if( arg->flags & SHTTPD_MORE_POST_DATA )
return; return;
@ -91,12 +89,9 @@ handle_upload( struct shttpd_arg * arg )
char * boundary = tr_strdup_printf( "--%s", strstr( content_type, "boundary=" ) + strlen( "boundary=" ) ); char * boundary = tr_strdup_printf( "--%s", strstr( content_type, "boundary=" ) + strlen( "boundary=" ) );
const size_t boundary_len = strlen( boundary ); const size_t boundary_len = strlen( boundary );
char buf[64]; char buf[64];
int paused = TRUE;
#if 0
int paused = ( query_string != NULL ) int paused = ( query_string != NULL )
&& ( shttpd_get_var( "paused", query_string, strlen( query_string ), buf, sizeof( buf ) ) == 4 ) && ( shttpd_get_var( "paused", query_string, strlen( query_string ), buf, sizeof( buf ) ) == 4 )
&& ( !strcmp( buf, "true" ) ); && ( !strcmp( buf, "true" ) );
#endif
delim = tr_memmem( in, inlen, boundary, boundary_len ); delim = tr_memmem( in, inlen, boundary, boundary_len );
if( delim ) do if( delim ) do
@ -107,10 +102,6 @@ handle_upload( struct shttpd_arg * arg )
in = part; in = part;
delim = tr_memmem( in, inlen, boundary, boundary_len ); delim = tr_memmem( in, inlen, boundary, boundary_len );
part_len = delim ? (size_t)(delim-part) : inlen; part_len = delim ? (size_t)(delim-part) : inlen;
#if 0
fprintf( stderr, "part_len is %d\n", (int)part_len );
fprintf( stderr, "part is [%*.*s]\n", (int)part_len, (int)part_len, part );
#endif
if( part_len ) if( part_len )
{ {
@ -128,11 +119,6 @@ handle_upload( struct shttpd_arg * arg )
if( body_len >= 2 && !memcmp(&body[body_len-2],"\r\n",2) ) if( body_len >= 2 && !memcmp(&body[body_len-2],"\r\n",2) )
body_len -= 2; body_len -= 2;
#if 0
fprintf( stderr, "body_len is %d\n", (int)body_len );
fprintf( stderr, "body is [%*.*s]\n", (int)body_len, (int)body_len, body );
#endif
ctor = tr_ctorNew( s->session ); ctor = tr_ctorNew( s->session );
tr_ctorSetMetainfo( ctor, (void*)body, body_len ); tr_ctorSetMetainfo( ctor, (void*)body, body_len );
tr_ctorSetPaused( ctor, TR_FORCE, paused ); tr_ctorSetPaused( ctor, TR_FORCE, paused );
@ -149,20 +135,15 @@ handle_upload( struct shttpd_arg * arg )
tr_free( boundary ); tr_free( boundary );
{ {
int len; /* use xml here because json responses to file uploads is trouble.
char * response; * see http://www.malsup.com/jquery/form/#sample7 for details */
tr_benc top; const char * response = "<result>success</result>";
tr_bencInitDict( &top, 2 ); const int len = strlen( response );
tr_bencDictAddStr( &top, "result", "success" );
tr_bencDictAddDict( &top, "arguments", 0 );
response = tr_bencSaveAsJSON( &top, &len );
evbuffer_add_printf( s->out, "HTTP/1.1 200 OK\r\n" evbuffer_add_printf( s->out, "HTTP/1.1 200 OK\r\n"
"Content-Type: application/json\r\n" "Content-Type: text/xml\r\n"
"Content-Length: %d\r\n" "Content-Length: %d\r\n"
"\r\n" "\r\n"
"%*.*s", len, len, len, response ); "%s\r\n", len, response );
tr_free( response );
tr_bencFree( &top );
} }
} }