Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes bug 226612 "-remote openURL no longer works with null URL." r=bryner sr=dbaron a=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@149851 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net
2003-11-30 04:09:03 +00:00
parent 1f8ff99dac
commit 12f9cb07df
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mozilla/xpfe/components/xremote/src/XRemoteService.cpp
View File

@@ -657,23 +657,39 @@ XRemoteService::MayOpenURL(const nsCString &aURL)
// by default, we assume nothing can be loaded.
PRBool allowURL= PR_FALSE;
nsCOMPtr<nsIIOService> ios = do_GetIOService();
if (ios) {
nsCOMPtr<nsIExternalProtocolService> extProtService =
do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID);
if (extProtService) {
nsCAutoString scheme;
ios->ExtractScheme(aURL, scheme);
if (!scheme.IsEmpty()) {
nsCOMPtr<nsIExternalProtocolService> extProtService =
do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID);
if (extProtService) {
// if the given URL scheme corresponds to an exposed protocol, then we
// can try to load it. otherwise, we must not.
PRBool isExposed;
nsresult rv = extProtService->IsExposedProtocol(scheme.get(), &isExposed);
if (NS_SUCCEEDED(rv) && isExposed)
allowURL = PR_TRUE; // ok, we can load this URL.
// empty URLs will be treated as about:blank by OpenURL
if (aURL.IsEmpty()) {
scheme = NS_LITERAL_CSTRING("about");
}
else {
nsCOMPtr<nsIIOService> ios = do_GetIOService();
if (ios) {
ios->ExtractScheme(aURL, scheme);
if (scheme.IsEmpty()) {
// could not parse out a scheme. perhaps this is a file path.
nsCOMPtr<nsILocalFile> file;
NS_NewNativeLocalFile(aURL, PR_FALSE, getter_AddRefs(file));
if (file)
scheme = NS_LITERAL_CSTRING("file");
}
}
}
if (!scheme.IsEmpty()) {
// if the given URL scheme corresponds to an exposed protocol, then we
// can try to load it. otherwise, we must not.
PRBool isExposed;
nsresult rv = extProtService->IsExposedProtocol(scheme.get(), &isExposed);
if (NS_SUCCEEDED(rv) && isExposed)
allowURL = PR_TRUE; // ok, we can load this URL.
}
}
return allowURL;
}