Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-05 21:20:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

http: Always use non-blocking in http.

Browse Source
This commit is contained in:
Unknown W. Brackets 2021-05-01 09:52:16 -07:00
parent af5618705c
commit f762fbc53d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Common/Net/HTTPClient.cpp
View File

@ -147,7 +147,6 @@ bool Connection::Connect(int maxTries, double timeout, bool *cancelConnect) {
// Something connected. Pick the first one that did (if multiple.)
for (int sock : sockets) {
if ((intptr_t)sock_ == -1 && FD_ISSET(sock, &fds)) {
fd_util::SetNonBlocking(sock, false);
sock_ = sock;
} else {
closesocket(sock);

10
Common/Net/NetBuffer.cpp
View File

@ -1,4 +1,5 @@
#ifdef _WIN32
#include "ppsspp_config.h"
#ifdef _WIN32
#include <winsock2.h>
#undef min
#undef max
@ -69,7 +70,12 @@ bool Buffer::ReadAllWithProgress(int fd, int knownSize, float *progress, bool *c
if (retval == 0) {
return true;
} else if (retval < 0) {
ERROR_LOG(IO, "Error reading from buffer: %i", retval);
#if PPSSPP_PLATFORM(WINDOWS)
if (WSAGetLastError() != WSAEWOULDBLOCK)
#else
if (errno != EWOULDBLOCK)
#endif
ERROR_LOG(IO, "Error reading from buffer: %i", retval);
return false;
}
char *p = Append((size_t)retval);