Module Name: src
Committed By: christos
Date: Fri Apr 12 20:02:00 UTC 2013
Modified Files:
src/external/bsd/libevent/dist: evutil.c
Log Message:
undo previous, breaks differently when testing for EINPROGRESS.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libevent/dist/evutil.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libevent/dist/evutil.c
diff -u src/external/bsd/libevent/dist/evutil.c:1.3 src/external/bsd/libevent/dist/evutil.c:1.4
--- src/external/bsd/libevent/dist/evutil.c:1.3 Fri Apr 12 15:41:45 2013
+++ src/external/bsd/libevent/dist/evutil.c Fri Apr 12 16:02:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: evutil.c,v 1.3 2013/04/12 19:41:45 christos Exp $ */
+/* $NetBSD: evutil.c,v 1.4 2013/04/12 20:02:00 christos Exp $ */
/*
* Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
*
@@ -27,7 +27,7 @@
#include "event2/event-config.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: evutil.c,v 1.3 2013/04/12 19:41:45 christos Exp $");
+__RCSID("$NetBSD: evutil.c,v 1.4 2013/04/12 20:02:00 christos Exp $");
#define _GNU_SOURCE
@@ -483,15 +483,6 @@ evutil_socket_connect(evutil_socket_t *f
if (connect(*fd_ptr, sa, socklen) < 0) {
int e = evutil_socket_geterror(*fd_ptr);
-#ifdef __NetBSD__
- if (e == EINPROGRESS) {
- socklen_t l = sizeof(e);
- l = sizeof(e);
- if (getsockopt(*fd_ptr, SOL_SOCKET, SO_ERROR,
- (void*)&e, &l) == -1)
- abort();
- }
-#endif
if (EVUTIL_ERR_CONNECT_RETRIABLE(e))
return 0;
if (EVUTIL_ERR_CONNECT_REFUSED(e))
