Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@38979 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
warren%netscape.com
1999-07-11 02:43:37 +00:00
parent 8a82b5e58b
commit 3df124d5df
6 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
View File

@@ -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;

19
mozilla/netwerk/protocol/http/src/nsHTTPRequest.cpp
View File

@@ -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,

6
mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.cpp
View File

@@ -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;

5
mozilla/netwerk/test/TestFileInput.cpp
View File

@@ -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;

5
mozilla/netwerk/test/TestSocketIO.cpp
View File

@@ -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...

5
mozilla/netwerk/test/TestSocketTransport.cpp
View File

@@ -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)) {