Rename HttpRequest::stream to bodyStream

SmingHub · Oct 21, 2018 · 805c337 · 805c337
1 parent 60ee87f
commit 805c337
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/Sming/SmingCore/Network/Http/HttpConnection.cpp b/Sming/SmingCore/Network/Http/HttpConnection.cpp
@@ -476,24 +476,24 @@ void HttpConnection::sendRequestHeaders(HttpRequest* request)
 			new MultipartStream(HttpPartProducerDelegate(&HttpConnection::multipartProducer, this));
 		request->headers[HTTP_HEADER_CONTENT_TYPE] =
 			ContentType::toString(MIME_FORM_MULTIPART) + _F("; boundary=") + mStream->getBoundary();
-		if(request->stream) {
+		if(request->bodyStream) {
 			debug_e("HttpConnection: existing stream is discarded due to POST params");
-			delete request->stream;
+			delete request->bodyStream;
 		}
-		request->stream = mStream;
+		request->bodyStream = mStream;
 	} else if(request->postParams.count()) {
 		UrlencodedOutputStream* uStream = new UrlencodedOutputStream(request->postParams);
 		request->headers[HTTP_HEADER_CONTENT_TYPE] = ContentType::toString(MIME_FORM_URL_ENCODED);
-		if(request->stream) {
+		if(request->bodyStream) {
 			debug_e("HttpConnection: existing stream is discarded due to POST params");
-			delete request->stream;
+			delete request->bodyStream;
 		}
-		request->stream = uStream;
+		request->bodyStream = uStream;
 	} /* if (request->postParams.count()) */
 
-	if(request->stream != nullptr) {
-		if(request->stream->available() > -1) {
-			request->headers[HTTP_HEADER_CONTENT_LENGTH] = String(request->stream->available());
+	if(request->bodyStream != nullptr) {
+		if(request->bodyStream->available() > -1) {
+			request->headers[HTTP_HEADER_CONTENT_LENGTH] = String(request->bodyStream->available());
 		} else {
 			request->headers.remove(HTTP_HEADER_CONTENT_LENGTH);
 		}
@@ -515,17 +515,17 @@ bool HttpConnection::sendRequestBody(HttpRequest* request)
 	if(state == eHCS_StartBody) {
 		state = eHCS_SendingBody;
 
-		if(request->stream == nullptr) {
+		if(request->bodyStream == nullptr) {
 			return true;
 		}
 
 		delete stream;
 		if(request->headers[HTTP_HEADER_TRANSFER_ENCODING] == _F("chunked")) {
-			stream = new ChunkedStream(request->stream);
+			stream = new ChunkedStream(request->bodyStream);
 		} else {
-			stream = request->stream; // avoid intermediate buffers
+			stream = request->bodyStream; // avoid intermediate buffers
 		}
-		request->stream = nullptr;
+		request->bodyStream = nullptr;
 		return false;
 	}
 
@@ -534,7 +534,7 @@ bool HttpConnection::sendRequestBody(HttpRequest* request)
 		return true;
 	}
 
-	if(request->stream == nullptr && !stream->isFinished()) {
+	if(request->bodyStream == nullptr && !stream->isFinished()) {
 		return false;
 	}
 

diff --git a/Sming/SmingCore/Network/Http/HttpRequest.cpp b/Sming/SmingCore/Network/Http/HttpRequest.cpp
@@ -159,15 +159,15 @@ String HttpRequest::getQueryParameter(const String& parameterName, const String&
 
 String HttpRequest::getBody()
 {
-	if(stream == nullptr) {
+	if(bodyStream == nullptr) {
 		return "";
 	}
 
 	String ret;
-	if(stream->available() != -1 && stream->getStreamType() == eSST_Memory) {
-		MemoryDataStream* memory = (MemoryDataStream*)stream;
+	if(bodyStream->available() != -1 && bodyStream->getStreamType() == eSST_Memory) {
+		MemoryDataStream* memory = (MemoryDataStream*)bodyStream;
 		char buf[1024];
-		while(stream->available() > 0) {
+		while(bodyStream->available() > 0) {
 			int available = memory->readMemoryBlock(buf, 1024);
 			memory->seek(available);
 			ret += String(buf, available);
@@ -181,7 +181,7 @@ String HttpRequest::getBody()
 
 ReadWriteStream* HttpRequest::getBodyStream()
 {
-	return stream;
+	return bodyStream;
 }
 
 HttpRequest* HttpRequest::setResponseStream(ReadWriteStream* stream)
@@ -240,13 +240,13 @@ HttpRequest* HttpRequest::setBody(uint8_t* rawData, size_t length)
 
 HttpRequest* HttpRequest::setBody(ReadWriteStream* stream)
 {
-	if(this->stream != nullptr) {
+	if(this->bodyStream != nullptr) {
 		debug_e("HttpRequest::setBody: Discarding already set stream!");
-		delete this->stream;
-		this->stream = nullptr;
+		delete this->bodyStream;
+		this->bodyStream = nullptr;
 	}
 
-	this->stream = stream;
+	this->bodyStream = stream;
 	return this;
 }
 
@@ -271,10 +271,10 @@ HttpRequest* HttpRequest::onRequestComplete(RequestCompletedDelegate delegateFun
 void HttpRequest::reset()
 {
 	delete queryParams;
-	delete stream;
+	delete bodyStream;
 	delete responseStream;
 	queryParams = nullptr;
-	stream = nullptr;
+	bodyStream = nullptr;
 	responseStream = nullptr;
 
 	postParams.clear();
@@ -307,8 +307,8 @@ String HttpRequest::toString()
 		content += headers[i];
 	}
 
-	if(stream != nullptr && stream->available() >= 0) {
-		content += headers.toString(HTTP_HEADER_CONTENT_LENGTH, String(stream->available()));
+	if(bodyStream != nullptr && bodyStream->available() >= 0) {
+		content += headers.toString(HTTP_HEADER_CONTENT_LENGTH, String(bodyStream->available()));
 	}
 
 	return content;

diff --git a/Sming/SmingCore/Network/Http/HttpRequest.h b/Sming/SmingCore/Network/Http/HttpRequest.h
@@ -169,7 +169,7 @@ class HttpRequest
 	RequestBodyDelegate requestBodyDelegate;
 	RequestCompletedDelegate requestCompletedDelegate;
 
-	ReadWriteStream* stream = nullptr;
+	ReadWriteStream* bodyStream = nullptr;
 	ReadWriteStream* responseStream = nullptr;
 
 #ifdef ENABLE_HTTP_REQUEST_AUTH