wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 672448 - Remove trailing whitespace. r=biesi

Browse Source
This commit is contained in:
Gordon P. Hemsley 2012-08-27 21:21:20 -04:00
parent f32a23eff2
commit 9fb701aebc
3 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netwerk/protocol/http/nsHttp.h
View File

@ -20,7 +20,7 @@
// 2) #include IPDL boilerplate, and then undef LOG so our LOG wins. // 2) #include IPDL boilerplate, and then undef LOG so our LOG wins.
// 3) nsNetModule.cpp does its own crazy stuff with #including prlog.h // 3) nsNetModule.cpp does its own crazy stuff with #including prlog.h
// multiple times; allow it to define ALLOW_LATE_NSHTTP_H_INCLUDE to bypass // multiple times; allow it to define ALLOW_LATE_NSHTTP_H_INCLUDE to bypass
// check. // check.
#if defined(PR_LOG) && !defined(ALLOW_LATE_NSHTTP_H_INCLUDE) #if defined(PR_LOG) && !defined(ALLOW_LATE_NSHTTP_H_INCLUDE)
#error "If nsHttp.h #included it must come before any IPDL-generated files or other files that #include prlog.h" #error "If nsHttp.h #included it must come before any IPDL-generated files or other files that #include prlog.h"
#endif #endif
@ -181,7 +181,7 @@ struct nsHttp
} }
// Declare all atoms // Declare all atoms
// //
// The atom names and values are stored in nsHttpAtomList.h and are brought // The atom names and values are stored in nsHttpAtomList.h and are brought
// to you by the magic of C preprocessing. Add new atoms to nsHttpAtomList // to you by the magic of C preprocessing. Add new atoms to nsHttpAtomList
// and all support logic will be auto-generated. // and all support logic will be auto-generated.

48
netwerk/protocol/http/nsHttpHandler.cpp
View File

@ -234,7 +234,7 @@ nsHttpHandler::Init()
if (prefBranch) { if (prefBranch) {
prefBranch->AddObserver(HTTP_PREF_PREFIX, this, true); prefBranch->AddObserver(HTTP_PREF_PREFIX, this, true);
prefBranch->AddObserver(UA_PREF_PREFIX, this, true); prefBranch->AddObserver(UA_PREF_PREFIX, this, true);
prefBranch->AddObserver(INTL_ACCEPT_LANGUAGES, this, true); prefBranch->AddObserver(INTL_ACCEPT_LANGUAGES, this, true);
prefBranch->AddObserver(NETWORK_ENABLEIDN, this, true); prefBranch->AddObserver(NETWORK_ENABLEIDN, this, true);
prefBranch->AddObserver(BROWSER_PREF("disk_cache_ssl"), this, true); prefBranch->AddObserver(BROWSER_PREF("disk_cache_ssl"), this, true);
prefBranch->AddObserver(DONOTTRACK_HEADER_ENABLED, this, true); prefBranch->AddObserver(DONOTTRACK_HEADER_ENABLED, this, true);
@ -292,8 +292,8 @@ nsHttpHandler::Init()
// Bring alive the objects in the http-protocol-startup category // Bring alive the objects in the http-protocol-startup category
NS_CreateServicesFromCategory(NS_HTTP_STARTUP_CATEGORY, NS_CreateServicesFromCategory(NS_HTTP_STARTUP_CATEGORY,
static_cast<nsISupports*>(static_cast<void*>(this)), static_cast<nsISupports*>(static_cast<void*>(this)),
NS_HTTP_STARTUP_TOPIC); NS_HTTP_STARTUP_TOPIC);
mObserverService = mozilla::services::GetObserverService(); mObserverService = mozilla::services::GetObserverService();
if (mObserverService) { if (mObserverService) {
mObserverService->AddObserver(this, "profile-change-net-teardown", true); mObserverService->AddObserver(this, "profile-change-net-teardown", true);
@ -303,7 +303,7 @@ nsHttpHandler::Init()
mObserverService->AddObserver(this, "net:prune-dead-connections", true); mObserverService->AddObserver(this, "net:prune-dead-connections", true);
mObserverService->AddObserver(this, "net:failed-to-process-uri-content", true); mObserverService->AddObserver(this, "net:failed-to-process-uri-content", true);
} }
return NS_OK; return NS_OK;
} }
@ -363,10 +363,10 @@ nsHttpHandler::AddStandardRequestHeaders(nsHttpHeaderArray *request,
// transparent proxies) can result. // transparent proxies) can result.
// //
// However, we need to send something so that we can use keepalive // However, we need to send something so that we can use keepalive
// with HTTP/1.0 servers/proxies. We use "Proxy-Connection:" when // with HTTP/1.0 servers/proxies. We use "Proxy-Connection:" when
// we're talking to an http proxy, and "Connection:" otherwise. // we're talking to an http proxy, and "Connection:" otherwise.
// We no longer send the Keep-Alive request header. // We no longer send the Keep-Alive request header.
NS_NAMED_LITERAL_CSTRING(close, "close"); NS_NAMED_LITERAL_CSTRING(close, "close");
NS_NAMED_LITERAL_CSTRING(keepAlive, "keep-alive"); NS_NAMED_LITERAL_CSTRING(keepAlive, "keep-alive");
@ -435,7 +435,7 @@ nsHttpHandler::GetCookieService()
return mCookieService; return mCookieService;
} }
nsresult nsresult
nsHttpHandler::GetIOService(nsIIOService** result) nsHttpHandler::GetIOService(nsIIOService** result)
{ {
NS_ADDREF(*result = mIOService); NS_ADDREF(*result = mIOService);
@ -452,7 +452,7 @@ nsHttpHandler::Get32BitsOfPseudoRandom()
// 15 or 31 bits are common amounts. // 15 or 31 bits are common amounts.
PR_STATIC_ASSERT(RAND_MAX >= 0xfff); PR_STATIC_ASSERT(RAND_MAX >= 0xfff);
#if RAND_MAX < 0xffffU #if RAND_MAX < 0xffffU
return ((uint16_t) rand() << 20) | return ((uint16_t) rand() << 20) |
(((uint16_t) rand() & 0xfff) << 8) | (((uint16_t) rand() & 0xfff) << 8) |
@ -521,10 +521,10 @@ nsHttpHandler::BuildUserAgent()
// preallocate to worst-case size, which should always be better // preallocate to worst-case size, which should always be better
// than if we didn't preallocate at all. // than if we didn't preallocate at all.
mUserAgent.SetCapacity(mLegacyAppName.Length() + mUserAgent.SetCapacity(mLegacyAppName.Length() +
mLegacyAppVersion.Length() + mLegacyAppVersion.Length() +
#ifndef UA_SPARE_PLATFORM #ifndef UA_SPARE_PLATFORM
mPlatform.Length() + mPlatform.Length() +
#endif #endif
mOscpu.Length() + mOscpu.Length() +
mMisc.Length() + mMisc.Length() +
@ -674,7 +674,7 @@ nsHttpHandler::InitUserAgentComponents()
} }
#elif defined (XP_UNIX) #elif defined (XP_UNIX)
struct utsname name; struct utsname name;
int ret = uname(&name); int ret = uname(&name);
if (ret >= 0) { if (ret >= 0) {
nsCAutoString buf; nsCAutoString buf;
@ -981,7 +981,7 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
SetAccept(accept); SetAccept(accept);
} }
if (PREF_CHANGED(HTTP_PREF("accept-encoding"))) { if (PREF_CHANGED(HTTP_PREF("accept-encoding"))) {
nsXPIDLCString acceptEncodings; nsXPIDLCString acceptEncodings;
rv = prefs->GetCharPref(HTTP_PREF("accept-encoding"), rv = prefs->GetCharPref(HTTP_PREF("accept-encoding"),
@ -1034,7 +1034,7 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
mEnforceAssocReq = cVar; mEnforceAssocReq = cVar;
} }
// enable Persistent caching for HTTPS - bug#205921 // enable Persistent caching for HTTPS - bug#205921
if (PREF_CHANGED(BROWSER_PREF("disk_cache_ssl"))) { if (PREF_CHANGED(BROWSER_PREF("disk_cache_ssl"))) {
cVar = false; cVar = false;
rv = prefs->GetBoolPref(BROWSER_PREF("disk_cache_ssl"), &cVar); rv = prefs->GetBoolPref(BROWSER_PREF("disk_cache_ssl"), &cVar);
@ -1141,7 +1141,7 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
pls->ToString(getter_Copies(uval)); pls->ToString(getter_Copies(uval));
if (uval) if (uval)
SetAcceptLanguages(NS_ConvertUTF16toUTF8(uval).get()); SetAcceptLanguages(NS_ConvertUTF16toUTF8(uval).get());
} }
} }
// //
@ -1278,7 +1278,7 @@ PrepareAcceptLanguages(const char *i_AcceptLanguages, nsACString &o_AcceptLangua
} }
nsresult nsresult
nsHttpHandler::SetAcceptLanguages(const char *aAcceptLanguages) nsHttpHandler::SetAcceptLanguages(const char *aAcceptLanguages)
{ {
nsCAutoString buf; nsCAutoString buf;
nsresult rv = PrepareAcceptLanguages(aAcceptLanguages, buf); nsresult rv = PrepareAcceptLanguages(aAcceptLanguages, buf);
@ -1288,14 +1288,14 @@ nsHttpHandler::SetAcceptLanguages(const char *aAcceptLanguages)
} }
nsresult nsresult
nsHttpHandler::SetAccept(const char *aAccept) nsHttpHandler::SetAccept(const char *aAccept)
{ {
mAccept = aAccept; mAccept = aAccept;
return NS_OK; return NS_OK;
} }
nsresult nsresult
nsHttpHandler::SetAcceptEncodings(const char *aAcceptEncodings) nsHttpHandler::SetAcceptEncodings(const char *aAcceptEncodings)
{ {
mAcceptEncodings = aAcceptEncodings; mAcceptEncodings = aAcceptEncodings;
return NS_OK; return NS_OK;
@ -1373,10 +1373,10 @@ nsHttpHandler::NewChannel(nsIURI *uri, nsIChannel **result)
return NewProxiedChannel(uri, nullptr, result); return NewProxiedChannel(uri, nullptr, result);
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHttpHandler::AllowPort(int32_t port, const char *scheme, bool *_retval) nsHttpHandler::AllowPort(int32_t port, const char *scheme, bool *_retval)
{ {
// don't override anything. // don't override anything.
*_retval = false; *_retval = false;
return NS_OK; return NS_OK;
} }
@ -1394,7 +1394,7 @@ nsHttpHandler::NewProxiedChannel(nsIURI *uri,
LOG(("nsHttpHandler::NewProxiedChannel [proxyInfo=%p]\n", LOG(("nsHttpHandler::NewProxiedChannel [proxyInfo=%p]\n",
givenProxyInfo)); givenProxyInfo));
nsCOMPtr<nsProxyInfo> proxyInfo; nsCOMPtr<nsProxyInfo> proxyInfo;
if (givenProxyInfo) { if (givenProxyInfo) {
proxyInfo = do_QueryInterface(givenProxyInfo); proxyInfo = do_QueryInterface(givenProxyInfo);
@ -1532,7 +1532,7 @@ nsHttpHandler::Observe(nsISupports *subject,
if (uri && mConnMgr) if (uri && mConnMgr)
mConnMgr->ReportFailedToProcess(uri); mConnMgr->ReportFailedToProcess(uri);
} }
return NS_OK; return NS_OK;
} }
@ -1547,7 +1547,7 @@ nsHttpHandler::SpeculativeConnect(nsIURI *aURI,
bool isStsHost = false; bool isStsHost = false;
if (!stss) if (!stss)
return NS_OK; return NS_OK;
nsCOMPtr<nsIURI> clone; nsCOMPtr<nsIURI> clone;
if (NS_SUCCEEDED(stss->IsStsURI(aURI, &isStsHost)) && isStsHost) { if (NS_SUCCEEDED(stss->IsStsURI(aURI, &isStsHost)) && isStsHost) {
if (NS_SUCCEEDED(aURI->Clone(getter_AddRefs(clone)))) { if (NS_SUCCEEDED(aURI->Clone(getter_AddRefs(clone)))) {
@ -1657,7 +1657,7 @@ nsHttpsHandler::NewChannel(nsIURI *aURI, nsIChannel **_retval)
NS_IMETHODIMP NS_IMETHODIMP
nsHttpsHandler::AllowPort(int32_t aPort, const char *aScheme, bool *_retval) nsHttpsHandler::AllowPort(int32_t aPort, const char *aScheme, bool *_retval)
{ {
// don't override anything. // don't override anything.
*_retval = false; *_retval = false;
return NS_OK; return NS_OK;
} }

28
netwerk/test/unit/xpcshell.ini
View File

@ -42,7 +42,7 @@ skip-if = os == "android"
[test_bug455311.js] [test_bug455311.js]
[test_bug455598.js] [test_bug455598.js]
[test_bug468426.js] [test_bug468426.js]
# Bug 675039: test hangs consistently on Android # Bug 675039: test hangs consistently on Android
skip-if = os == "android" skip-if = os == "android"
[test_bug468594.js] [test_bug468594.js]
[test_bug470716.js] [test_bug470716.js]
@ -53,7 +53,7 @@ skip-if = os == "android"
[test_bug490095.js] [test_bug490095.js]
[test_bug504014.js] [test_bug504014.js]
[test_bug510359.js] [test_bug510359.js]
# Bug 675039: test hangs consistently on Android # Bug 675039: test hangs consistently on Android
skip-if = os == "android" skip-if = os == "android"
[test_bug515583.js] [test_bug515583.js]
[test_bug528292.js] [test_bug528292.js]
@ -71,16 +71,16 @@ skip-if = os == "android"
[test_bug652761.js] [test_bug652761.js]
[test_bug651100.js] [test_bug651100.js]
# Bug 675044: test fails consistently on Android # Bug 675044: test fails consistently on Android
fail-if = os == "android" fail-if = os == "android"
[test_bug654926.js] [test_bug654926.js]
# Bug 675049: test fails consistently on Android # Bug 675049: test fails consistently on Android
fail-if = os == "android" fail-if = os == "android"
[test_bug654926_doom_and_read.js] [test_bug654926_doom_and_read.js]
# Bug 675049: test fails consistently on Android # Bug 675049: test fails consistently on Android
fail-if = os == "android" fail-if = os == "android"
[test_bug654926_test_seek.js] [test_bug654926_test_seek.js]
# Bug 675049: test fails consistently on Android # Bug 675049: test fails consistently on Android
fail-if = os == "android" fail-if = os == "android"
[test_bug659569.js] [test_bug659569.js]
[test_bug660066.js] [test_bug660066.js]
[test_bug667907.js] [test_bug667907.js]
@ -103,28 +103,28 @@ fail-if = os == "android"
[test_extract_charset_from_content_type.js] [test_extract_charset_from_content_type.js]
[test_force_sniffing.js] [test_force_sniffing.js]
[test_fallback_no-cache-entry_canceled.js] [test_fallback_no-cache-entry_canceled.js]
# Bug 675039: test hangs consistently on Android # Bug 675039: test hangs consistently on Android
skip-if = os == "android" skip-if = os == "android"
[test_fallback_no-cache-entry_passing.js] [test_fallback_no-cache-entry_passing.js]
# Bug 675039: test hangs consistently on Android # Bug 675039: test hangs consistently on Android
skip-if = os == "android" skip-if = os == "android"
[test_fallback_redirect-to-different-origin_canceled.js] [test_fallback_redirect-to-different-origin_canceled.js]
# Bug 675039: test hangs consistently on Android # Bug 675039: test hangs consistently on Android
skip-if = os == "android" skip-if = os == "android"
[test_fallback_redirect-to-different-origin_passing.js] [test_fallback_redirect-to-different-origin_passing.js]
# Bug 675039: test hangs consistently on Android # Bug 675039: test hangs consistently on Android
skip-if = os == "android" skip-if = os == "android"
[test_fallback_request-error_canceled.js] [test_fallback_request-error_canceled.js]
# Bug 675039: test hangs consistently on Android # Bug 675039: test hangs consistently on Android
skip-if = os == "android" skip-if = os == "android"
[test_fallback_request-error_passing.js] [test_fallback_request-error_passing.js]
# Bug 675039: test hangs consistently on Android # Bug 675039: test hangs consistently on Android
skip-if = os == "android" skip-if = os == "android"
[test_fallback_response-error_canceled.js] [test_fallback_response-error_canceled.js]
# Bug 675039: test hangs consistently on Android # Bug 675039: test hangs consistently on Android
skip-if = os == "android" skip-if = os == "android"
[test_fallback_response-error_passing.js] [test_fallback_response-error_passing.js]
# Bug 675039: test hangs consistently on Android # Bug 675039: test hangs consistently on Android
skip-if = os == "android" skip-if = os == "android"
[test_file_partial_inputstream.js] [test_file_partial_inputstream.js]
[test_file_protocol.js] [test_file_protocol.js]