From 3df124d5dfc3d31c19d0204f6ce313d2ec5172a7 Mon Sep 17 00:00:00 2001 From: "warren%netscape.com" Date: Sun, 11 Jul 1999 02:43:37 +0000 Subject: [PATCH] Fixed http loading in viewer. Wrong channel was being passes to doc loader's stream listener by http. Also added ifdef to easily remove Fill change. git-svn-id: svn://10.0.0.236/trunk@38979 18797224-902f-48f8-a5cc-f745e15eee43 --- .../ftp/src/nsFtpConnectionThread.cpp | 10 ++++++++-- .../protocol/http/src/nsHTTPRequest.cpp | 19 ++++++++++++++----- .../http/src/nsHTTPResponseListener.cpp | 6 +++--- mozilla/netwerk/test/TestFileInput.cpp | 5 ++++- mozilla/netwerk/test/TestSocketIO.cpp | 5 ++++- mozilla/netwerk/test/TestSocketTransport.cpp | 5 ++++- 6 files changed, 37 insertions(+), 13 deletions(-) diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index 0b0d1a4c97b..5f5ac6a942f 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -862,8 +862,11 @@ nsFtpConnectionThread::Run() { while ( !NS_FAILED(rv) && bytes > 0) { PRUint32 writeCnt = 0; -// rv = in->Fill(listBuf, bytes, &writeCnt); +#if 0 + rv = in->Fill(listBuf, bytes, &writeCnt); +#else rv = buf->Write(listBuf, bytes, &writeCnt); +#endif if (NS_FAILED(rv)) { mState = FTP_ERROR; break; @@ -979,8 +982,11 @@ nsFtpConnectionThread::Run() { while ( !NS_FAILED(rv) && bytes > 0) { PRUint32 writeCnt = 0; -// rv = in->Fill(listBuf, bytes, &writeCnt); +#if 0 + rv = in->Fill(listBuf, bytes, &writeCnt); +#else rv = buf->Write(listBuf, bytes, &writeCnt); +#endif if (NS_FAILED(rv)) { mState = FTP_ERROR; break; diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp index 42ed24499a6..c1a583aac06 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp @@ -130,10 +130,13 @@ nsHTTPRequest::Build() ("\tnsHTTPRequest [this=%x].\tFirst line: %s", this, lineBuffer.GetBuffer())); +#if 0 + rv = m_Request->Fill(lineBuffer.GetBuffer(), lineBuffer.Length(), + &bytesWritten); +#else rv = buf->Write(lineBuffer.GetBuffer(), lineBuffer.Length(), &bytesWritten); -// rv = m_Request->Fill(lineBuffer.GetBuffer(), lineBuffer.Length(), -// &bytesWritten); +#endif if (NS_FAILED(rv)) return rv; /* switch (m_Method) @@ -177,18 +180,24 @@ nsHTTPRequest::Build() ("\tnsHTTPRequest [this=%x].\t\t%s\n", this, lineBuffer.GetBuffer())); +#if 0 + rv = m_Request->Fill(lineBuffer.GetBuffer(), lineBuffer.Length(), + &bytesWritten); +#else rv = buf->Write(lineBuffer.GetBuffer(), lineBuffer.Length(), &bytesWritten); -// rv = m_Request->Fill(lineBuffer.GetBuffer(), lineBuffer.Length(), -// &bytesWritten); +#endif if (NS_FAILED(rv)) return rv; lineBuffer.Truncate(); } // Write the final \r\n +#if 0 + rv = m_Request->Fill(CRLF, PL_strlen(CRLF), &bytesWritten); +#else rv = buf->Write(CRLF, PL_strlen(CRLF), &bytesWritten); -// rv = m_Request->Fill(CRLF, PL_strlen(CRLF), &bytesWritten); +#endif if (NS_FAILED(rv)) return rv; PR_LOG(gHTTPLog, PR_LOG_DEBUG, diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp index 55c4a4e0452..aa6a3d25c51 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp @@ -146,7 +146,7 @@ nsHTTPResponseListener::OnDataAvailable(nsIChannel* channel, ("\tOnDataAvailable [this=%x]. Calling consumer " "OnDataAvailable.\tlength:%d\n", this, i_Length)); - rv = m_pConsumer->OnDataAvailable(channel, m_ResponseContext, i_pStream, 0, + rv = m_pConsumer->OnDataAvailable(m_pConnection, m_ResponseContext, i_pStream, 0, i_Length); } } else { @@ -193,7 +193,7 @@ nsHTTPResponseListener::OnStartRequest(nsIChannel* channel, nsISupports* i_pCont if (NS_SUCCEEDED(rv)) { // Pass the notification out to the consumer... if (m_pConsumer) { - rv = m_pConsumer->OnStartRequest(channel, m_ResponseContext); + rv = m_pConsumer->OnStartRequest(m_pConnection, m_ResponseContext); } else { NS_ERROR("No Stream Listener..."); rv = NS_ERROR_NULL_POINTER; @@ -216,7 +216,7 @@ nsHTTPResponseListener::OnStopRequest(nsIChannel* channel, // Pass the notification out to the consumer... if (m_pConsumer) { - rv = m_pConsumer->OnStopRequest(channel, m_ResponseContext, i_Status, i_pMsg); + rv = m_pConsumer->OnStopRequest(m_pConnection, m_ResponseContext, i_Status, i_pMsg); } else { NS_ERROR("No Stream Listener..."); rv = NS_ERROR_NULL_POINTER; diff --git a/mozilla/netwerk/test/TestFileInput.cpp b/mozilla/netwerk/test/TestFileInput.cpp index eb9840639d3..d62fcfb9e65 100644 --- a/mozilla/netwerk/test/TestFileInput.cpp +++ b/mozilla/netwerk/test/TestFileInput.cpp @@ -218,8 +218,11 @@ Simulated_nsFileTransport_Run(nsReader* reader, const char* path) while (PR_TRUE) { PRUint32 amt; /* id'l change to FillFrom... */ -// rv = bufStr->FillFrom(fileStr, spec.GetFileSize(), &amt); +#if 0 + rv = bufStr->FillFrom(fileStr, spec.GetFileSize(), &amt); +#else rv = buf->WriteFrom(fileStr, spec.GetFileSize(), &amt); +#endif if (rv == NS_BASE_STREAM_EOF) { rv = NS_OK; break; diff --git a/mozilla/netwerk/test/TestSocketIO.cpp b/mozilla/netwerk/test/TestSocketIO.cpp index 7336cb18aee..7ba9bde6231 100644 --- a/mozilla/netwerk/test/TestSocketIO.cpp +++ b/mozilla/netwerk/test/TestSocketIO.cpp @@ -229,8 +229,11 @@ main(int argc, char* argv[]) if (NS_FAILED(rv)) return rv; char *buffer = PR_smprintf("GET %s HTML/1.0%s%s", fileName, CRLF, CRLF); -// stream->Fill(buffer, strlen(buffer), &bytesWritten); +#if 0 + stream->Fill(buffer, strlen(buffer), &bytesWritten); +#else buf->Write(buffer, strlen(buffer), &bytesWritten); +#endif printf("\n+++ Request is: %s\n", buffer); // Create the socket transport... diff --git a/mozilla/netwerk/test/TestSocketTransport.cpp b/mozilla/netwerk/test/TestSocketTransport.cpp index ee12aa0f332..bef6beb8f93 100644 --- a/mozilla/netwerk/test/TestSocketTransport.cpp +++ b/mozilla/netwerk/test/TestSocketTransport.cpp @@ -356,8 +356,11 @@ nsresult TestConnection::WriteBuffer(void) // Async case... // if (mStream) { -// rv = mStream->Fill(buffer, size, &bytesWritten); +#if 0 + rv = mStream->Fill(buffer, size, &bytesWritten); +#else rv = mBuffer->Write(buffer, size, &bytesWritten); +#endif // Write the buffer to the server... if (NS_SUCCEEDED(rv)) {