fixed malformed messages

10 years ago · b2e7a53629
parent 86fdd48229
commit b2e7a53629
2 changed files with 7 additions and 11 deletions
--- a/HTTPProxy.cpp
+++ b/HTTPProxy.cpp
@ -63,15 +63,11 @@ namespace proxy
 		request r;
 		ExtractRequest(r);
 		parseHeaders(m_Buffer, r.headers);
-		size_t len = 0;
 		const char * data = strstr (m_Buffer, "\r\n\r\n");	
-		if (data)
-		{	 
-			data += 4;
-			len = strlen (m_Buffer) - (data - m_Buffer);
-		}
+		if (data) data += 4;
+
 		LogPrint("Requesting ", r.host, " with path ", r.uri, " and method ", r.method);
-		HandleDestinationRequest(r.host, r.method, len > 0 ? std::string (data, len) : "" , r.uri);
+		HandleDestinationRequest(r.host, r.method, data ? std::string (data) : "" , r.uri);
 	}

 }
--- a/HTTPServer.cpp
+++ b/HTTPServer.cpp
@ -701,7 +701,7 @@ namespace util
 			if (i2p::data::Base32ToByteStream(address.c_str(), address.length() - strlen(".b32.i2p"), (uint8_t *)destination, 32) != 32)
 			{
 				LogPrint ("Invalid Base32 address ", address);
-				SendReply ("<html>" + itoopieImage + "<br>Invalid Base32 address", 400);
+				SendReply ("<html>" + itoopieImage + "<br>Invalid Base32 address</hmtl>", 400);
 				return;
 			}
 			fullAddress = address;
@ -714,7 +714,7 @@ namespace util
 				if (!addr)
 				{
 					LogPrint ("Unknown address ", address);
-					SendReply ("<html>" + itoopieImage + "<br>Unknown address " + address + "</html>", 105);
+					SendReply ("<html>" + itoopieImage + "<br>Unknown address " + address + "</html>", 404);
 					return;
 				}
 				destination = *addr;
@ -735,7 +735,7 @@ namespace util
 					if (i2p::data::Base32ToByteStream(address.c_str(), address.length(), (uint8_t *)destination, 32) != 32)
 					{
 						LogPrint("Invalid Base32 address ", address);
-						SendReply("<html>" + itoopieImage + "<br>Invalid Base32 address", 400);
+						SendReply("<html>" + itoopieImage + "<br>Invalid Base32 address</hmtl>", 400);
 						return;
 					}
 					fullAddress = address + ".b32.i2p";
@ -766,7 +766,7 @@ namespace util
      					// POST/PUT, apply body
        				request +=  "Content-Length: " ;
        				request += data.size ();
-        				request += "\r\n" + data;
+        				request += "\r\n\r\n" + data;
      			}
      			LogPrint("HTTP Client Request: ", request);
 			m_Stream->Send ((uint8_t *)request.c_str (), request.size (), 10);