HttpServer ignore requests with malformed request line (no method or …

…URI)
aslze · Nov 11, 2024 · 34fc204 · 34fc204
1 parent 2cac658
commit 34fc204
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/include/asl/Mutex.h b/include/asl/Mutex.h
@@ -384,7 +384,7 @@ A Lock is an automatic locker/unlocker of a Mutex. Locks the mutex on constructi
 Mutex mutex;
 void do_something_sync()
 {
-	Lock lock(mutex);
+	Lock _(mutex);
 	do_something();
 }
 ~~~

diff --git a/include/asl/Xml.h b/include/asl/Xml.h
@@ -326,9 +326,8 @@ class ASL_API Xml : public NodeBase
 
 	/**
 	Changes the tag name of this element
-	\deprecated Why would anyone do this?
 	*/
-	ASL_DEPRECATED(void setTag(const String& tag), "Seems unneeded")
+	void setTag(const String& tag)
 	{
 		_()->tag = tag;
 	}

diff --git a/src/Http.cpp b/src/Http.cpp
@@ -298,7 +298,7 @@ void HttpMessage::readBody()
 	while (!end)
 	{
 		int av = _socket->available();
-		if (av < 0 || !_socket->waitInput()) {
+		if (av < 0 || !_socket->waitInput(10)) {
 			break;
 		}
 		byte buffer[RECV_BLOCK_SIZE];

diff --git a/src/HttpServer.cpp b/src/HttpServer.cpp
@@ -51,7 +51,7 @@ void HttpServer::serve(Socket client)
 			continue;
 
 		HttpRequest request(client);
-		if (client.error())
+		if (client.error() || !request.method().ok() || !request.path().ok() || !request.protocol().ok())
 			break;
 
 		String hconn = request.header("Connection").toLowerCase();