[haiku-commits] haiku: hrev47540 - src/kits/network/libnetapi
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 21 Jul 2014 11:49:35 +0200 (CEST)
hrev47540 adds 1 changeset to branch 'master'
old head: 7cd7f2fbf311cfe61d1278825c7e883801516ad6
new head: 9f7d29b05e4322045bb91438fa951fd454df43e0
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=9f7d29b+%5E7cd7f2f
----------------------------------------------------------------------------
9f7d29b: Fix two problems with chunked gzipped HTTP replies.
* receiveEnd is set in a different place in case of chunked transfers,
which would cause the decompressor to never be flushed.
* In the case of chunked transfers, we call Flush() without any input
data (to flush only whatever is remaining in the decompression buffer).
This causes ZLib to return Z_BUF_ERROR which is translated to
B_BUFFER_OVERFLOW. This is a non-fatal error and is expected behavior in
that case. Don't handle this as an error, and do use the extracted data.
Fixes various cases of missing the last chunk of a page (pastie.org,
Google search results, and more).
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47540
Commit: 9f7d29b05e4322045bb91438fa951fd454df43e0
URL: http://cgit.haiku-os.org/haiku/commit/?id=9f7d29b
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Mon Jul 21 09:45:13 2014 UTC
----------------------------------------------------------------------------
2 files changed, 106 insertions(+), 99 deletions(-)
headers/os/net/HttpRequest.h | 1 +
src/kits/network/libnetapi/HttpRequest.cpp | 204 +++++++++++++------------
----------------------------------------------------------------------------
diff --git a/headers/os/net/HttpRequest.h b/headers/os/net/HttpRequest.h
index 4976a10..ccd0f52 100644
--- a/headers/os/net/HttpRequest.h
+++ b/headers/os/net/HttpRequest.h
@@ -68,6 +68,7 @@ private:
void _SendRequest();
void _SendHeaders();
+ void _SendPostData();
status_t _GetLine(BString&
destString);
diff --git a/src/kits/network/libnetapi/HttpRequest.cpp
b/src/kits/network/libnetapi/HttpRequest.cpp
index edf01de..151f157 100644
--- a/src/kits/network/libnetapi/HttpRequest.cpp
+++ b/src/kits/network/libnetapi/HttpRequest.cpp
@@ -484,92 +484,7 @@ BHttpRequest::_MakeRequest()
fSocket->Write("\r\n", 2);
_EmitDebug(B_URL_PROTOCOL_DEBUG_TEXT, "Request sent.");
- if (fRequestMethod == B_HTTP_POST && fOptPostFields != NULL) {
- if (fOptPostFields->GetFormType() != B_HTTP_FORM_MULTIPART) {
- BString outputBuffer = fOptPostFields->RawData();
- _EmitDebug(B_URL_PROTOCOL_DEBUG_TRANSFER_OUT,
- "%s", outputBuffer.String());
- fSocket->Write(outputBuffer.String(),
outputBuffer.Length());
- } else {
- for (BHttpForm::Iterator it =
fOptPostFields->GetIterator();
- const BHttpFormData* currentField = it.Next();
- ) {
- _EmitDebug(B_URL_PROTOCOL_DEBUG_TRANSFER_OUT,
- it.MultipartHeader().String());
- fSocket->Write(it.MultipartHeader().String(),
- it.MultipartHeader().Length());
-
- switch (currentField->Type()) {
- default:
- case B_HTTPFORM_UNKNOWN:
- ASSERT(0);
- break;
-
- case B_HTTPFORM_STRING:
-
fSocket->Write(currentField->String().String(),
-
currentField->String().Length());
- break;
-
- case B_HTTPFORM_FILE:
- {
- BFile
upFile(currentField->File().Path(),
- B_READ_ONLY);
- char
readBuffer[kHttpBufferSize];
- ssize_t readSize;
-
- readSize =
upFile.Read(readBuffer,
-
sizeof(readBuffer));
- while (readSize > 0) {
-
fSocket->Write(readBuffer, readSize);
- readSize =
upFile.Read(readBuffer,
-
sizeof(readBuffer));
- }
-
- break;
- }
- case B_HTTPFORM_BUFFER:
-
fSocket->Write(currentField->Buffer(),
-
currentField->BufferSize());
- break;
- }
-
- fSocket->Write("\r\n", 2);
- }
-
- BString footer = fOptPostFields->GetMultipartFooter();
- fSocket->Write(footer.String(), footer.Length());
- }
- } else if ((fRequestMethod == B_HTTP_POST || fRequestMethod ==
B_HTTP_PUT)
- && fOptInputData != NULL) {
-
- for (;;) {
- char outputTempBuffer[kHttpBufferSize];
- ssize_t read = fOptInputData->Read(outputTempBuffer,
- sizeof(outputTempBuffer));
-
- if (read <= 0)
- break;
-
- if (fOptInputDataSize < 0) {
- // Chunked transfer
- char hexSize[16];
- size_t hexLength = sprintf(hexSize, "%ld",
read);
-
- fSocket->Write(hexSize, hexLength);
- fSocket->Write("\r\n", 2);
- fSocket->Write(outputTempBuffer, read);
- fSocket->Write("\r\n", 2);
- } else {
- fSocket->Write(outputTempBuffer, read);
- }
- }
-
- if (fOptInputDataSize < 0) {
- // Chunked transfer terminating sequence
- fSocket->Write("0\r\n\r\n", 5);
- }
- }
-
+ _SendPostData();
fRequestStatus = kRequestInitialState;
// Receive loop
@@ -757,22 +672,21 @@ BHttpRequest::_MakeRequest()
std::max((ssize_t)0,
bytesTotal));
}
- if (bytesTotal >= 0 && bytesReceived >=
bytesTotal) {
+ if (bytesTotal >= 0 && bytesReceived >=
bytesTotal)
receiveEnd = true;
- if (decompress) {
- readError =
decompressingStream->Flush();
- if (readError != B_OK)
- break;
+ if (decompress && receiveEnd) {
+ readError =
decompressingStream->Flush();
+ if (readError != B_OK && readError !=
B_BUFFER_OVERFLOW)
+ break;
- ssize_t size =
decompressorStorage.Size();
- BStackOrHeapArray<char, 4096>
buffer(size);
- size =
decompressorStorage.Read(buffer, size);
- if (fListener != NULL && size >
0) {
-
fListener->DataReceived(this, buffer,
- bytesUnpacked,
size);
- bytesUnpacked += size;
- }
+ ssize_t size =
decompressorStorage.Size();
+ BStackOrHeapArray<char, 4096>
buffer(size);
+ size = decompressorStorage.Read(buffer,
size);
+ if (fListener != NULL && size > 0) {
+ fListener->DataReceived(this,
buffer,
+ bytesUnpacked, size);
+ bytesUnpacked += size;
}
}
}
@@ -1011,6 +925,98 @@ BHttpRequest::_SendHeaders()
}
+void
+BHttpRequest::_SendPostData()
+{
+ if (fRequestMethod == B_HTTP_POST && fOptPostFields != NULL) {
+ if (fOptPostFields->GetFormType() != B_HTTP_FORM_MULTIPART) {
+ BString outputBuffer = fOptPostFields->RawData();
+ _EmitDebug(B_URL_PROTOCOL_DEBUG_TRANSFER_OUT,
+ "%s", outputBuffer.String());
+ fSocket->Write(outputBuffer.String(),
outputBuffer.Length());
+ } else {
+ for (BHttpForm::Iterator it =
fOptPostFields->GetIterator();
+ const BHttpFormData* currentField = it.Next();
+ ) {
+ _EmitDebug(B_URL_PROTOCOL_DEBUG_TRANSFER_OUT,
+ it.MultipartHeader().String());
+ fSocket->Write(it.MultipartHeader().String(),
+ it.MultipartHeader().Length());
+
+ switch (currentField->Type()) {
+ default:
+ case B_HTTPFORM_UNKNOWN:
+ ASSERT(0);
+ break;
+
+ case B_HTTPFORM_STRING:
+
fSocket->Write(currentField->String().String(),
+
currentField->String().Length());
+ break;
+
+ case B_HTTPFORM_FILE:
+ {
+ BFile
upFile(currentField->File().Path(),
+ B_READ_ONLY);
+ char
readBuffer[kHttpBufferSize];
+ ssize_t readSize;
+
+ readSize =
upFile.Read(readBuffer,
+
sizeof(readBuffer));
+ while (readSize > 0) {
+
fSocket->Write(readBuffer, readSize);
+ readSize =
upFile.Read(readBuffer,
+
sizeof(readBuffer));
+ }
+
+ break;
+ }
+ case B_HTTPFORM_BUFFER:
+
fSocket->Write(currentField->Buffer(),
+
currentField->BufferSize());
+ break;
+ }
+
+ fSocket->Write("\r\n", 2);
+ }
+
+ BString footer = fOptPostFields->GetMultipartFooter();
+ fSocket->Write(footer.String(), footer.Length());
+ }
+ } else if ((fRequestMethod == B_HTTP_POST || fRequestMethod ==
B_HTTP_PUT)
+ && fOptInputData != NULL) {
+
+ for (;;) {
+ char outputTempBuffer[kHttpBufferSize];
+ ssize_t read = fOptInputData->Read(outputTempBuffer,
+ sizeof(outputTempBuffer));
+
+ if (read <= 0)
+ break;
+
+ if (fOptInputDataSize < 0) {
+ // Chunked transfer
+ char hexSize[16];
+ size_t hexLength = sprintf(hexSize, "%ld",
read);
+
+ fSocket->Write(hexSize, hexLength);
+ fSocket->Write("\r\n", 2);
+ fSocket->Write(outputTempBuffer, read);
+ fSocket->Write("\r\n", 2);
+ } else {
+ fSocket->Write(outputTempBuffer, read);
+ }
+ }
+
+ if (fOptInputDataSize < 0) {
+ // Chunked transfer terminating sequence
+ fSocket->Write("0\r\n\r\n", 5);
+ }
+ }
+
+}
+
+
BHttpHeaders&
BHttpRequest::_ResultHeaders()
{
Other related posts:
- » [haiku-commits] haiku: hrev47540 - src/kits/network/libnetapi - pulkomandy
