Bugzilla bug 110868: PR_FileDesc2NativeHandle should look for the NSPR

layer as opposed to assuming the bottom layer is the NSPR layer.

nsprpub/pr/src/io/prsocket.c

@@ -1539,20 +1539,14 @@ failed:
 PR_IMPLEMENT(PRInt32)
 PR_FileDesc2NativeHandle(PRFileDesc *fd)
 {
-	if (fd) {
+    if (fd) {
-		/*
+        fd = PR_GetIdentitiesLayer(fd, PR_NSPR_IO_LAYER);
-		 * The fd may be layered.  Chase the links to the
+    }
-		 * bottom layer to get the osfd.
+    if (!fd) {
-		 */
+        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		PRFileDesc *bottom = fd;
+        return -1;
-		while (bottom->lower != NULL) {
+    }
-			bottom = bottom->lower;
+    return fd->secret->md.osfd;
-		}
-		return bottom->secret->md.osfd;
-	} else {
-		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-		return -1;
-	}
 }
 
 PR_IMPLEMENT(void)