fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master'

Browse source 
Conflicts:
	src/cc/Httpd.cpp
This commit is contained in:
BenDroid 2018-03-02 20:49:05 +01:00
commit 887bdbeace
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/3rdparty/cpp-httplib/httplib.h vendored
View file

@ -358,7 +358,7 @@ socket_t create_socket(const char* host, int port, Fn fn, int socket_flags = 0)
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&yes, sizeof(yes)); setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&yes, sizeof(yes));
struct timeval timeout; struct timeval timeout;
timeout.tv_sec = 5; timeout.tv_sec = 10;
timeout.tv_usec = 0; timeout.tv_usec = 0;
setsockopt (sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout)); setsockopt (sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout));