Quick test of naett's libcurl backend

Author: hrydgard

CMakeLists.txt

@@ -240,7 +240,7 @@ else()
 	set(CoreLinkType STATIC)
 endif()
 
-if(NOT ANDROID AND NOT WIN32 AND (NOT APPLE OR IOS))
+if(NOT ANDROID AND NOT WIN32 AND (NOT APPLE OR IOS) AND NOT LINUX)
 	set(HTTPS_NOT_AVAILABLE ON)
 endif()
 
@@ -2489,6 +2489,9 @@ endif()
 
 if(NOT HTTPS_NOT_AVAILABLE)
 	target_link_libraries(${CoreLibName} naett)
+	if(LINUX AND NOT ANDROID)
+		target_link_libraries(${CoreLibName} curl)
+	endif()
 endif()
 
 target_compile_features(${CoreLibName} PUBLIC cxx_std_17)

Common/File/FileDescriptor.cpp

@@ -92,6 +92,7 @@ bool WaitUntilReady(int fd, double timeout, bool for_write) {
 		// Timeout.
 		return false;
 	} else {
+		INFO_LOG(Log::IO, "WaitUntilReady succeeded");
 		// Socket is ready.
 		return true;
 	}

Common/Net/HTTPClient.cpp

@@ -345,7 +345,7 @@ int Client::SendRequestWithData(const char *method, const RequestParams &req, st
 		"Accept: %s\r\n"
 		"Connection: close\r\n"
 		"%s"
-		"\r\n";
+		"\r\n\r\n";
 
 	buffer.Printf(tpl,
 		method, req.resource.c_str(), HTTP_VERSION,
@@ -354,8 +354,10 @@ int Client::SendRequestWithData(const char *method, const RequestParams &req, st
 		req.acceptMime,
 		otherHeaders ? otherHeaders : "");
 	buffer.Append(data);
+
 	bool flushed = buffer.FlushSocket(sock(), dataTimeout_, progress->cancelled);
 	if (!flushed) {
+		WARN_LOG(Log::HTTP, "SendRequestWithData failed: resource: %s agent=%s", req.resource.c_str(), userAgent_.c_str());
 		return -1;  // TODO error code.
 	}
 	return 0;

Common/Net/NetBuffer.cpp

@@ -46,7 +46,7 @@ bool Buffer::FlushSocket(uintptr_t sock, double timeout, bool *cancelled) {
 			int sent = send(sock, &data[pos], end - pos, MSG_NOSIGNAL);
 			// TODO: Do we need some retry logic here, instead of just giving up?
 			if (sent < 0) {
-				ERROR_LOG(Log::IO, "FlushSocket failed to send: %d", errno);
+				ERROR_LOG(Log::IO, "FlushSocket failed to send: %d (%s)", errno, strerror(errno));
 				return false;
 			}
 			pos += sent;

Core/RetroAchievements.cpp

@@ -618,6 +618,7 @@ void Initialize() {
 	// Provide a logging function to simplify debugging
 	rc_client_enable_logging(g_rcClient, RC_CLIENT_LOG_LEVEL_VERBOSE, log_message_callback);
 	if (!System_GetPropertyBool(SYSPROP_SUPPORTS_HTTPS)) {
+		INFO_LOG(Log::Achievements, "Falling back to HTTP host, no HTTPS support detected");
 		// Disable SSL if not supported by our platform implementation.
 		rc_client_set_host(g_rcClient, "http://retroachievements.org");
 	}