Merged latest from main

1 files changed, 35 insertions, 3 deletions

diff --git a/zenhttp/httpserver.cpp b/zenhttp/httpserver.cpp
index 599c99a18..795e81ea8 100644
--- a/zenhttp/httpserver.cpp
+++ b/zenhttp/httpserver.cpp
@@ -128,6 +128,30 @@ HttpContentType (*ParseContentType)(const std::string_view& ContentTypeString) =
 
 //////////////////////////////////////////////////////////////////////////
 
+const std::string_view
+ToString(HttpVerb Verb)
+{
+	switch (Verb)
+	{
+		case HttpVerb::kGet:
+			return "GET"sv;
+		case HttpVerb::kPut:
+			return "PUT"sv;
+		case HttpVerb::kPost:
+			return "POST"sv;
+		case HttpVerb::kDelete:
+			return "DELETE"sv;
+		case HttpVerb::kHead:
+			return "HEAD"sv;
+		case HttpVerb::kCopy:
+			return "COPY"sv;
+		case HttpVerb::kOptions:
+			return "OPTIONS"sv;
+		default:
+			return "???"sv;
+	}
+}
+
 const char*
 ReasonStringForHttpResultCode(int HttpCode)
 {
@@ -295,9 +319,17 @@ HttpServerRequest::WriteResponse(HttpResponseCode ResponseCode, CbPackage Data)
 void
 HttpServerRequest::WriteResponse(HttpResponseCode ResponseCode, CbObject Data)
 {
-	SharedBuffer			Buf = Data.GetBuffer();
-	std::array<IoBuffer, 1> Buffers{IoBufferBuilder::MakeCloneFromMemory(Buf.GetData(), Buf.GetSize())};
-	return WriteResponse(ResponseCode, HttpContentType::kCbObject, Buffers);
+	if (m_AcceptType == HttpContentType::kJSON)
+	{
+		ExtendableStringBuilder<1024> Sb;
+		WriteResponse(ResponseCode, HttpContentType::kJSON, Data.ToJson(Sb).ToView());
+	}
+	else
+	{
+		SharedBuffer			Buf = Data.GetBuffer();
+		std::array<IoBuffer, 1> Buffers{IoBufferBuilder::MakeCloneFromMemory(Buf.GetData(), Buf.GetSize())};
+		return WriteResponse(ResponseCode, HttpContentType::kCbObject, Buffers);
+	}
 }
 
 void