author | Neil Rashbrook <neil@parkwaycc.co.uk> |
Thu, 16 Jun 2011 21:25:20 +0100 | |
changeset 71706 | 48774bdf7e418c36dd65a7ed9549b28a1ccd1346 |
parent 71705 | 97bf954c697028fafd1dda824ffa48ecf57d4063 |
child 71707 | 8cbd3bbce29ef35a15fe9ef2d91651cec4dd6124 |
push id | 159 |
push user | eakhgari@mozilla.com |
push date | Tue, 16 Aug 2011 17:53:11 +0000 |
treeherder | mozilla-beta@8786e3e49240 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | biesi |
bugs | 660527 |
milestone | 7.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
netwerk/cache/nsDiskCacheDeviceSQL.cpp | file | annotate | diff | comparison | revisions | |
netwerk/protocol/http/HttpChannelParent.cpp | file | annotate | diff | comparison | revisions |
--- a/netwerk/cache/nsDiskCacheDeviceSQL.cpp +++ b/netwerk/cache/nsDiskCacheDeviceSQL.cpp @@ -1974,18 +1974,17 @@ nsOfflineCacheDevice::AddNamespace(const rv = ns->GetData(data); NS_ENSURE_SUCCESS(rv, rv); PRUint32 itemType; rv = ns->GetItemType(&itemType); NS_ENSURE_SUCCESS(rv, rv); LOG(("nsOfflineCacheDevice::AddNamespace [cid=%s, ns=%s, data=%s, type=%d]", - PromiseFlatCString(clientID).get(), - namespaceSpec.get(), data.get(), itemType)); + clientID.get(), namespaceSpec.get(), data.get(), itemType)); AutoResetStatement statement(mStatement_InsertNamespaceEntry); rv = statement->BindUTF8StringByIndex(0, clientID); NS_ENSURE_SUCCESS(rv, rv); rv = statement->BindUTF8StringByIndex(1, namespaceSpec); NS_ENSURE_SUCCESS(rv, rv);
--- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -301,18 +301,17 @@ HttpChannelParent::RecvCancel(const nsre return true; } bool HttpChannelParent::RecvSetCacheTokenCachedCharset(const nsCString& charset) { if (mCacheDescriptor) - mCacheDescriptor->SetMetaDataElement("charset", - PromiseFlatCString(charset).get()); + mCacheDescriptor->SetMetaDataElement("charset", charset.get()); return true; } bool HttpChannelParent::RecvUpdateAssociatedContentSecurity(const PRInt32& high, const PRInt32& low, const PRInt32& broken, const PRInt32& no)