Fixed issue awwit#6

awwit · awwit · commit d824fe72fe13 · 2018-07-30T15:31:31.000+03:00
diff --git a/src/server/protocol/extensions/Sendfile.cpp b/src/server/protocol/extensions/Sendfile.cpp
@@ -221,7 +221,8 @@ namespace HttpServer
 		additionalHeaders.emplace_back("last-modified", Utils::getDatetimeAsString(fileTime, true) );
 
 		// Отправить заголовки (206 Partial Content)
-		if (prot.sendHeaders(
+		if (
+			prot.sendHeaders(
 				Http::StatusCode::PARTIAL_CONTENT,
 				additionalHeaders,
 				req.timeout,
@@ -377,7 +378,8 @@ namespace HttpServer
 		additionalHeaders.emplace_back("last-modified", Utils::getDatetimeAsString(file_time, true) );
 
 		// Отправить заголовки (200 OK)
-		if (prot.sendHeaders(
+		if (
+			prot.sendHeaders(
 				Http::StatusCode::OK,
 				additionalHeaders,
 				req.timeout,
diff --git a/src/socket/Socket.cpp b/src/socket/Socket.cpp
@@ -103,17 +103,21 @@ namespace Socket
 	}
 
 	bool Socket::bind(const int port) const noexcept {
+		// GCC bug with global namespace: https://bbs.archlinux.org/viewtopic.php?id=53751
+		auto const net_port = htons(static_cast<uint16_t>(port));
+		auto const net_addr = ::htonl(INADDR_ANY);
+
 		const ::sockaddr_in sock_addr {
 			AF_INET,
-			::htons(port),
-			::htonl(INADDR_ANY),
-			0
+			net_port,
+			{ net_addr },
+			{ 0 } // sin_zero
 		};
 
 		return 0 == ::bind(
 			this->socket_handle,
-			reinterpret_cast<const sockaddr *>(&sock_addr),
-			sizeof(sockaddr_in)
+			reinterpret_cast<const ::sockaddr *>(&sock_addr),
+			sizeof(::sockaddr_in)
 		);
 	}
 
@@ -147,9 +151,9 @@ namespace Socket
 	#ifdef WIN32
 		WSAPOLLFD event {
 			this->socket_handle,
-            POLLRDNORM,
-            0
-        };
+			POLLRDNORM,
+			0
+		};
 
 		if (1 == ::WSAPoll(&event, 1, ~0) && event.revents & POLLRDNORM) {
 			client_socket = ::accept(
@@ -161,9 +165,9 @@ namespace Socket
 	#elif POSIX
 		struct ::pollfd event {
 			this->socket_handle,
-            POLLIN,
-            0
-        };
+			POLLIN,
+			0
+		};
 
 		if (1 == ::poll(&event, 1, ~0) && event.revents & POLLIN) {
 			client_socket = ::accept(
