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

bug #10790. The HTTPChannel is now given to the HTTPResponseListener during construction. Before, it was getting it via a dirty cast in the OnStartRequest notification. Unfortunately, OnStartRequest is only called if the connection is successful. This caused a crash in OnStopRequest if the HTTPChannel was not available :-(

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@42423 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com 1999-08-06 07:57:44 +00:00
parent e780de2587
commit 89e0a639ea
3 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,7 +355,7 @@ nsHTTPRequest::OnStopRequest(nsIChannel* channel, nsISupports* i_pContext,
nsHTTPResponseListener* pListener;
//Prepare to receive the response!
pListener = new nsHTTPResponseListener();
pListener = new nsHTTPResponseListener(m_pConnection);
if (pListener) {
NS_ADDREF(pListener);
rv = m_pTransport->AsyncRead(0, -1,

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

@ -49,8 +49,7 @@ extern PRLogModuleInfo* gHTTPLog;
static const int kMAX_HEADER_SIZE = 60000;
nsHTTPResponseListener::nsHTTPResponseListener():
m_pConnection(nsnull),
nsHTTPResponseListener::nsHTTPResponseListener(nsHTTPChannel* aConnection):
m_bFirstLineParsed(PR_FALSE),
m_pResponse(nsnull),
m_pConsumer(nsnull),
@ -62,6 +61,10 @@ nsHTTPResponseListener::nsHTTPResponseListener():
{
NS_INIT_REFCNT();
NS_ASSERTION(m_pConnection, "HTTPChannel is null.");
m_pConnection = aConnection;
NS_IF_ADDREF(m_pConnection);
PR_LOG(gHTTPLog, PR_LOG_DEBUG,
("Creating nsHTTPResponseListener [this=%x].\n", this));
@ -109,9 +112,7 @@ nsHTTPResponseListener::OnDataAvailable(nsIChannel* channel,
return NS_ERROR_OUT_OF_MEMORY;
}
NS_ADDREF(m_pResponse);
// XXX: This is *evil*. Fix it!
nsHTTPChannel* pTestCon = NS_STATIC_CAST(nsHTTPChannel*, m_pConnection);
pTestCon->SetResponse(m_pResponse);
m_pConnection->SetResponse(m_pResponse);
}
//
// Parse the status line and the response headers from the server
@ -179,21 +180,10 @@ nsHTTPResponseListener::OnStartRequest(nsIChannel* channel, nsISupports* i_pCont
m_bHeadersDone = PR_FALSE;
m_bFirstLineParsed = PR_FALSE;
// Cache the nsIHTTPChannel...
if (i_pContext) {
rv = i_pContext->QueryInterface(nsCOMTypeInfo<nsIHTTPChannel>::GetIID(),
(void**)&m_pConnection);
} else {
rv = NS_ERROR_NULL_POINTER;
}
// Cache the nsIStreamListener and ISupports context of the consumer...
rv = m_pConnection->GetResponseDataListener(&m_pConsumer);
if (NS_SUCCEEDED(rv)) {
rv = m_pConnection->GetResponseDataListener(&m_pConsumer);
// XXX: This is *evil*. Fix it!
nsHTTPChannel* pHTTPChannel = NS_STATIC_CAST(nsHTTPChannel*, m_pConnection);
pHTTPChannel->GetResponseContext(getter_AddRefs(m_ResponseContext));
rv = m_pConnection->GetResponseContext(getter_AddRefs(m_ResponseContext));
}
return rv;
@ -231,7 +221,10 @@ nsHTTPResponseListener::OnStopRequest(nsIChannel* channel,
}
// Notify the HTTPChannel that the response has completed...
m_pConnection->ResponseCompleted(channel);
NS_ASSERTION(m_pConnection, "HTTPChannel is null.");
if (m_pConnection) {
m_pConnection->ResponseCompleted(channel);
}
// The Consumer is no longer needed...
NS_IF_RELEASE(m_pConsumer);

2
mozilla/netwerk/protocol/http/src/nsHTTPResponseListener.h
View File

@ -49,7 +49,7 @@ class nsHTTPResponseListener : public nsIStreamListener
public:
nsHTTPResponseListener();
nsHTTPResponseListener(nsHTTPChannel* aConnection);
virtual ~nsHTTPResponseListener();
// nsISupports functions