GC - fix handling of attachment ranges, http access token expiration, lock file retry logic (#766)

* GC - fix handling of attachment ranges
* fix trace/log strings
* fix HTTP access token expiration time logic
* added missing lock retry in zenserver startup

1 files changed, 6 insertions, 3 deletions

diff --git a/src/zenhttp/servers/httpparser.cpp b/src/zenhttp/servers/httpparser.cpp
index be5befcd2..f0485aa25 100644
--- a/src/zenhttp/servers/httpparser.cpp
+++ b/src/zenhttp/servers/httpparser.cpp
@@ -226,6 +226,8 @@ NormalizeUrlPath(std::string_view InUrl, std::string& NormalizedUrl)
 				NormalizedUrl.append(Url, UrlIndex);
 			}
 
+			// NOTE: this check is redundant given the enclosing if,
+			// need to verify the intent of this code
 			if (!LastCharWasSeparator)
 			{
 				NormalizedUrl.push_back('/');
@@ -310,6 +312,7 @@ HttpRequestParser::OnHeadersComplete()
 
 			if (ContentLength)
 			{
+				// TODO: should sanity-check content length here
 				m_BodyBuffer = IoBuffer(ContentLength);
 			}
 
@@ -329,9 +332,9 @@ HttpRequestParser::OnHeadersComplete()
 int
 HttpRequestParser::OnBody(const char* Data, size_t Bytes)
 {
-	if (m_BodyPosition + Bytes > m_BodyBuffer.Size())
+	if ((m_BodyPosition + Bytes) > m_BodyBuffer.Size())
 	{
-		ZEN_WARN("HTTP parser incoming body is larger than content size, need {} more bytes",
+		ZEN_WARN("HTTP parser incoming body is larger than content size, need {} more buffer bytes",
 				 (m_BodyPosition + Bytes) - m_BodyBuffer.Size());
 		return 1;
 	}
@@ -342,7 +345,7 @@ HttpRequestParser::OnBody(const char* Data, size_t Bytes)
 	{
 		if (m_BodyPosition != m_BodyBuffer.Size())
 		{
-			ZEN_WARN("Body mismatch! {} != {}", m_BodyPosition, m_BodyBuffer.Size());
+			ZEN_WARN("Body size mismatch! {} != {}", m_BodyPosition, m_BodyBuffer.Size());
 			return 1;
 		}
 	}