Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes bug 130301 "Cannot submit large POST requests since Mozilla 0.9.9"

Browse Source 
r=brade, sr=rpotts, a=asa
This commit is contained in:
darin%netscape.com 2002-04-01 05:06:59 +00:00
parent 90b08ac487
commit 9863e6beae
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xpcom/io/nsMultiplexInputStream.cpp
View File

@ -240,8 +240,13 @@ nsMultiplexInputStream::ReadSegments(nsWriteSegmentFun aWriter, void *aClosure,
while (mCurrentStream < len) {
nsCOMPtr<nsIInputStream> stream(do_QueryElementAt(&mStreams,
mCurrentStream));
PRUint32 read;
rv = stream->ReadSegments(ReadSegCb, &state, aCount, &read);
PRUint32 avail, read, count;
rv = stream->Available(&avail);
if (NS_FAILED(rv)) return rv;
count = PR_MIN(avail, aCount);
rv = stream->ReadSegments(ReadSegCb, &state, count, &read);
// If we got an NS_BASE_STREAM_WOULD_BLOCK error since the reader
// didn't want any more data. This might not be an error for us if
// data was read from a previous stream in this run
@ -250,11 +255,17 @@ nsMultiplexInputStream::ReadSegments(nsWriteSegmentFun aWriter, void *aClosure,
break;
NS_ENSURE_SUCCESS(rv, rv);
NS_ASSERTION(aCount >= read, "Read more then requested");
if (read > count) {
NS_ERROR("Read more than requested");
read = count; // truncate and hope for the best...
}
mStartedReadingCurrent = PR_TRUE;
state.mOffset += read;
count -= read;
aCount -= read;
if (state.mDone || !aCount)
if (state.mDone || // writer doesn't want anymore data
aCount == 0 || // already read total amount requested
count > 0) // the current stream still has data
break;
++mCurrentStream;