(trunk libT) #2030: revert false alarm r8361 as per this suggestion http://trac.trans...

diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
index a801e8f26970ab92acae6c6e942d37c90c0a67ea..d4bc9a6e64768f9c6c02939d4029d7403bbd9eda 100644 (file)
--- a/libtransmission/rpc-server.c
+++ b/libtransmission/rpc-server.c
@@ -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 );

diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index 93f05f0556ba08573ed32b8455c1ce9ee333c0e7..c0a1cf7e27fc72d14ebac42924d8bae8d69e4266 100644 (file)
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -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;
 }
 
 /***