Merge pull request #2915 from vijaykota/feature

HttpClient xplat: Fix bugs in polling and callback logic

Author: stephentoub

src/Common/src/Interop/Unix/libcurl/Interop.SafeCurlHandle.cs

@@ -117,7 +117,7 @@ internal void PollFds(List<libc.pollfd> readyFds)
                     // Whenever an fd is added/removed in _fdSet, a write happens to the
                     // write end of the pipe thus causing the poll to return.
                     pollFds[0].fd = _specialFds[libc.ReadEndOfPipe];
-                    pollFds[0].events = PollFlags.POLLIN | PollFlags.POLLOUT;
+                    pollFds[0].events = PollFlags.POLLIN;
                     int i = 1;
                     foreach (int fd in _fdSet)
                     {
@@ -176,7 +176,6 @@ internal void PollFds(List<libc.pollfd> readyFds)
             internal void SignalFdSetChange(int fd, bool isRemove)
             {
                 Debug.Assert(Monitor.IsEntered(this));
-
                 bool changed = isRemove ? _fdSet.Remove(fd) : _fdSet.Add(fd);
                 if (!changed)
                 {
@@ -227,6 +226,7 @@ private int ReadSpecialFd(PollFlags revents)
                 {
                     return -1;
                 }
+                Debug.Assert((revents & PollFlags.POLLIN) != 0);
                 int pipeReadFd = _specialFds[libc.ReadEndOfPipe];
                 int bytesRead = 0;
                 unsafe

src/Common/src/Interop/Unix/libcurl/Interop.libcurl.cs

@@ -25,13 +25,13 @@ public static extern int curl_global_init(
         public static extern void curl_multi_cleanup(
             IntPtr handle);
 
-        [DllImport(Interop.Libraries.LibCurl, CharSet = CharSet.Ansi)]
+        [DllImport(Interop.Libraries.LibCurl)]
         public static extern int curl_multi_setopt(
             SafeCurlMultiHandle multi_handle,
             int option,
             curl_socket_callback value);
 
-        [DllImport(Interop.Libraries.LibCurl, CharSet = CharSet.Ansi)]
+        [DllImport(Interop.Libraries.LibCurl)]
         public static extern int curl_multi_setopt(
             SafeCurlMultiHandle multi_handle,
             int option,
@@ -155,5 +155,5 @@ public static extern void curl_slist_free_all(
 
         [DllImport(Interop.Libraries.LibCurl)]
         public static extern IntPtr curl_version_info(int curlVersionStamp);
-    }
+ }
 }

src/System.Net.Http/src/System/Net/Http/Unix/CurlCallbacks.cs

@@ -371,8 +371,6 @@ private static int CurlSocketCallback(
                 }
             }
 
-            CheckForCompletedTransfers(state.SessionHandle);
-
             return retVal;
         }