diff --git a/mozilla/modules/libjar/nsJARChannel.cpp b/mozilla/modules/libjar/nsJARChannel.cpp index 8ccc8859d7e..2a4724a2939 100644 --- a/mozilla/modules/libjar/nsJARChannel.cpp +++ b/mozilla/modules/libjar/nsJARChannel.cpp @@ -386,7 +386,7 @@ nsJARChannel::EnsureJARFileAvailable(OnJARFileAvailableFun onJARFileAvailable, nsXPIDLCString jarURLStr; mURI->GetSpec(getter_Copies(jarURLStr)); PR_LOG(gJarProtocolLog, PR_LOG_DEBUG, - ("nsJarProtocol: AsyncRead %s", (const char*)jarURLStr)); + ("nsJarProtocol: EnsureJARFileAvailable %s", (const char*)jarURLStr)); #endif rv = mURI->GetJARFile(getter_AddRefs(mJARBaseURI)); @@ -534,6 +534,12 @@ nsJARChannel::AsyncReadJARElement() rv = mJarExtractionTransport->SetNotificationCallbacks(mCallbacks); if (NS_FAILED(rv)) return rv; +#ifdef PR_LOGGING + nsXPIDLCString jarURLStr; + mURI->GetSpec(getter_Copies(jarURLStr)); + PR_LOG(gJarProtocolLog, PR_LOG_DEBUG, + ("nsJarProtocol: AsyncRead jar entry %s", (const char*)jarURLStr)); +#endif rv = mJarExtractionTransport->AsyncRead(mStartPosition, mReadCount, nsnull, this); return rv; } @@ -783,6 +789,12 @@ nsJARChannel::Close(nsresult status) NS_IMETHODIMP nsJARChannel::GetInputStream(nsIInputStream* *aInputStream) { +#ifdef PR_LOGGING + nsXPIDLCString jarURLStr; + mURI->GetSpec(getter_Copies(jarURLStr)); + PR_LOG(gJarProtocolLog, PR_LOG_DEBUG, + ("nsJarProtocol: GetInputStream jar entry %s", (const char*)jarURLStr)); +#endif return mJAR->GetInputStream(mJAREntry, aInputStream); } diff --git a/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp b/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp index 8ccc8859d7e..2a4724a2939 100644 --- a/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp +++ b/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp @@ -386,7 +386,7 @@ nsJARChannel::EnsureJARFileAvailable(OnJARFileAvailableFun onJARFileAvailable, nsXPIDLCString jarURLStr; mURI->GetSpec(getter_Copies(jarURLStr)); PR_LOG(gJarProtocolLog, PR_LOG_DEBUG, - ("nsJarProtocol: AsyncRead %s", (const char*)jarURLStr)); + ("nsJarProtocol: EnsureJARFileAvailable %s", (const char*)jarURLStr)); #endif rv = mURI->GetJARFile(getter_AddRefs(mJARBaseURI)); @@ -534,6 +534,12 @@ nsJARChannel::AsyncReadJARElement() rv = mJarExtractionTransport->SetNotificationCallbacks(mCallbacks); if (NS_FAILED(rv)) return rv; +#ifdef PR_LOGGING + nsXPIDLCString jarURLStr; + mURI->GetSpec(getter_Copies(jarURLStr)); + PR_LOG(gJarProtocolLog, PR_LOG_DEBUG, + ("nsJarProtocol: AsyncRead jar entry %s", (const char*)jarURLStr)); +#endif rv = mJarExtractionTransport->AsyncRead(mStartPosition, mReadCount, nsnull, this); return rv; } @@ -783,6 +789,12 @@ nsJARChannel::Close(nsresult status) NS_IMETHODIMP nsJARChannel::GetInputStream(nsIInputStream* *aInputStream) { +#ifdef PR_LOGGING + nsXPIDLCString jarURLStr; + mURI->GetSpec(getter_Copies(jarURLStr)); + PR_LOG(gJarProtocolLog, PR_LOG_DEBUG, + ("nsJarProtocol: GetInputStream jar entry %s", (const char*)jarURLStr)); +#endif return mJAR->GetInputStream(mJAREntry, aInputStream); }