Merge branch 'main' of https://github.com/EpicGames/zen

2 files changed, 4 insertions, 1 deletions

diff --git a/zencore/include/zencore/httpserver.h b/zencore/include/zencore/httpserver.h
index 2158f87a8..d4d9e21e0 100644
--- a/zencore/include/zencore/httpserver.h
+++ b/zencore/include/zencore/httpserver.h
@@ -222,6 +222,9 @@ public:
 		This will return a null buffer if the contents are not fully available yet, and the handler should
 		at that point return - another completion request will be issued once the contents have been received
 		fully.
+
+		NOTE: in practice, via the http.sys implementation this always operates synchronously. This should
+		be updated to provide fully asynchronous operation for better scalability on shared instances
 	  */
 	virtual IoBuffer ReadPayload() = 0;
 
diff --git a/zencore/include/zencore/memory.h b/zencore/include/zencore/memory.h
index 040f97025..5a324955d 100644
--- a/zencore/include/zencore/memory.h
+++ b/zencore/include/zencore/memory.h
@@ -53,7 +53,7 @@ public:
 	inline void		  Free(void* Ptr) { ZEN_UNUSED(Ptr); /* no-op */ }
 
 	ChunkingLinearAllocator(const ChunkingLinearAllocator&) = delete;
-	ChunkingLinearAllocator&operator=(const ChunkingLinearAllocator&) = delete;
+	ChunkingLinearAllocator& operator=(const ChunkingLinearAllocator&) = delete;
 
 private:
 	uint8_t*		   m_ChunkCursor	  = nullptr;