Skip to content

Commit d0759eb

Browse files
author
Hirose
committed
Fixed socket close problem with VC 2015.
1 parent 5cb0525 commit d0759eb

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

httplib.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,23 +173,19 @@ inline bool read_and_close_socket(socket_t sock, T callback)
173173
{
174174
FILE* fp_read;
175175
FILE* fp_write;
176+
176177
#ifdef _MSC_VER
177-
int osfhandle = _open_osfhandle(sock, _O_RDONLY);
178-
fp_read = _fdopen(osfhandle, "rb");
179-
fp_write = _fdopen(osfhandle, "wb");
178+
fp_read = _fdopen(_open_osfhandle(sock, _O_RDONLY), "rb");
179+
fp_write = _fdopen(_open_osfhandle(sock, _O_WRONLY), "wb");
180180
#else
181181
fp_read = fdopen(sock, "rb");
182182
fp_write = fdopen(sock, "wb");
183183
#endif
184184

185185
auto ret = callback(fp_read, fp_write);
186186

187-
#ifdef _MSC_VER
188-
sock = osfhandle;
189-
#else
190187
fclose(fp_read);
191188
fclose(fp_write);
192-
#endif
193189

194190
return ret;
195191
}

0 commit comments

Comments
 (0)