mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk libT) #2030: revert false alarm r8361 as per this suggestion http://trac.transmissionbt.com/ticket/2030#comment:45

This commit is contained in:
Charles Kerr 2009-05-08 20:52:12 +00:00
parent 4be5ef5450
commit 54b7f9ccab
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libtransmission/rpc-server.c
View File

@ -335,7 +335,13 @@ serve_file( struct evhttp_request * req,
content_len = 0;
content = tr_loadFile( filename, &content_len );
if( content )
if( errno )
{
char * tmp = tr_strdup_printf( "%s (%s)", filename, tr_strerror( errno ) );
send_simple_response( req, HTTP_NOTFOUND, tmp );
tr_free( tmp );
}
else
{
struct evbuffer * out;
const time_t now = time( NULL );
@ -351,12 +357,6 @@ serve_file( struct evhttp_request * req,
tr_releaseBuffer( out );
tr_free( content );
}
else
{
char * tmp = tr_strdup_printf( "%s (%s)", filename, tr_strerror( errno ) );
send_simple_response( req, HTTP_NOTFOUND, tmp );
tr_free( tmp );
}
}
}
@ -583,8 +583,7 @@ handle_request( struct evhttp_request * req, void * arg )
"<p style=\"padding-left: 20pt;\">This requirement has been added to make "
"<a href=\"http://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a>"
" attacks more difficult.</p>",
TR_RPC_SESSION_ID_HEADER, sessionId,
TR_RPC_SESSION_ID_HEADER );
TR_RPC_SESSION_ID_HEADER, sessionId );
evhttp_add_header( req->output_headers, TR_RPC_SESSION_ID_HEADER, sessionId );
send_simple_response( req, 409, tmp );
tr_free( tmp );

11
libtransmission/utils.c
View File

@ -289,13 +289,11 @@ tr_msgLoggingIsActive( int level )
}
void
tr_msg( const char * file,
int line,
int level,
const char * name,
const char * fmt,
... )
tr_msg( const char * file, int line,
int level, const char * name,
const char * fmt, ... )
{
const int err = errno; /* message logging shouldn't affect errno */
FILE * fp;
tr_msgInit( );
tr_lockLock( messageLock );
@ -350,6 +348,7 @@ tr_msg( const char * file,
}
tr_lockUnlock( messageLock );
errno = err;
}
/***