Permalink
Browse files

Backout nsHttpChannel part of bug 513008, r=michal a=bsmedberg

--HG--
branch : GECKO20b5_20100831_RELBRANCH
  • Loading branch information...
1 parent 34dfad0 commit 8a0a764ad8d940877f8e15f5ab7413428420bf17 Honza Bambas committed Sep 2, 2010
Showing with 130 additions and 262 deletions.
  1. +4 −1 netwerk/cache/nsCacheService.cpp
  2. +125 −245 netwerk/protocol/http/nsHttpChannel.cpp
  3. +1 −16 netwerk/protocol/http/nsHttpChannel.h
@@ -1298,6 +1298,7 @@ nsCacheService::OpenCacheEntry(nsCacheSession * session,
CACHE_LOG_DEBUG(("Created request %p\n", request));
+#if 0 // Disabled because of bug 589296
// Process the request on the background thread if we are on the main thread
// and the the request is asynchronous
if (NS_IsMainThread() && listener && gService->mCacheIOThread) {
@@ -1313,7 +1314,9 @@ nsCacheService::OpenCacheEntry(nsCacheSession * session,
if (NS_FAILED(rv))
delete request;
}
- else {
+ else
+#endif
+ {
rv = gService->ProcessRequest(request, PR_TRUE, result);
// delete requests that have completed
Oops, something went wrong.

0 comments on commit 8a0a764

Please sign in to comment.