Revert "Fix #697". (It broke unit test...)

yhirose · yhirose · commit 536e7eb7f2ed · 2020-10-25T20:22:39.000-04:00
This reverts commit 6d66721.
diff --git a/httplib.h b/httplib.h
@@ -6104,12 +6104,12 @@ inline bool SSLClient::initialize_ssl(Socket &socket) {
 }
 
 inline void SSLClient::close_socket(Socket &socket, bool process_socket_ret) {
+  detail::close_socket(socket.sock);
+  socket_.sock = INVALID_SOCKET;
   if (socket.ssl) {
     detail::ssl_delete(ctx_mutex_, socket.ssl, process_socket_ret);
     socket_.ssl = nullptr;
   }
-  detail::close_socket(socket.sock);
-  socket_.sock = INVALID_SOCKET;
 }
 
 inline bool

Original file line number	Diff line number	Diff line change
`@@ -6104,12 +6104,12 @@ inline bool SSLClient::initialize_ssl(Socket &socket) {`
`6104`	`6104`	`}`
`6105`	`6105`
`6106`	`6106`	`inline void SSLClient::close_socket(Socket &socket, bool process_socket_ret) {`
	`6107`	`+ detail::close_socket(socket.sock);`
	`6108`	`+ socket_.sock = INVALID_SOCKET;`
`6107`	`6109`	`if (socket.ssl) {`
`6108`	`6110`	`detail::ssl_delete(ctx_mutex_, socket.ssl, process_socket_ret);`
`6109`	`6111`	`socket_.ssl = nullptr;`
`6110`	`6112`	`}`
`6111`		`- detail::close_socket(socket.sock);`
`6112`		`- socket_.sock = INVALID_SOCKET;`
`6113`	`6113`	`}`
`6114`	`6114`
`6115`	`6115`	`inline bool`