(trunk libT) #2416 "crash in event_queue_insert" -- I think this is happening if...

diff --git a/libtransmission/web.c b/libtransmission/web.c
index 39e0e4847da483e7bfe82217031d7902c6aca370..b7a4e3d5cd06210e3218ad194cd2c7f0b4115c28 100644 (file)
--- a/libtransmission/web.c
+++ b/libtransmission/web.c
@@ -345,11 +345,8 @@ sock_cb( CURL * e UNUSED, curl_socket_t fd, int curl_what,
 
     if( ( io_event != NULL ) && ( curl_what & CURL_POLL_REMOVE ) )
     {
-        CURLMcode m;
         memset( io_event, TR_MEMORY_TRASH, sizeof( struct event ) );
         tr_free( io_event );
-        m = curl_multi_assign( web->multi, fd, NULL );
-        assert( m == CURLM_OK );
         /*fprintf( stderr, "-1 io_events to %d\n", --num_events );*/
     }
 

diff --git a/third-party/macosx-libevent-config.h b/third-party/macosx-libevent-config.h
index e34ec1d1d252a268e3cf1e45647c3f4495478b92..3bbd560d745f30c7ff5c4ae239ab5280b8e63b21 100644 (file)
--- a/third-party/macosx-libevent-config.h
+++ b/third-party/macosx-libevent-config.h
@@ -50,7 +50,7 @@
 #define HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the `kqueue' function. */
-#define HAVE_KQUEUE 1
+/* #define HAVE_KQUEUE 1 */
 
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 /* #undef HAVE_LIBNSL */
@@ -194,7 +194,7 @@
 #define HAVE_VASPRINTF 1
 
 /* Define if kqueue works correctly with pipes */
-#define HAVE_WORKING_KQUEUE 1
+/* #define HAVE_WORKING_KQUEUE 1 */
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */

diff --git a/third-party/macosx-libevent-event-config.h b/third-party/macosx-libevent-event-config.h
index 5d2199b69d0e80048c07fcc12b23e3a2043c9075..d30a34af9d1cff8e74ddd7eac063ab5e580bd227 100644 (file)
--- a/third-party/macosx-libevent-event-config.h
+++ b/third-party/macosx-libevent-event-config.h
@@ -57,7 +57,7 @@
 #define _EVENT_HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the `kqueue' function. */
-#define _EVENT_HAVE_KQUEUE 1
+/* #define _EVENT_HAVE_KQUEUE 1 */
 
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 /* #undef _EVENT_HAVE_LIBNSL */
@@ -201,7 +201,7 @@
 #define _EVENT_HAVE_VASPRINTF 1
 
 /* Define if kqueue works correctly with pipes */
-#define _EVENT_HAVE_WORKING_KQUEUE 1
+/* #define _EVENT_HAVE_WORKING_KQUEUE 1 */
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */