mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2025-01-13 13:17:36 +03:00
598785 Fix nanohttp on Windows
* nanohttp.c: the check for socket comparing to FD_SETSIZE introduced in bug fix for 559501 breaks on WinSockAPI
This commit is contained in:
parent
f3c06692e0
commit
d29a5c8a5c
@ -478,8 +478,10 @@ xmlNanoHTTPSend(xmlNanoHTTPCtxtPtr ctxt, const char *xmt_ptr, int outlen)
|
||||
* to retrying.
|
||||
*/
|
||||
#ifndef HAVE_POLL_H
|
||||
#ifndef _WINSOCKAPI_
|
||||
if (ctxt->fd > FD_SETSIZE)
|
||||
return -1;
|
||||
#endif
|
||||
|
||||
tv.tv_sec = timeout;
|
||||
tv.tv_usec = 0;
|
||||
@ -600,8 +602,10 @@ xmlNanoHTTPRecv(xmlNanoHTTPCtxtPtr ctxt)
|
||||
)
|
||||
return (0);
|
||||
#else /* !HAVE_POLL_H */
|
||||
#ifndef _WINSOCKAPI_
|
||||
if (ctxt->fd > FD_SETSIZE)
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
tv.tv_sec = timeout;
|
||||
tv.tv_usec = 0;
|
||||
@ -938,8 +942,10 @@ xmlNanoHTTPConnectAttempt(struct sockaddr *addr)
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 4018)
|
||||
#endif
|
||||
#ifndef _WINSOCKAPI_
|
||||
if (s > FD_SETSIZE)
|
||||
return -1;
|
||||
#endif
|
||||
FD_ZERO(&wfd);
|
||||
FD_SET(s, &wfd);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user