mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

backing out 2d7561bc0cb0

This commit is contained in:
Robert O'Callahan 2011-01-17 09:37:09 +13:00
Родитель 2fd1892a9d
Коммит 05b54464da
8 изменённых файлов: 9 добавлений и 181 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
netwerk/base/public/nsICacheInfoChannel.idl
Просмотреть файл

@ -59,15 +59,3 @@ interface nsICacheInfoChannel : nsISupports
*/
boolean isFromCache();
};
[scriptable, uuid(746064fc-8783-4d19-9c5d-6361ed807b39)]
interface nsICacheInfoChannel_MOZILLA_2_0_BRANCH : nsISupports
{
/**
* Return an object that while not released prevents the channel from
* releasing the cache entry after all work on it has been done. Used by
* asynchronous consumers that needs to work with the cache entry long after
* onStopRequest has been called.
*/
readonly attribute nsISupports cacheEntryClosePreventer;
};

80
netwerk/protocol/http/nsHttpChannel.cpp
Просмотреть файл

@ -121,7 +121,6 @@ nsHttpChannel::nsHttpChannel()
, mAsyncCacheOpen(PR_FALSE)
, mPendingAsyncCallOnResume(nsnull)
, mSuspendCount(0)
, mCacheEntryClosePreventionCount(0)
, mCachedContentIsValid(PR_FALSE)
, mCachedContentIsPartial(PR_FALSE)
, mTransactionReplaced(PR_FALSE)
@ -136,8 +135,6 @@ nsHttpChannel::nsHttpChannel()
, mFallingBack(PR_FALSE)
, mWaitingForRedirectCallback(PR_FALSE)
, mRequestTimeInitialized(PR_FALSE)
, mDeferredCacheEntryClose(PR_FALSE)
, mDoomCacheEntryOnClose(PR_FALSE)
{
LOG(("Creating nsHttpChannel [this=%p]\n", this));
}
@ -2831,34 +2828,12 @@ nsHttpChannel::ReadFromCache()
void
nsHttpChannel::CloseCacheEntry(PRBool doomOnFailure)
{
if (!mCacheEntry || mDeferredCacheEntryClose)
if (!mCacheEntry)
return;
LOG(("nsHttpChannel::CloseCacheEntry [this=%p] mStatus=%x mCacheAccess=%x",
this, mStatus, mCacheAccess));
mDoomCacheEntryOnClose = doomOnFailure;
if (mCacheEntryClosePreventionCount) {
LOG((" close is on hold"));
mDeferredCacheEntryClose = PR_TRUE;
return;
}
CloseCacheEntryInternal();
}
void
nsHttpChannel::CloseCacheEntryInternal()
{
LOG(("nsHttpChannel::CloseCacheEntryInternal [this=%p] mStatus=%x mCacheAccess=%x",
this, mStatus, mCacheAccess));
// perform any final cache operations before we close the cache entry.
if ((mCacheAccess & nsICache::ACCESS_WRITE) && mRequestTimeInitialized) {
FinalizeCacheEntry();
}
// If we have begun to create or replace a cache entry, and that cache
// entry is not complete and not resumable, then it needs to be doomed.
// Otherwise, CheckCache will make the mistake of thinking that the
@ -2867,7 +2842,7 @@ nsHttpChannel::CloseCacheEntryInternal()
PRBool doom = PR_FALSE;
if (mInitedCacheEntry) {
NS_ASSERTION(mResponseHead, "oops");
if (NS_FAILED(mStatus) && mDoomCacheEntryOnClose &&
if (NS_FAILED(mStatus) && doomOnFailure &&
(mCacheAccess & nsICache::ACCESS_WRITE) &&
!mResponseHead->IsResumable())
doom = PR_TRUE;
@ -3515,7 +3490,6 @@ NS_INTERFACE_MAP_BEGIN(nsHttpChannel)
NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
NS_INTERFACE_MAP_ENTRY(nsIHttpChannel)
NS_INTERFACE_MAP_ENTRY(nsICacheInfoChannel_MOZILLA_2_0_BRANCH)
NS_INTERFACE_MAP_ENTRY(nsICacheInfoChannel)
NS_INTERFACE_MAP_ENTRY(nsICachingChannel)
NS_INTERFACE_MAP_ENTRY(nsIUploadChannel)
@ -4045,6 +4019,12 @@ nsHttpChannel::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult st
mIsPending = PR_FALSE;
mStatus = status;
// perform any final cache operations before we close the cache entry.
if (mCacheEntry && (mCacheAccess & nsICache::ACCESS_WRITE) &&
mRequestTimeInitialized){
FinalizeCacheEntry();
}
if (mListener) {
LOG((" calling OnStopRequest\n"));
mListener->OnStopRequest(this, mListenerContext, status);
@ -4227,50 +4207,6 @@ nsHttpChannel::SetCacheTokenCachedCharset(const nsACString &aCharset)
PromiseFlatCString(aCharset).get());
}
//-----------------------------------------------------------------------------
// nsHttpChannel::nsIHttpChannelInternal_GECKO_2_0
//-----------------------------------------------------------------------------
class HttpChannelCacheEntryClosePreventer : public nsISupports
{
public:
NS_DECL_ISUPPORTS
HttpChannelCacheEntryClosePreventer(nsHttpChannel* channel)
: mChannel(channel)
{
++mChannel->mCacheEntryClosePreventionCount;
LOG(("mCacheEntryClosePreventionCount increased to %d, [this=%x]",
mChannel->mCacheEntryClosePreventionCount,
mChannel.get()));
}
private:
~HttpChannelCacheEntryClosePreventer()
{
--mChannel->mCacheEntryClosePreventionCount;
LOG(("mCacheEntryClosePreventionCount decreased to %d, [this=%x]",
mChannel->mCacheEntryClosePreventionCount,
mChannel.get()));
if (!mChannel->mCacheEntryClosePreventionCount &&
mChannel->mDeferredCacheEntryClose) {
mChannel->CloseCacheEntryInternal();
}
}
nsRefPtr<nsHttpChannel> mChannel;
};
NS_IMPL_ISUPPORTS0(HttpChannelCacheEntryClosePreventer)
NS_IMETHODIMP
nsHttpChannel::GetCacheEntryClosePreventer(nsISupports** _retval)
{
NS_ADDREF(*_retval = new HttpChannelCacheEntryClosePreventer(this));
return NS_OK;
}
//-----------------------------------------------------------------------------
// nsHttpChannel::nsICachingChannel
//-----------------------------------------------------------------------------

18
netwerk/protocol/http/nsHttpChannel.h
Просмотреть файл

@ -51,7 +51,6 @@
#include "nsTArray.h"
#include "nsIHttpEventSink.h"
#include "nsICacheInfoChannel.h"
#include "nsICachingChannel.h"
#include "nsICacheEntryDescriptor.h"
#include "nsICacheListener.h"
@ -68,7 +67,6 @@
class nsAHttpConnection;
class AutoRedirectVetoNotifier;
class HttpChannelCacheEntryClosePreventer;
using namespace mozilla::net;
@ -78,7 +76,6 @@ using namespace mozilla::net;
class nsHttpChannel : public HttpBaseChannel
, public nsIStreamListener
, public nsICacheInfoChannel_MOZILLA_2_0_BRANCH
, public nsICachingChannel
, public nsICacheListener
, public nsITransportEventSink
@ -92,7 +89,6 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIREQUESTOBSERVER
NS_DECL_NSISTREAMLISTENER
NS_DECL_NSICACHEINFOCHANNEL_MOZILLA_2_0_BRANCH
NS_DECL_NSICACHEINFOCHANNEL
NS_DECL_NSICACHINGCHANNEL
NS_DECL_NSICACHELISTENER
@ -233,7 +229,6 @@ private:
nsresult ShouldUpdateOfflineCacheEntry(PRBool *shouldCacheForOfflineUse);
nsresult ReadFromCache();
void CloseCacheEntry(PRBool doomOnFailure);
void CloseCacheEntryInternal();
void CloseOfflineCacheEntry();
nsresult InitCacheEntry();
nsresult InitOfflineCacheEntry();
@ -327,10 +322,6 @@ private:
nsCOMPtr<nsIChannel> mRedirectChannel;
PRUint32 mRedirectType;
// Close prevention count, keeps the number of existing prevention objects,
// positive value prevents the cache entry from release in OnStopRequest.
PRUint32 mCacheEntryClosePreventionCount;
// state flags
PRUint32 mCachedContentIsValid : 1;
PRUint32 mCachedContentIsPartial : 1;
@ -354,12 +345,7 @@ private:
PRUint32 mWaitingForRedirectCallback : 1;
// True if mRequestTime has been set. In such a case it is safe to update
// the cache entry's expiration time. Otherwise, it is not(see bug 567360).
PRUint32 mRequestTimeInitialized : 1;
// True if CloseCacheEntry was called while cache entry close prevention
// count was positive.
PRUint32 mDeferredCacheEntryClose : 1;
// True if CloseCacheEntry was called with doomOnFailure set to TRUE.
PRUint32 mDoomCacheEntryOnClose : 1;
PRUint32 mRequestTimeInitialized : 1;
nsTArray<nsContinueRedirectionFunc> mRedirectFuncStack;
@ -368,8 +354,6 @@ private:
nsresult WaitForRedirectCallback();
void PushRedirectAsyncFunc(nsContinueRedirectionFunc func);
void PopRedirectAsyncFunc(nsContinueRedirectionFunc func);
friend class HttpChannelCacheEntryClosePreventer;
};
#endif // nsHttpChannel_h__

13
parser/html/nsHtml5StreamParser.cpp
Просмотреть файл

@ -41,7 +41,6 @@
#include "nsHtml5StreamParser.h"
#include "nsICharsetConverterManager.h"
#include "nsICharsetAlias.h"
#include "nsICacheInfoChannel.h"
#include "nsServiceManagerUtils.h"
#include "nsEncoderDecoderUtils.h"
#include "nsContentUtils.h"
@ -221,7 +220,6 @@ nsHtml5StreamParser::~nsHtml5StreamParser()
mTokenizer->end();
NS_ASSERTION(!mFlushTimer, "Flush timer was not dropped before dtor!");
#ifdef DEBUG
mCacheEntryClosePreventer = nsnull;
mRequest = nsnull;
mObserver = nsnull;
mUnicodeDecoder = nsnull;
@ -560,17 +558,6 @@ nsHtml5StreamParser::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
}
mRequest = aRequest;
// We must keep the cache entry hold lock to prevent the channel from
// dropping the cache entry after OnStopRequest. We may need to modify
// the cache entry asynchronously, after OnStopRequest.
// See bug 579846.
nsCOMPtr<nsICacheInfoChannel_MOZILLA_2_0_BRANCH> cacheInfoChannel =
do_QueryInterface(aRequest);
if (cacheInfoChannel) {
cacheInfoChannel->
GetCacheEntryClosePreventer(getter_AddRefs(mCacheEntryClosePreventer));
}
mStreamState = STREAM_BEING_READ;
PRBool scriptingEnabled = mExecutor->IsScriptEnabled();

1
parser/html/nsHtml5StreamParser.h
Просмотреть файл

@ -331,7 +331,6 @@ class nsHtml5StreamParser : public nsIStreamListener,
nsCOMPtr<nsIRequest> mRequest;
nsCOMPtr<nsIRequestObserver> mObserver;
nsCOMPtr<nsISupports> mCacheEntryClosePreventer;
/**
* The Unicode decoder

2
parser/htmlparser/tests/mochitest/Makefile.in
Просмотреть файл

@ -84,8 +84,6 @@ _TEST_FILES = parser_datreader.js \
file_bug594730-9.html \
test_bug599584.html \
iframe_bug599584.html \
test_bug579846.html \
sub_bug579846.sjs \
$(NULL)
# Disabled test due to orange on Linux

17
parser/htmlparser/tests/mochitest/sub_bug579846.sjs
Просмотреть файл

@ -1,17 +0,0 @@
function handleRequest(request, response)
{
var date = new Date();
var now = date.getTime();
date.setTime(date.getTime() + 5 * 60 * 1000);
var exp = (date).toGMTString();
response.setHeader("Content-Type", "text/html", false);
response.setHeader("Expires", exp, false);
response.write(
"<html>\n" +
"<head><meta http-equiv='Cache-control' content='no-cache'></head>\n" +
"<body onload='parent.testFrameOnLoad(document.body.innerHTML)'>" + now + "</body>" +
"</html>"
);
}

47
parser/htmlparser/tests/mochitest/test_bug579846.html
Просмотреть файл

@ -1,47 +0,0 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=579846
-->
<head>
<title>Test for Bug 579846</title>
<script type="text/javascript" src="/MochiKit/packed.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="text/javascript">
SimpleTest.waitForExplicitFinish();
var nextAction;
function testFrameOnLoad(content)
{
nextAction(content);
}
nextAction = function(acontent)
{
nextAction = function(bcontent)
{
ok(parseInt(acontent) < parseInt(bcontent), "Content has changed");
SimpleTest.finish();
}
// Give a chance to update
window.setTimeout(function() {
var testFrame = document.getElementById('_test_iframe2');
testFrame.contentWindow.location.href = 'sub_bug579846.sjs';
}, 100);
}
window.onload = function()
{
var testFrame = document.getElementById('_test_iframe1');
testFrame.contentWindow.location.href = 'sub_bug579846.sjs';
}
</script>
</head>
<body>
<iframe src="" id="_test_iframe1"></iframe>
<iframe src="" id="_test_iframe2"></iframe>
</body>
</html>