X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=9cacc1f0041e8ebccbaccf6c101c35d82a7c899a;hp=715e31c4a162f8d9ce168969901ae3ca4253a8c9;hb=d5f3f941faaf113936113fc2105bf59913e9125e;hpb=7ec54788f88dde7b083ba6cfd30732b32295b54a

diff --git a/httpinput.cpp b/httpinput.cpp
index 715e31c..9cacc1f 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -153,24 +153,14 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 
 	// Connect to everything in turn until we have a socket.
 	for ( ; ai && !should_stop(); ai = ai->ai_next) {
-		int sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+		// Now do a non-blocking connect. This is important because we want to be able to be
+		// woken up, even though it's rather cumbersome.
+		int sock = socket(ai->ai_family, SOCK_STREAM | SOCK_NONBLOCK, IPPROTO_TCP);
 		if (sock == -1) {
 			// Could be e.g. EPROTONOSUPPORT. The show must go on.
 			continue;
 		}
 
-		// Now do a non-blocking connect. This is important because we want to be able to be
-		// woken up, even though it's rather cumbersome.
-
-		// Set the socket as nonblocking.
-		int one = 1;
-		if (ioctl(sock, FIONBIO, &one) == -1) {
-			log_perror("ioctl(FIONBIO)");
-			safe_close(sock);
-			freeaddrinfo(base_ai);
-			return -1;			
-		}
-
 		// Do a non-blocking connect.
 		do {
 			err = connect(sock, ai->ai_addr, ai->ai_addrlen);
@@ -381,16 +371,10 @@ void HTTPInput::do_work()
 			++num_connection_attempts;
 			sock = lookup_and_connect(host, port);
 			if (sock != -1) {
-				// Yay, successful connect. Try to set it as nonblocking.
-				int one = 1;
-				if (ioctl(sock, FIONBIO, &one) == -1) {
-					log_perror("ioctl(FIONBIO)");
-					state = CLOSING_SOCKET;
-				} else {
-					state = SENDING_REQUEST;
-					request = "GET " + path + " HTTP/1.0\r\nHost: " + host_header(host, port) + "\r\nUser-Agent: cubemap\r\n\r\n";
-					request_bytes_sent = 0;
-				}
+				// Yay, successful connect.
+				state = SENDING_REQUEST;
+				request = "GET " + path + " HTTP/1.0\r\nHost: " + host_header(host, port) + "\r\nUser-Agent: cubemap\r\n\r\n";
+				request_bytes_sent = 0;
 
 				lock_guard<mutex> lock(stats_mutex);
 				stats.connect_time = time(nullptr);