X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=f06685ab02224ea654b85d82f09d35a5dc456a5c;hp=60836a74ca52774855f80c2a3ce623545dbc534f;hb=c2c9f6441f9ae8091a39aea0340417d5915e1ac9;hpb=e8740ea38fa1b54672a83744549fcd1463403d98

diff --git a/server.cpp b/server.cpp
index 60836a7..f06685a 100644
--- a/server.cpp
+++ b/server.cpp
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <assert.h>
 #include <arpa/inet.h>
-#include <curl/curl.h>
 #include <sys/socket.h>
 #include <pthread.h>
 #include <sys/types.h>
@@ -362,34 +361,27 @@ read_request_again:
 			return;
 		}
 
-		// Guard against overlong requests gobbling up all of our space.
-		if (client->request.size() + ret > MAX_CLIENT_REQUEST) {
+		RequestParseStatus status = wait_for_double_newline(&client->request, buf, ret);
+	
+		switch (status) {
+		case RP_OUT_OF_SPACE:
 			fprintf(stderr, "WARNING: fd %d sent overlong request!\n", client->sock);
 			close_client(client);
 			return;
-		}	
-
-		// See if we have \r\n\r\n anywhere in the request. We start three bytes
-		// before what we just appended, in case we just got the final character.
-		size_t existing_req_bytes = client->request.size();
-		client->request.append(string(buf, buf + ret));
-	
-		size_t start_at = (existing_req_bytes >= 3 ? existing_req_bytes - 3 : 0);
-		const char *ptr = reinterpret_cast<char *>(
-			memmem(client->request.data() + start_at, client->request.size() - start_at,
-			       "\r\n\r\n", 4));
-		if (ptr == NULL) {
+		case RP_NOT_FINISHED_YET:
 			// OK, we don't have the entire header yet. Fine; we'll get it later.
 			// See if there's more data for us.
 			goto read_request_again;
-		}
-
-		if (ptr != client->request.data() + client->request.size() - 4) {
+		case RP_EXTRA_DATA:
 			fprintf(stderr, "WARNING: fd %d had junk data after request!\n", client->sock);
 			close_client(client);
 			return;
+		case RP_FINISHED:
+			break;
 		}
 
+		assert(status == RP_FINISHED);
+
 		int error_code = parse_request(client);
 		if (error_code == 200) {
 			construct_header(client);