style: misc changes
This commit is contained in:
+1
-15
@@ -94,7 +94,7 @@ namespace
|
|||||||
search += ":";
|
search += ":";
|
||||||
|
|
||||||
size_t pos = h_lower.find(search);
|
size_t pos = h_lower.find(search);
|
||||||
if (pos == std::string::npos) return ""; // Not found
|
if (pos == std::string::npos) return "";
|
||||||
|
|
||||||
size_t vStart = pos + search.length();
|
size_t vStart = pos + search.length();
|
||||||
while (vStart < headers.size() && (headers[vStart] == ' ' || headers[vStart] == '\t'))
|
while (vStart < headers.size() && (headers[vStart] == ' ' || headers[vStart] == '\t'))
|
||||||
@@ -379,9 +379,7 @@ void Proxy::handleClient(SOCKET hClientSocket)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
|
||||||
clientStream.reset();
|
clientStream.reset();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -440,13 +438,9 @@ void Proxy::handleClient(SOCKET hClientSocket)
|
|||||||
safe_stoi(h_lower.substr(vStart, h_lower.find("\r\n", vStart) - vStart), -1);
|
safe_stoi(h_lower.substr(vStart, h_lower.find("\r\n", vStart) - vStart), -1);
|
||||||
}
|
}
|
||||||
else if (sCode == 204 || sCode == 304 || sCode == 205)
|
else if (sCode == 204 || sCode == 304 || sCode == 205)
|
||||||
{
|
|
||||||
serverStream.contentLength = 0;
|
serverStream.contentLength = 0;
|
||||||
}
|
|
||||||
else if (!serverStream.isChunked)
|
else if (!serverStream.isChunked)
|
||||||
{
|
|
||||||
serverStream.contentLength = -1;
|
serverStream.contentLength = -1;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (serverStream.isReceivingBody)
|
if (serverStream.isReceivingBody)
|
||||||
@@ -493,9 +487,7 @@ void Proxy::handleClient(SOCKET hClientSocket)
|
|||||||
processed = serverStream.buffer.size();
|
processed = serverStream.buffer.size();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
|
||||||
complete = false;
|
complete = false;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (serverStream.contentLength >= 0)
|
else if (serverStream.contentLength >= 0)
|
||||||
@@ -522,9 +514,7 @@ void Proxy::handleClient(SOCKET hClientSocket)
|
|||||||
body = serverStream.buffer.substr(bStart);
|
body = serverStream.buffer.substr(bStart);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
|
||||||
complete = false;
|
complete = false;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (complete)
|
if (complete)
|
||||||
@@ -542,10 +532,8 @@ void Proxy::handleClient(SOCKET hClientSocket)
|
|||||||
removeHeader(respHeaders, "Transfer-Encoding");
|
removeHeader(respHeaders, "Transfer-Encoding");
|
||||||
removeHeader(respHeaders, "Content-Length");
|
removeHeader(respHeaders, "Content-Length");
|
||||||
if (sc != 204 && sc != 304 && sc != 205)
|
if (sc != 204 && sc != 304 && sc != 205)
|
||||||
{
|
|
||||||
respHeaders.insert(respHeaders.size() - 2,
|
respHeaders.insert(respHeaders.size() - 2,
|
||||||
"Content-Length: " + std::to_string(body.size()) + "\r\n");
|
"Content-Length: " + std::to_string(body.size()) + "\r\n");
|
||||||
}
|
|
||||||
|
|
||||||
std::string packet = respHeaders + body;
|
std::string packet = respHeaders + body;
|
||||||
SSL_write(clientSSL, packet.data(), (int)packet.size());
|
SSL_write(clientSSL, packet.data(), (int)packet.size());
|
||||||
@@ -555,9 +543,7 @@ void Proxy::handleClient(SOCKET hClientSocket)
|
|||||||
clientStream.reset();
|
clientStream.reset();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (connectionClosed) break;
|
if (connectionClosed) break;
|
||||||
|
|||||||
Reference in New Issue
Block a user