vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Nov 17 
21:48:10 2018 +0200| [c87bfccf1930591b210755f8c6bd0b313e2cffb9] | committer: 
Rémi Denis-Courmont

httpd: use vlc_tls_GetPollFD()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c87bfccf1930591b210755f8c6bd0b313e2cffb9
---

 src/network/httpd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 3d7ae0405d..e0f24d7db6 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -1704,7 +1704,6 @@ static void httpdLoop(httpd_host_t *host)
         struct pollfd *pufd = ufd + nfd;
         assert (pufd < ufd + (sizeof (ufd) / sizeof (ufd[0])));
 
-        pufd->fd = vlc_tls_GetFD(cl->sock);
         pufd->events = pufd->revents = 0;
 
         switch (cl->i_state) {
@@ -1926,6 +1925,8 @@ static void httpdLoop(httpd_host_t *host)
                 }
         }
 
+        pufd->fd = vlc_tls_GetPollFD(cl->sock, &pufd->events);
+
         if (pufd->events != 0)
             nfd++;
         else

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to