X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=74466c7acbb671f33f4f0fa3a76c77091e324038;hp=478356ef75c4aac7e276a6e4db20189d9ad2a3cc;hb=8a2129f4c808600d6151f724dcbd816188d3d1c6;hpb=a0c402a1dd71070392848b7510420f2ee9d6bd52

diff --git a/httpinput.cpp b/httpinput.cpp
index 478356e..74466c7 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -76,8 +76,8 @@ HTTPInput::HTTPInput(const InputProto &serialized)
 	pending_data.resize(serialized.pending_data().size());
 	memcpy(&pending_data[0], serialized.pending_data().data(), serialized.pending_data().size());
 
-	string protocol;
-	parse_url(url, &protocol, &host, &port, &path);  // Don't care if it fails.
+	string protocol, user;
+	parse_url(url, &protocol, &user, &host, &port, &path);  // Don't care if it fails.
 
 	pthread_mutex_init(&stats_mutex, NULL);
 	stats.url = url;
@@ -340,8 +340,8 @@ void HTTPInput::do_work()
 			}
 
 			{
-				string protocol;  // Thrown away.
-				if (!parse_url(url, &protocol, &host, &port, &path)) {
+				string protocol, user;  // Thrown away.
+				if (!parse_url(url, &protocol, &user, &host, &port, &path)) {
 					log(WARNING, "[%s] Failed to parse URL '%s'", url.c_str(), url.c_str());
 					break;
 				}
@@ -412,7 +412,7 @@ void HTTPInput::do_work()
 			RequestParseStatus status = wait_for_double_newline(&response, buf, ret);
 			
 			if (status == RP_OUT_OF_SPACE) {
-				log(WARNING, "[%s] Sever sent overlong HTTP response!", url.c_str());
+				log(WARNING, "[%s] Server sent overlong HTTP response!", url.c_str());
 				state = CLOSING_SOCKET;
 				continue;
 			} else if (status == RP_NOT_FINISHED_YET) {