Try the scheme if no host is found when showing a cookie dialog. bug 209689, r=dwitte, sr=darin

extensions/cookie/nsCookiePermission.cpp

@@ -89,8 +89,20 @@ nsCookiePermission::TestPermission(nsIURI *aURI,
     nsCAutoString hostPort;
     aURI->GetHostPort(hostPort);
 
-    if (!aCookie || hostPort.IsEmpty()) {
-      return NS_ERROR_UNEXPECTED;
+    if (!aCookie) {
+       return NS_ERROR_UNEXPECTED;
+    }
+    // If there is no host, use the scheme, and append "://",
+    // to make sure it isn't a host or something.
+    // This is done to make the dialog appear for javascript cookies from
+    // file:// urls, and make the text on it not too weird. (bug 209689)
+    if (hostPort.IsEmpty()) {
+      aURI->GetScheme(hostPort);
+      if (hostPort.IsEmpty()) {
+        // still empty. Just return the default.
+        return NS_OK;
+      }
+      hostPort = hostPort + NS_LITERAL_CSTRING("://");
     }
 
     // we don't cache the cookiePromptService - it's not used often, so not

extensions/cookie/nsPermissionManager.cpp

@@ -155,7 +155,7 @@ nsPermissionEnumerator::Prefetch()
     if (entry) {
       // see if we've found it
       permission = entry->GetPermission(mTypeIndex);
-      if (permission != nsIPermissionManager::UNKNOWN_ACTION) {
+      if (permission != nsIPermissionManager::UNKNOWN_ACTION && mTypeArray[mTypeIndex]) {
         mNextPermission = new nsPermission(entry->GetHost(), 
                                            nsDependentCString(mTypeArray[mTypeIndex]),
                                            permission);
@@ -229,11 +229,9 @@ nsPermissionManager::Add(nsIURI     *aURI,
   nsresult rv;
 
   nsCAutoString hostPort;
-  aURI->GetHostPort(hostPort);
-  if (hostPort.IsEmpty()) {
-    // Nothing to add
-    return NS_OK;
-  }
+  rv = GetHostPort(aURI, hostPort);
+  // no host doesn't mean an error. just return the default
+  if (NS_FAILED(rv)) return NS_OK;
 
   PRInt32 typeIndex = GetTypeIndex(aType, PR_TRUE);
   if (typeIndex == -1 || aPermission >= NUMBER_OF_PERMISSIONS)
@@ -329,11 +327,9 @@ nsPermissionManager::TestPermission(nsIURI     *aURI,
   *aPermission = nsIPermissionManager::UNKNOWN_ACTION;
 
   nsCAutoString hostPort;
-  aURI->GetHostPort(hostPort);
-  // Don't error on no host. Just return UNKNOWN_ACTION as permission.
-  if (hostPort.IsEmpty()) {
-    return NS_OK;
-  }
+  nsresult rv = GetHostPort(aURI, hostPort);
+  // no host doesn't mean an error. just return the default
+  if (NS_FAILED(rv)) return NS_OK;
   
   PRInt32 typeIndex = GetTypeIndex(aType, PR_FALSE);
   // If type == -1, the type isn't known,
@@ -781,3 +777,22 @@ nsPermissionManager::Write()
   return NS_OK;
 }
 
+nsresult
+nsPermissionManager::GetHostPort(nsIURI *aURI, nsACString &aResult)
+{
+  NS_ASSERTION(aURI, "could not get uri");
+
+  aURI->GetHostPort(aResult);
+
+  // If there is no host, use the scheme, and prepend "scheme:",
+  // to make sure it isn't a host or something.
+  if (aResult.IsEmpty()) {
+    aURI->GetScheme(aResult);
+    if (aResult.IsEmpty()) {
+      // still empty. Return error.
+      return NS_ERROR_FAILURE;
+    }
+    aResult = NS_LITERAL_CSTRING("scheme:") + aResult;
+  }
+  return NS_OK;
+}

extensions/cookie/nsPermissionManager.h

@@ -168,6 +168,7 @@ private:
   nsresult Write();
   nsresult NotifyObservers(const nsACString &aHost);
   nsresult RemoveAllFromMemory();
+  nsresult GetHostPort(nsIURI *aURI, nsACString &aResult);
   void     RemoveTypeStrings();
 
   nsCOMPtr<nsIObserverService> mObserverService;