diff --git a/ChangeLog b/ChangeLog
index 5320332..34c5c6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -332,6 +332,11 @@ Version 1.8.0
 Version 1.6.18
 *******************************************************************************
 
+2012-05-25 Anoop Mohan <anoop.anoop(at)gmail.com>
+
+	This patch fixes a bug in non blocking connect call where the sock
+	option length for SO_ERROR was passed as 0 instead of sizeof(int).
+
 2012-04-24 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
 
 	Disable SetGenaCallback call if device is disabled.
diff --git a/THANKS b/THANKS
index 4bacd2b..e2a6f8f 100644
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ exempt of errors.
 
 - Alex (afaucher)
 - Andre Sodermans (wienerschnitzel)
+- Anoop Mohan (an00p)
 - Anthony Viallard (homer242)
 - Apostolos Syropoulos
 - Arno Willig
diff --git a/upnp/src/genlib/net/http/httpreadwrite.c b/upnp/src/genlib/net/http/httpreadwrite.c
index 044c18f..b872ede 100644
--- a/upnp/src/genlib/net/http/httpreadwrite.c
+++ b/upnp/src/genlib/net/http/httpreadwrite.c
@@ -126,7 +126,7 @@ static int Check_Connect_And_Wait_Connection(
 #ifndef WIN32
 			} else {
 				int valopt = 0;
-				socklen_t len = 0;
+				socklen_t len = sizeof(valopt);
 				if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (void *) &valopt, &len) < 0) {
 					/* failed to read delayed error */
 					return -1;