Fix for post size limit in Http library.

1 files changed, 18 insertions, 17 deletions

diff --git a/osdep/Http.cpp b/osdep/Http.cpp
index d2540071..f1d3bfe2 100644
--- a/osdep/Http.cpp
+++ b/osdep/Http.cpp
@@ -112,12 +112,12 @@ struct HttpPhyHandler
 
 	inline void phyOnTcpWritable(PhySocket *sock,void **uptr)
 	{
-		if (writePtr < writeSize) {
-			long n = phy->streamSend(sock,writeBuf + writePtr,writeSize - writePtr,true);
+		if (writePtr < (unsigned long)writeBuf.length()) {
+			long n = phy->streamSend(sock,writeBuf.data() + writePtr,(unsigned long)writeBuf.length() - writePtr,true);
 			if (n > 0)
 				writePtr += n;
 		}
-		if (writePtr >= writeSize)
+		if (writePtr >= (unsigned long)writeBuf.length())
 			phy->setNotifyWritable(sock,false);
 	}
 
@@ -135,8 +135,7 @@ struct HttpPhyHandler
 	unsigned long messageSize;
 	unsigned long writePtr;
 	uint64_t lastActivity;
-	unsigned long writeSize;
-	char writeBuf[32768];
+	std::string writeBuf;
 
 	unsigned long maxResponseSize;
 	std::map<std::string,std::string> *responseHeaders;
@@ -244,24 +243,26 @@ unsigned int Http::_do(
 		handler.lastActivity = OSUtils::now();
 
 		try {
-			handler.writeSize = Utils::snprintf(handler.writeBuf,sizeof(handler.writeBuf),"%s %s HTTP/1.1\r\n",method,path);
-			for(std::map<std::string,std::string>::const_iterator h(requestHeaders.begin());h!=requestHeaders.end();++h)
-				handler.writeSize += Utils::snprintf(handler.writeBuf + handler.writeSize,sizeof(handler.writeBuf) - handler.writeSize,"%s: %s\r\n",h->first.c_str(),h->second.c_str());
-			handler.writeSize += Utils::snprintf(handler.writeBuf + handler.writeSize,sizeof(handler.writeBuf) - handler.writeSize,"\r\n");
-			if ((requestBody)&&(requestBodyLength)) {
-				if ((handler.writeSize + requestBodyLength) > sizeof(handler.writeBuf)) {
-					responseBody = "request too large";
-					return 0;
-				}
-				memcpy(handler.writeBuf + handler.writeSize,requestBody,requestBodyLength);
-				handler.writeSize += requestBodyLength;
+			char tmp[1024];
+			Utils::snprintf(tmp,sizeof(tmp),"%s %s HTTP/1.1\r\n",method,path);
+			handler.writeBuf.append(tmp);
+			for(std::map<std::string,std::string>::const_iterator h(requestHeaders.begin());h!=requestHeaders.end();++h) {
+				Utils::snprintf(tmp,sizeof(tmp),"%s: %s\r\n",h->first.c_str(),h->second.c_str());
+				handler.writeBuf.append(tmp);
 			}
+			handler.writeBuf.append("\r\n");
+			if ((requestBody)&&(requestBodyLength))
+				handler.writeBuf.append((const char *)requestBody,requestBodyLength);
 		} catch ( ... ) {
 			responseBody = "request too large";
 			return 0;
 		}
 
-		handler.maxResponseSize = maxResponseSize;
+		if (maxResponseSize) {
+			handler.maxResponseSize = maxResponseSize;
+		} else {
+			handler.maxResponseSize = 2147483647;
+		}
 		handler.responseHeaders = &responseHeaders;
 		handler.responseBody = &responseBody;
 		handler.error = false;