Bug 494163 - (gio / gvfs) Port gnomevfs extension to GIO/GVFS; r=karlt sr=roc
authorjhorak@redhat.com
Wed, 23 Mar 2011 23:38:03 -0400
changeset 63795 7c42f37e0284f3e63c42d3734000aa73c09e6a6a
parent 63794 6fe1e7832dc8f6d813cc9abf0599aa1c7bcb8f43
child 63796 739bfb41cd012f739ebd361418af7125e593e784
push idunknown
push userunknown
push dateunknown
reviewerskarlt, roc
bugs494163
milestone2.2a1pre
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
Bug 494163 - (gio / gvfs) Port gnomevfs extension to GIO/GVFS; r=karlt sr=roc
extensions/gio/Makefile.in
extensions/gio/makefiles.sh
extensions/gio/nsGIOProtocolHandler.cpp
netwerk/base/src/nsIOService.cpp
new file mode 100644
--- /dev/null
+++ b/extensions/gio/Makefile.in
@@ -0,0 +1,69 @@
+# vim:set ts=8 sw=8 sts=8 noet:
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla gnome-vfs extension.
+#
+# The Initial Developer of the Original Code is IBM Corporation.
+#
+# Portions created by IBM Corporation are Copyright (C) 2004
+# IBM Corporation. All Rights Reserved.
+#
+# Contributor(s):
+#   Darin Fisher <darin@meer.net>
+#   Jan Horak <jhorak@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= nkgio
+LIBRARY_NAME	= nkgio
+SHORT_LIBNAME	= nkgio
+IS_COMPONENT	= 1
+
+CPPSRCS		= \
+		nsGIOProtocolHandler.cpp \
+		$(NULL)
+
+LOCAL_INCLUDES	= $(MOZ_GIO_CFLAGS)
+
+EXTRA_DSO_LDOPTS = \
+		   $(XPCOM_GLUE_LDOPTS) \
+		   $(NSPR_LIBS) \
+		   $(MOZ_GIO_LIBS) \
+		   $(NULL)
+
+# make sure this component is never statically linked into the main
+# application.  this is necessary since we don't want to force users
+# to install gio in order to use the rest of mozilla ;-)
+FORCE_SHARED_LIB= 1
+
+include $(topsrcdir)/config/rules.mk
new file mode 100644
--- /dev/null
+++ b/extensions/gio/makefiles.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+add_makefiles "
+  extensions/gio/Makefile
+"
new file mode 100644
--- /dev/null
+++ b/extensions/gio/nsGIOProtocolHandler.cpp
@@ -0,0 +1,1163 @@
+/* vim:set ts=2 sw=2 et cindent: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla gnome-vfs extension.
+ *
+ * The Initial Developer of the Original Code is IBM Corporation.
+ *
+ * Portions created by IBM Corporation are Copyright (C) 2004
+ * IBM Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Darin Fisher <darin@meer.net>
+ *   Jan Horak <jhorak@redhat.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * This code is based on original Mozilla gnome-vfs extension. It implements
+ * input stream provided by GVFS/GIO.
+*/
+#include "mozilla/ModuleUtils.h"
+#include "nsIPrefService.h"
+#include "nsIPrefBranch2.h"
+#include "nsIObserver.h"
+#include "nsThreadUtils.h"
+#include "nsProxyRelease.h"
+#include "nsIStringBundle.h"
+#include "nsIStandardURL.h"
+#include "nsMimeTypes.h"
+#include "nsNetUtil.h"
+#include "mozilla/Monitor.h"
+#include <gio/gio.h>
+
+#define MOZ_GIO_SCHEME              "moz-gio"
+#define MOZ_GIO_SUPPORTED_PROTOCOLS "network.gio.supported-protocols"
+
+//-----------------------------------------------------------------------------
+
+// NSPR_LOG_MODULES=gio:5
+#ifdef PR_LOGGING
+static PRLogModuleInfo *sGIOLog;
+#define LOG(args) PR_LOG(sGIOLog, PR_LOG_DEBUG, args)
+#else
+#define LOG(args)
+#endif
+
+
+//-----------------------------------------------------------------------------
+static nsresult
+MapGIOResult(gint code) 
+{
+  switch (code)
+  {
+     case G_IO_ERROR_NOT_FOUND:                  return NS_ERROR_FILE_NOT_FOUND; // shows error
+     case G_IO_ERROR_INVALID_ARGUMENT:           return NS_ERROR_INVALID_ARG;
+     case G_IO_ERROR_NOT_SUPPORTED:              return NS_ERROR_NOT_AVAILABLE;
+     case G_IO_ERROR_NO_SPACE:                   return NS_ERROR_FILE_NO_DEVICE_SPACE;
+     case G_IO_ERROR_READ_ONLY:                  return NS_ERROR_FILE_READ_ONLY;
+     case G_IO_ERROR_PERMISSION_DENIED:          return NS_ERROR_FILE_ACCESS_DENIED; // wrong password/login
+     case G_IO_ERROR_CLOSED:                     return NS_BASE_STREAM_CLOSED; // was EOF
+     case G_IO_ERROR_NOT_DIRECTORY:              return NS_ERROR_FILE_NOT_DIRECTORY;
+     case G_IO_ERROR_PENDING:                    return NS_ERROR_IN_PROGRESS;
+     case G_IO_ERROR_EXISTS:                     return NS_ERROR_FILE_ALREADY_EXISTS;
+     case G_IO_ERROR_IS_DIRECTORY:               return NS_ERROR_FILE_IS_DIRECTORY;
+     case G_IO_ERROR_NOT_MOUNTED:                return NS_ERROR_NOT_CONNECTED; // shows error
+     case G_IO_ERROR_HOST_NOT_FOUND:             return NS_ERROR_UNKNOWN_HOST; // shows error
+     case G_IO_ERROR_CANCELLED:                  return NS_ERROR_ABORT;
+     case G_IO_ERROR_NOT_EMPTY:                  return NS_ERROR_FILE_DIR_NOT_EMPTY;
+     case G_IO_ERROR_FILENAME_TOO_LONG:          return NS_ERROR_FILE_NAME_TOO_LONG;
+     case G_IO_ERROR_INVALID_FILENAME:           return NS_ERROR_FILE_INVALID_PATH;
+     case G_IO_ERROR_TIMED_OUT:                  return NS_ERROR_NET_TIMEOUT; // shows error
+     case G_IO_ERROR_WOULD_BLOCK:                return NS_BASE_STREAM_WOULD_BLOCK;
+     case G_IO_ERROR_FAILED_HANDLED:             return NS_ERROR_ABORT; // Cancel on login dialog
+
+/* unhandled:
+  G_IO_ERROR_NOT_REGULAR_FILE,
+  G_IO_ERROR_NOT_SYMBOLIC_LINK,
+  G_IO_ERROR_NOT_MOUNTABLE_FILE,
+  G_IO_ERROR_TOO_MANY_LINKS,
+  G_IO_ERROR_ALREADY_MOUNTED,
+  G_IO_ERROR_CANT_CREATE_BACKUP,
+  G_IO_ERROR_WRONG_ETAG,
+  G_IO_ERROR_WOULD_RECURSE,
+  G_IO_ERROR_BUSY,
+  G_IO_ERROR_WOULD_MERGE,
+  G_IO_ERROR_TOO_MANY_OPEN_FILES
+*/
+    // Make GCC happy
+    default:
+      return NS_ERROR_FAILURE;
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+static nsresult
+MapGIOResult(GError *result)
+{
+  if (!result)
+    return NS_OK;
+  else 
+    return MapGIOResult(result->code);
+}
+/** Return values for mount operation.
+ * These enums are used as mount operation return values.
+ */
+typedef enum {
+  MOUNT_OPERATION_IN_PROGRESS, /** \enum operation in progress */
+  MOUNT_OPERATION_SUCCESS,     /** \enum operation successful */
+  MOUNT_OPERATION_FAILED       /** \enum operation not successful */
+} MountOperationResult;
+//-----------------------------------------------------------------------------
+/**
+ * Sort function compares according to file type (directory/file)
+ * and alphabethical order
+ * @param a pointer to GFileInfo object to compare
+ * @param b pointer to GFileInfo object to compare
+ * @return -1 when first object should be before the second, 0 when equal,
+ * +1 when second object should be before the first
+ */
+static gint
+FileInfoComparator(gconstpointer a, gconstpointer b)
+{
+  GFileInfo *ia = ( GFileInfo *) a;
+  GFileInfo *ib = ( GFileInfo *) b;
+  if (g_file_info_get_file_type(ia) == G_FILE_TYPE_DIRECTORY
+      && g_file_info_get_file_type(ib) != G_FILE_TYPE_DIRECTORY)
+    return -1;
+  if (g_file_info_get_file_type(ib) == G_FILE_TYPE_DIRECTORY
+      && g_file_info_get_file_type(ia) != G_FILE_TYPE_DIRECTORY)
+    return 1;
+
+  return strcasecmp(g_file_info_get_name(ia), g_file_info_get_name(ib));
+}
+
+/* Declaration of mount callback functions */
+static void mount_enclosing_volume_finished (GObject *source_object,
+                                             GAsyncResult *res,
+                                             gpointer user_data);
+static void mount_operation_ask_password (GMountOperation   *mount_op,
+                                          const char        *message,
+                                          const char        *default_user,
+                                          const char        *default_domain,
+                                          GAskPasswordFlags flags,
+                                          gpointer          user_data);
+//-----------------------------------------------------------------------------
+
+class nsGIOInputStream : public nsIInputStream
+{
+  public:
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIINPUTSTREAM
+
+    nsGIOInputStream(const nsCString &uriSpec)
+      : mSpec(uriSpec)
+      , mChannel(nsnull)
+      , mHandle(nsnull)
+      , mStream(nsnull)
+      , mBytesRemaining(PR_UINT32_MAX)
+      , mStatus(NS_OK)
+      , mDirList(nsnull)
+      , mDirListPtr(nsnull)
+      , mDirBufCursor(0)
+      , mDirOpen(PR_FALSE)
+      , mMonitorMountInProgress("GIOInputStream::MountFinished") { }
+
+   ~nsGIOInputStream() { Close(); }
+
+    void SetChannel(nsIChannel *channel)
+    {
+      // We need to hold an owning reference to our channel.  This is done
+      // so we can access the channel's notification callbacks to acquire
+      // a reference to a nsIAuthPrompt if we need to handle an interactive
+      // mount operation.
+      //
+      // However, the channel can only be accessed on the main thread, so
+      // we have to be very careful with ownership.  Moreover, it doesn't
+      // support threadsafe addref/release, so proxying is the answer.
+      //
+      // Also, it's important to note that this likely creates a reference
+      // cycle since the channel likely owns this stream.  This reference
+      // cycle is broken in our Close method.
+
+      NS_ADDREF(mChannel = channel);
+    }
+    void           SetMountResult(MountOperationResult result, gint error_code);
+  private:
+    nsresult       DoOpen();
+    nsresult       DoRead(char *aBuf, PRUint32 aCount, PRUint32 *aCountRead);
+    nsresult       SetContentTypeOfChannel(const char *contentType);
+    nsresult       MountVolume();
+    nsresult       DoOpenDirectory();
+    nsresult       DoOpenFile(GFileInfo *info);        
+    nsCString             mSpec;
+    nsIChannel           *mChannel; // manually refcounted
+    GFile                *mHandle;
+    GFileInputStream     *mStream;
+    PRUint64              mBytesRemaining;
+    nsresult              mStatus;
+    GList                *mDirList;
+    GList                *mDirListPtr;
+    nsCString             mDirBuf;
+    PRUint32              mDirBufCursor;
+    PRPackedBool          mDirOpen;
+    MountOperationResult  mMountRes;
+    mozilla::Monitor      mMonitorMountInProgress;
+    gint                  mMountErrorCode;
+};
+/**
+ * Set result of mount operation and notify monitor waiting for results.
+ * This method is called in main thread as long as it is used only 
+ * in mount_enclosing_volume_finished function.
+ * @param result Result of mount operation
+ */ 
+void
+nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code)
+{
+  mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
+  mMountRes = result;
+  mMountErrorCode = error_code;
+  mon.Notify();
+}
+
+/**
+ * Start mount operation and wait in loop until it is finished. This method is 
+ * called from thread which is trying to read from location.
+ */
+nsresult
+nsGIOInputStream::MountVolume() {
+  GMountOperation* mount_op = g_mount_operation_new();
+  g_signal_connect (mount_op, "ask-password",
+                    G_CALLBACK (mount_operation_ask_password), mChannel);
+  mMountRes = MOUNT_OPERATION_IN_PROGRESS;
+  /* g_file_mount_enclosing_volume uses a dbus request to mount the volume.
+     Callback mount_enclosing_volume_finished is called in main thread 
+     (not this thread on which this method is called). */
+  g_file_mount_enclosing_volume(mHandle,
+                                G_MOUNT_MOUNT_NONE,
+                                mount_op,
+                                NULL,
+                                mount_enclosing_volume_finished,
+                                this);
+  mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
+  /* Waiting for finish of mount operation thread */  
+  while (mMountRes == MOUNT_OPERATION_IN_PROGRESS)
+    mon.Wait();
+  
+  g_object_unref(mount_op);
+
+  if (mMountRes == MOUNT_OPERATION_FAILED) {
+    return MapGIOResult(mMountErrorCode);
+  } else {
+    return NS_OK;
+  }
+}
+
+/**
+ * Create list of infos about objects in opened directory
+ * Return: NS_OK when list obtained, otherwise error code according
+ * to failed operation.
+ */
+nsresult
+nsGIOInputStream::DoOpenDirectory()
+{
+  GError *error = NULL;
+
+  GFileEnumerator *f_enum = g_file_enumerate_children(mHandle,
+                                                      "standard::*,time::*",
+                                                      G_FILE_QUERY_INFO_NONE,
+                                                      NULL,
+                                                      &error);
+  if (!f_enum) {
+    nsresult rv = MapGIOResult(error);
+    g_warning("Cannot read from directory: %s", error->message);
+    g_error_free(error);
+    return rv;
+  }
+  // fill list of file infos
+  GFileInfo *info = g_file_enumerator_next_file(f_enum, NULL, &error);
+  while (info) {
+    mDirList = g_list_append(mDirList, info);
+    info = g_file_enumerator_next_file(f_enum, NULL, &error);
+  }
+  g_object_unref(f_enum);
+  if (error) {
+    g_warning("Error reading directory content: %s", error->message);
+    nsresult rv = MapGIOResult(error);
+    g_error_free(error);
+    return rv;
+  }
+  mDirOpen = PR_TRUE;
+
+  // Sort list of file infos by using FileInfoComparator function
+  mDirList = g_list_sort(mDirList, FileInfoComparator);
+  mDirListPtr = mDirList;
+
+  // Write base URL (make sure it ends with a '/')
+  mDirBuf.Append("300: ");
+  mDirBuf.Append(mSpec);
+  if (mSpec.get()[mSpec.Length() - 1] != '/')
+    mDirBuf.Append('/');
+  mDirBuf.Append('\n');
+
+  // Write column names
+  mDirBuf.Append("200: filename content-length last-modified file-type\n");
+
+  // Write charset (assume UTF-8)
+  // XXX is this correct?
+  mDirBuf.Append("301: UTF-8\n");
+  SetContentTypeOfChannel(APPLICATION_HTTP_INDEX_FORMAT);
+  return NS_OK;
+}
+
+/**
+ * Create file stream and set mime type for channel
+ * @param info file info used to determine mime type
+ * @return NS_OK when file stream created successfuly, error code otherwise
+ */
+nsresult
+nsGIOInputStream::DoOpenFile(GFileInfo *info)
+{
+  GError *error = NULL;
+
+  mStream = g_file_read(mHandle, NULL, &error);
+  if (!mStream) {
+    nsresult rv = MapGIOResult(error);
+    g_warning("Cannot read from file: %s", error->message);
+    g_error_free(error);
+    return rv;
+  }
+
+  const char * content_type = g_file_info_get_content_type(info);
+  if (content_type) {
+    char *mime_type = g_content_type_get_mime_type(content_type);
+    if (mime_type) {
+      if (strcmp(mime_type, APPLICATION_OCTET_STREAM) != 0) {
+        SetContentTypeOfChannel(mime_type);
+      }
+      g_free(mime_type);
+    }
+  } else {
+    g_warning("Missing content type.");
+  }
+
+  mBytesRemaining = g_file_info_get_size(info);
+  // Update the content length attribute on the channel.  We do this
+  // synchronously without proxying.  This hack is not as bad as it looks!
+  mChannel->SetContentLength(mBytesRemaining);
+
+  return NS_OK;
+}
+
+/**
+ * Start file open operation, mount volume when needed and according to file type
+ * create file output stream or read directory content.
+ * @return NS_OK when file or directory opened successfully, error code otherwise
+ */
+nsresult
+nsGIOInputStream::DoOpen()
+{
+  nsresult rv;
+  GError *error = NULL;
+
+  NS_ASSERTION(mHandle == nsnull, "already open");
+
+  mHandle = g_file_new_for_uri( mSpec.get() );
+
+  GFileInfo *info = g_file_query_info(mHandle,
+                                      "standard::*",
+                                      G_FILE_QUERY_INFO_NONE,
+                                      NULL,
+                                      &error);
+
+  if (error) {
+    if (error->domain == G_IO_ERROR && error->code == G_IO_ERROR_NOT_MOUNTED) {
+      // location is not yet mounted, try to mount
+      g_error_free(error);
+      if (NS_IsMainThread()) 
+        return NS_ERROR_NOT_CONNECTED;
+      error = NULL;
+      rv = MountVolume();
+      if (rv != NS_OK) {
+        return rv;
+      }
+      // get info again
+      info = g_file_query_info(mHandle,
+                               "standard::*",
+                               G_FILE_QUERY_INFO_NONE,
+                               NULL,
+                               &error);
+      // second try to get file info from remote files after media mount
+      if (!info) {
+        g_warning("Unable to get file info: %s", error->message);
+        rv = MapGIOResult(error);
+        g_error_free(error);
+        return rv;
+      }
+    } else {
+      g_warning("Unable to get file info: %s", error->message);
+      rv = MapGIOResult(error);
+      g_error_free(error);
+      return rv;
+    }
+  }
+  // Get file type to handle directories and file differently
+  GFileType f_type = g_file_info_get_file_type(info);
+  if (f_type == G_FILE_TYPE_DIRECTORY) {
+    // directory
+    rv = DoOpenDirectory();
+  } else if (f_type != G_FILE_TYPE_UNKNOWN) {
+    // file
+    rv = DoOpenFile(info);
+  } else {
+    g_warning("Unable to get file type.");
+    rv = NS_ERROR_FILE_NOT_FOUND;
+  }
+  if (info)
+    g_object_unref(info);
+  return rv;
+}
+
+/**
+ * Read content of file or create file list from directory
+ * @param aBuf read destination buffer
+ * @param aCount length of destination buffer
+ * @param aCountRead number of read characters
+ * @return NS_OK when read successfully, NS_BASE_STREAM_CLOSED when end of file,
+ *         error code otherwise
+ */
+nsresult
+nsGIOInputStream::DoRead(char *aBuf, PRUint32 aCount, PRUint32 *aCountRead)
+{
+  nsresult rv = NS_ERROR_NOT_AVAILABLE;
+  if (mStream) {
+    // file read
+    GError *error = NULL;    
+    PRUint32 bytes_read = g_input_stream_read(G_INPUT_STREAM(mStream),
+                                              aBuf,
+                                              aCount,
+                                              NULL,
+                                              &error);
+    if (error) {
+      rv = MapGIOResult(error);
+      *aCountRead = 0;
+      g_warning("Cannot read from file: %s", error->message);
+      g_error_free(error);
+      return rv;
+    }
+    *aCountRead = bytes_read;
+    mBytesRemaining -= *aCountRead;
+    return NS_OK;
+  }
+  else if (mDirOpen) {
+    // directory read
+    while (aCount && rv != NS_BASE_STREAM_CLOSED)
+    {
+      // Copy data out of our buffer
+      PRUint32 bufLen = mDirBuf.Length() - mDirBufCursor;
+      if (bufLen)
+      {
+        PRUint32 n = PR_MIN(bufLen, aCount);
+        memcpy(aBuf, mDirBuf.get() + mDirBufCursor, n);
+        *aCountRead += n;
+        aBuf += n;
+        aCount -= n;
+        mDirBufCursor += n;
+      }
+
+      if (!mDirListPtr)    // Are we at the end of the directory list?
+      {
+        rv = NS_BASE_STREAM_CLOSED;
+      }
+      else if (aCount)     // Do we need more data?
+      {
+        GFileInfo *info = (GFileInfo *) mDirListPtr->data;
+
+        // Prune '.' and '..' from directory listing.
+        const char * fname = g_file_info_get_name(info);
+        if (fname && fname[0] == '.' && 
+            (fname[1] == '\0' || (fname[1] == '.' && fname[2] == '\0')))
+        {
+          mDirListPtr = mDirListPtr->next;
+          continue;
+        }
+
+        mDirBuf.Assign("201: ");
+
+        // The "filename" field
+        nsCString escName;
+        nsCOMPtr<nsINetUtil> nu = do_GetService(NS_NETUTIL_CONTRACTID);
+        if (nu && fname) {
+          nu->EscapeString(nsDependentCString(fname),
+                           nsINetUtil::ESCAPE_URL_PATH, escName);
+
+          mDirBuf.Append(escName);
+          mDirBuf.Append(' ');
+        }
+
+        // The "content-length" field
+        // XXX truncates size from 64-bit to 32-bit
+        mDirBuf.AppendInt(PRInt32(g_file_info_get_size(info)));
+        mDirBuf.Append(' ');
+
+        // The "last-modified" field
+        //
+        // NSPR promises: PRTime is compatible with time_t
+        // we just need to convert from seconds to microseconds
+        GTimeVal gtime;
+        g_file_info_get_modification_time(info, &gtime);
+
+        PRExplodedTime tm;
+        PRTime pt = ((PRTime) gtime.tv_sec) * 1000000;
+        PR_ExplodeTime(pt, PR_GMTParameters, &tm);
+        {
+          char buf[64];
+          PR_FormatTimeUSEnglish(buf, sizeof(buf),
+              "%a,%%20%d%%20%b%%20%Y%%20%H:%M:%S%%20GMT ", &tm);
+          mDirBuf.Append(buf);
+        }
+
+        // The "file-type" field
+        switch (g_file_info_get_file_type(info))
+        {
+          case G_FILE_TYPE_REGULAR:
+            mDirBuf.Append("FILE ");
+            break;
+          case G_FILE_TYPE_DIRECTORY:
+            mDirBuf.Append("DIRECTORY ");
+            break;
+          case G_FILE_TYPE_SYMBOLIC_LINK:
+            mDirBuf.Append("SYMBOLIC-LINK ");
+            break;
+          default:
+            break;
+        }
+        mDirBuf.Append('\n');
+
+        mDirBufCursor = 0;
+        mDirListPtr = mDirListPtr->next;
+      }
+    }
+  }
+  return rv;
+}
+
+/**
+ * This class is used to implement SetContentTypeOfChannel.
+ */
+class nsGIOSetContentTypeEvent : public nsRunnable
+{
+  public:
+    nsGIOSetContentTypeEvent(nsIChannel *channel, const char *contentType)
+      : mChannel(channel), mContentType(contentType)
+    {
+      // stash channel reference in mChannel.  no AddRef here!  see note
+      // in SetContentTypeOfchannel.
+    }
+
+    NS_IMETHOD Run()
+    {
+      mChannel->SetContentType(mContentType);
+      return NS_OK;
+    }
+
+  private:
+    nsIChannel *mChannel;
+    nsCString   mContentType;
+};
+
+nsresult
+nsGIOInputStream::SetContentTypeOfChannel(const char *contentType)
+{
+  // We need to proxy this call over to the main thread.  We post an
+  // asynchronous event in this case so that we don't delay reading data, and
+  // we know that this is safe to do since the channel's reference will be
+  // released asynchronously as well.  We trust the ordering of the main
+  // thread's event queue to protect us against memory corruption.
+
+  nsresult rv;
+  nsCOMPtr<nsIRunnable> ev =
+      new nsGIOSetContentTypeEvent(mChannel, contentType);
+  if (!ev)
+  {
+    rv = NS_ERROR_OUT_OF_MEMORY;
+  }
+  else
+  {
+    rv = NS_DispatchToMainThread(ev);
+  }
+  return rv;
+}
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsGIOInputStream, nsIInputStream)
+
+/**
+ * Free all used memory and close stream.
+ */
+NS_IMETHODIMP
+nsGIOInputStream::Close()
+{
+  if (mStream)
+  {
+    g_object_unref(mStream);
+    mStream = nsnull;
+  }
+
+  if (mHandle)
+  {
+    g_object_unref(mHandle);
+    mHandle = nsnull;
+  }
+
+  if (mDirList)
+  {
+    // Destroy the list of GIOFileInfo objects...
+    g_list_foreach(mDirList, (GFunc) g_object_unref, nsnull);
+    g_list_free(mDirList);
+    mDirList = nsnull;
+    mDirListPtr = nsnull;
+  }
+
+  if (mChannel)
+  {
+    nsresult rv = NS_OK;
+
+    nsCOMPtr<nsIThread> thread = do_GetMainThread();
+    if (thread)
+      rv = NS_ProxyRelease(thread, mChannel);
+
+    NS_ASSERTION(thread && NS_SUCCEEDED(rv), "leaking channel reference");
+    mChannel = nsnull;
+  }
+
+  mSpec.Truncate(); // free memory
+
+  // Prevent future reads from re-opening the handle.
+  if (NS_SUCCEEDED(mStatus))
+    mStatus = NS_BASE_STREAM_CLOSED;
+
+  return NS_OK;
+}
+
+/**
+ * Return number of remaining bytes available on input
+ * @param aResult remaining bytes
+ */
+NS_IMETHODIMP
+nsGIOInputStream::Available(PRUint32 *aResult)
+{
+  if (NS_FAILED(mStatus))
+    return mStatus;
+
+  /* When remaining bytes are bigger than max PRUint32 value an aResult must
+     be set to PRUint32 maximum */
+  if (mBytesRemaining > PR_UINT32_MAX)
+    *aResult = PR_UINT32_MAX;
+  else
+    *aResult = mBytesRemaining;
+
+  return NS_OK;
+}
+
+/**
+ * Trying to read from stream. When location is not available it tries to mount it.
+ * @param aBuf buffer to put read data
+ * @param aCount length of aBuf
+ * @param aCountRead number of bytes actually read
+ */
+NS_IMETHODIMP
+nsGIOInputStream::Read(char     *aBuf,
+                       PRUint32  aCount,
+                       PRUint32 *aCountRead)
+{
+  *aCountRead = 0;
+  // Check if file is already opened, otherwise open it
+  if (!mStream && !mDirOpen && mStatus == NS_OK) {
+    mStatus = DoOpen();
+    if (NS_FAILED(mStatus)) {
+      return mStatus;
+    }
+  }
+
+  mStatus = DoRead(aBuf, aCount, aCountRead);
+  // Check if all data has been read
+  if (mStatus == NS_BASE_STREAM_CLOSED)
+    return NS_OK;
+
+  // Check whenever any error appears while reading
+  return mStatus;
+}
+
+NS_IMETHODIMP
+nsGIOInputStream::ReadSegments(nsWriteSegmentFun aWriter,
+                               void             *aClosure,
+                               PRUint32          aCount,
+                               PRUint32         *aResult)
+{
+  // There is no way to implement this using GnomeVFS, but fortunately
+  // that doesn't matter.  Because we are a blocking input stream, Necko
+  // isn't going to call our ReadSegments method.
+  NS_NOTREACHED("nsGIOInputStream::ReadSegments");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsGIOInputStream::IsNonBlocking(PRBool *aResult)
+{
+  *aResult = PR_FALSE;
+  return NS_OK;
+}
+
+//-----------------------------------------------------------------------------
+
+/**
+ * Called when finishing mount operation. Result of operation is set in 
+ * nsGIOInputStream. This function is called in main thread as an async request 
+ * typically from dbus.
+ * @param source_object GFile object which requested the mount
+ * @param res result object
+ * @param user_data pointer to nsGIOInputStream
+ */
+static void
+mount_enclosing_volume_finished (GObject *source_object,
+                                 GAsyncResult *res,
+                                 gpointer user_data)
+{
+  GError *error = NULL;
+
+  nsGIOInputStream* istream = static_cast<nsGIOInputStream*>(user_data);
+  
+  g_file_mount_enclosing_volume_finish(G_FILE (source_object), res, &error);
+  
+  if (error) {
+    g_warning("Mount failed: %s %d", error->message, error->code);
+    istream->SetMountResult(MOUNT_OPERATION_FAILED, error->code);
+    g_error_free(error);
+  } else {
+    istream->SetMountResult(MOUNT_OPERATION_SUCCESS, 0);
+  }
+}
+
+/**
+ * This function is called when username or password are requested from user.
+ * This function is called in main thread as async request from dbus.
+ * @param mount_op mount operation
+ * @param message message to show to user
+ * @param default_user preffered user
+ * @param default_domain domain name
+ * @param flags what type of information is required
+ * @param user_data nsIChannel
+ */
+static void
+mount_operation_ask_password (GMountOperation   *mount_op,
+                              const char        *message,
+                              const char        *default_user,
+                              const char        *default_domain,
+                              GAskPasswordFlags flags,
+                              gpointer          user_data)
+{
+  nsIChannel *channel = (nsIChannel *) user_data;
+  if (!channel) {
+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
+    return;
+  }
+  // We can't handle request for domain
+  if (flags & G_ASK_PASSWORD_NEED_DOMAIN) {
+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
+    return;
+  }
+
+  nsCOMPtr<nsIAuthPrompt> prompt;
+  NS_QueryNotificationCallbacks(channel, prompt);
+
+  // If no auth prompt, then give up.  We could failover to using the
+  // WindowWatcher service, but that might defeat a consumer's purposeful
+  // attempt to disable authentication (for whatever reason).
+  if (!prompt) {
+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
+    return;
+  }
+  // Parse out the host and port...
+  nsCOMPtr<nsIURI> uri;
+  channel->GetURI(getter_AddRefs(uri));
+  if (!uri) {
+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
+    return;
+  }
+
+  nsCAutoString scheme, hostPort;
+  uri->GetScheme(scheme);
+  uri->GetHostPort(hostPort);
+
+  // It doesn't make sense for either of these strings to be empty.  What kind
+  // of funky URI is this?
+  if (scheme.IsEmpty() || hostPort.IsEmpty()) {
+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
+    return;
+  }
+  // Construct the single signon key.  Altering the value of this key will
+  // cause people's remembered passwords to be forgotten.  Think carefully
+  // before changing the way this key is constructed.
+  nsAutoString key, realm;
+
+  NS_ConvertUTF8toUTF16 dispHost(scheme);
+  dispHost.Append(NS_LITERAL_STRING("://"));
+  dispHost.Append(NS_ConvertUTF8toUTF16(hostPort));
+
+  key = dispHost;
+  if (*default_domain != '\0')
+  {
+    // We assume the realm string is ASCII.  That might be a bogus assumption,
+    // but we have no idea what encoding GnomeVFS is using, so for now we'll
+    // limit ourselves to ISO-Latin-1.  XXX What is a better solution?
+    realm.Append('"');
+    realm.Append(NS_ConvertASCIItoUTF16(default_domain));
+    realm.Append('"');
+    key.Append(' ');
+    key.Append(realm);
+  }
+  // Construct the message string...
+  //
+  // We use Necko's string bundle here.  This code really should be encapsulated
+  // behind some Necko API, after all this code is based closely on the code in
+  // nsHttpChannel.cpp.
+  nsCOMPtr<nsIStringBundleService> bundleSvc =
+      do_GetService(NS_STRINGBUNDLE_CONTRACTID);
+  if (!bundleSvc) {
+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
+    return;
+  }
+  nsCOMPtr<nsIStringBundle> bundle;
+  bundleSvc->CreateBundle("chrome://global/locale/commonDialogs.properties",
+                          getter_AddRefs(bundle));
+  if (!bundle) {
+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
+    return;
+  }
+  nsAutoString nsmessage;
+
+  if (flags & G_ASK_PASSWORD_NEED_PASSWORD) {
+    if (flags & G_ASK_PASSWORD_NEED_USERNAME) {
+      if (!realm.IsEmpty()) {
+        const PRUnichar *strings[] = { realm.get(), dispHost.get() };
+        bundle->FormatStringFromName(NS_LITERAL_STRING("EnterLoginForRealm").get(),
+                                     strings, 2, getter_Copies(nsmessage));
+      } else {
+        const PRUnichar *strings[] = { dispHost.get() };
+        bundle->FormatStringFromName(NS_LITERAL_STRING("EnterUserPasswordFor").get(),
+                                     strings, 1, getter_Copies(nsmessage));
+      }
+    } else {
+      NS_ConvertUTF8toUTF16 userName(default_user);
+      const PRUnichar *strings[] = { userName.get(), dispHost.get() };
+      bundle->FormatStringFromName(NS_LITERAL_STRING("EnterPasswordFor").get(),
+                                   strings, 2, getter_Copies(nsmessage));
+    }
+  } else {
+    g_warning("Unknown mount operation request (flags: %x)", flags);
+  }
+
+  if (nsmessage.IsEmpty()) {
+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
+    return;
+  }
+  // Prompt the user...
+  nsresult rv;
+  PRBool retval = PR_FALSE;
+  PRUnichar *user = nsnull, *pass = nsnull;
+  if (default_user) {
+    // user will be freed by PromptUsernameAndPassword
+    user = ToNewUnicode(NS_ConvertUTF8toUTF16(default_user));
+  }
+  if (flags & G_ASK_PASSWORD_NEED_USERNAME) {
+    rv = prompt->PromptUsernameAndPassword(nsnull, nsmessage.get(),
+                                           key.get(),
+                                           nsIAuthPrompt::SAVE_PASSWORD_PERMANENTLY,
+                                           &user, &pass, &retval);
+  } else {
+    rv = prompt->PromptPassword(nsnull, nsmessage.get(),
+                                key.get(),
+                                nsIAuthPrompt::SAVE_PASSWORD_PERMANENTLY,
+                                &pass, &retval);
+  }
+  if (NS_FAILED(rv) || !retval) {  //  was || user == '\0' || pass == '\0'
+    g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
+    return;
+  }
+  /* GIO should accept UTF8 */
+  g_mount_operation_set_username(mount_op, NS_ConvertUTF16toUTF8(user).get());
+  g_mount_operation_set_password(mount_op, NS_ConvertUTF16toUTF8(pass).get());
+  nsMemory::Free(user);
+  nsMemory::Free(pass);
+  g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_HANDLED);
+}
+
+//-----------------------------------------------------------------------------
+
+class nsGIOProtocolHandler : public nsIProtocolHandler
+                           , public nsIObserver
+{
+  public:
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIPROTOCOLHANDLER
+    NS_DECL_NSIOBSERVER
+
+    nsresult Init();
+
+  private:
+    void   InitSupportedProtocolsPref(nsIPrefBranch *prefs);
+    PRBool IsSupportedProtocol(const nsCString &spec);
+
+    nsCString mSupportedProtocols;
+};
+
+NS_IMPL_ISUPPORTS2(nsGIOProtocolHandler, nsIProtocolHandler, nsIObserver)
+
+nsresult
+nsGIOProtocolHandler::Init()
+{
+#ifdef PR_LOGGING
+  sGIOLog = PR_NewLogModule("gio");
+#endif
+
+  nsCOMPtr<nsIPrefBranch2> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
+  if (prefs)
+  {
+    InitSupportedProtocolsPref(prefs);
+    prefs->AddObserver(MOZ_GIO_SUPPORTED_PROTOCOLS, this, PR_FALSE);
+  }
+
+  return NS_OK;
+}
+
+void
+nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs)
+{
+  // Get user preferences to determine which protocol is supported.
+  // Gvfs/GIO has a set of supported protocols like obex, network, archive,
+  // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be
+  // irrelevant to process by browser. By default accept only smb and sftp
+  // protocols so far.
+  nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS,
+                                   getter_Copies(mSupportedProtocols));
+  if (NS_SUCCEEDED(rv)) {
+    mSupportedProtocols.StripWhitespace();
+    ToLowerCase(mSupportedProtocols);
+  }
+  else
+    mSupportedProtocols.Assign("smb:,sftp:"); // use defaults
+
+  LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get()));
+}
+
+PRBool
+nsGIOProtocolHandler::IsSupportedProtocol(const nsCString &aSpec)
+{
+  const char *specString = aSpec.get();
+  const char *colon = strchr(specString, ':');
+  if (!colon)
+    return PR_FALSE;
+
+  PRUint32 length = colon - specString + 1;
+
+  // <scheme> + ':'
+  nsCString scheme(specString, length);
+
+  char *found = PL_strcasestr(mSupportedProtocols.get(), scheme.get());
+  if (!found)
+    return PR_FALSE;
+
+  if (found[length] != ',' && found[length] != '\0')
+    return PR_FALSE;
+
+  return PR_TRUE;
+}
+
+NS_IMETHODIMP
+nsGIOProtocolHandler::GetScheme(nsACString &aScheme)
+{
+  aScheme.Assign(MOZ_GIO_SCHEME);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGIOProtocolHandler::GetDefaultPort(PRInt32 *aDefaultPort)
+{
+  *aDefaultPort = -1;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGIOProtocolHandler::GetProtocolFlags(PRUint32 *aProtocolFlags)
+{
+  // Is URI_STD true of all GnomeVFS URI types?
+  *aProtocolFlags = URI_STD | URI_DANGEROUS_TO_LOAD;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGIOProtocolHandler::NewURI(const nsACString &aSpec,
+                             const char *aOriginCharset,
+                             nsIURI *aBaseURI,
+                             nsIURI **aResult)
+{
+  const nsCString flatSpec(aSpec);
+  LOG(("gio: NewURI [spec=%s]\n", flatSpec.get()));
+
+  if (!aBaseURI)
+  {
+    // XXX Is it good to support all GIO protocols?
+    if (!IsSupportedProtocol(flatSpec))
+      return NS_ERROR_UNKNOWN_PROTOCOL;
+
+    PRInt32 colon_location = flatSpec.FindChar(':');
+    if (colon_location <= 0)
+      return NS_ERROR_UNKNOWN_PROTOCOL;
+
+    // Verify that GIO supports this URI scheme.
+    PRBool uri_scheme_supported = PR_FALSE;
+
+    GVfs *gvfs = g_vfs_get_default();
+
+    if (!gvfs) {
+      g_warning("Cannot get GVfs object.");
+      return NS_ERROR_UNKNOWN_PROTOCOL;
+    }
+
+    const gchar* const * uri_schemes = g_vfs_get_supported_uri_schemes(gvfs);
+
+    while (*uri_schemes != NULL) {
+      // While flatSpec ends with ':' the uri_scheme does not. Therefore do not
+      // compare last character.
+      if (StringHead(flatSpec, colon_location).Equals(*uri_schemes)) {
+        uri_scheme_supported = PR_TRUE;
+        break;
+      }
+      uri_schemes++;
+    }
+
+    if (!uri_scheme_supported) {
+      return NS_ERROR_UNKNOWN_PROTOCOL;
+    }
+  }
+
+  nsresult rv;
+  nsCOMPtr<nsIStandardURL> url =
+      do_CreateInstance(NS_STANDARDURL_CONTRACTID, &rv);
+  if (NS_FAILED(rv))
+    return rv;
+
+  rv = url->Init(nsIStandardURL::URLTYPE_STANDARD, -1, flatSpec,
+                 aOriginCharset, aBaseURI);
+  if (NS_SUCCEEDED(rv))
+    rv = CallQueryInterface(url, aResult);
+  return rv;
+
+}
+
+NS_IMETHODIMP
+nsGIOProtocolHandler::NewChannel(nsIURI *aURI, nsIChannel **aResult)
+{
+  NS_ENSURE_ARG_POINTER(aURI);
+  nsresult rv;
+
+  nsCAutoString spec;
+  rv = aURI->GetSpec(spec);
+  if (NS_FAILED(rv))
+    return rv;
+
+  nsRefPtr<nsGIOInputStream> stream = new nsGIOInputStream(spec);
+  if (!stream)
+  {
+    rv = NS_ERROR_OUT_OF_MEMORY;
+  }
+  else
+  {
+    // start out assuming an unknown content-type.  we'll set the content-type
+    // to something better once we open the URI.
+    rv = NS_NewInputStreamChannel(aResult,
+                                  aURI,
+                                  stream,
+                                  NS_LITERAL_CSTRING(UNKNOWN_CONTENT_TYPE));
+    if (NS_SUCCEEDED(rv))
+      stream->SetChannel(*aResult);
+  }
+  return rv;
+}
+
+NS_IMETHODIMP
+nsGIOProtocolHandler::AllowPort(PRInt32 aPort,
+                                const char *aScheme,
+                                PRBool *aResult)
+{
+  // Don't override anything.
+  *aResult = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGIOProtocolHandler::Observe(nsISupports *aSubject,
+                              const char *aTopic,
+                              const PRUnichar *aData)
+{
+  if (strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID) == 0) {
+    nsCOMPtr<nsIPrefBranch> prefs = do_QueryInterface(aSubject);
+    InitSupportedProtocolsPref(prefs);
+  }
+  return NS_OK;
+}
+
+//-----------------------------------------------------------------------------
+
+#define NS_GIOPROTOCOLHANDLER_CID                    \
+{ /* ee706783-3af8-4d19-9e84-e2ebfe213480 */         \
+    0xee706783,                                      \
+    0x3af8,                                          \
+    0x4d19,                                          \
+    {0x9e, 0x84, 0xe2, 0xeb, 0xfe, 0x21, 0x34, 0x80} \
+}
+
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGIOProtocolHandler, Init)
+NS_DEFINE_NAMED_CID(NS_GIOPROTOCOLHANDLER_CID);
+
+static const mozilla::Module::CIDEntry kVFSCIDs[] = {
+  { &kNS_GIOPROTOCOLHANDLER_CID, false, NULL, nsGIOProtocolHandlerConstructor },
+  { NULL }
+};
+
+static const mozilla::Module::ContractIDEntry kVFSContracts[] = {
+  { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX MOZ_GIO_SCHEME, &kNS_GIOPROTOCOLHANDLER_CID },
+  { NULL }
+};
+
+static const mozilla::Module kVFSModule = {
+  mozilla::Module::kVersion,
+  kVFSCIDs,
+  kVFSContracts
+};
+
+NSMODULE_DEFN(nsGIOModule) = &kVFSModule;
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -449,16 +449,37 @@ nsIOService::GetProtocolHandler(const ch
 
         rv = CallGetService(contractID.get(), result);
         if (NS_SUCCEEDED(rv)) {
             CacheProtocolHandler(scheme, *result);
             return rv;
         }
 
 #ifdef MOZ_X11
+        // check to see whether GVFS can handle this URI scheme.  if it can
+        // create a nsIURI for the "scheme:", then we assume it has support for
+        // the requested protocol.  otherwise, we failover to using the default
+        // protocol handler.
+
+        rv = CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX"moz-gio",
+                            result);
+        if (NS_SUCCEEDED(rv)) {
+            nsCAutoString spec(scheme);
+            spec.Append(':');
+
+            nsIURI *uri;
+            rv = (*result)->NewURI(spec, nsnull, nsnull, &uri);
+            if (NS_SUCCEEDED(rv)) {
+                NS_RELEASE(uri);
+                return rv;
+            }
+
+            NS_RELEASE(*result);
+        }
+
         // check to see whether GnomeVFS can handle this URI scheme.  if it can
         // create a nsIURI for the "scheme:", then we assume it has support for
         // the requested protocol.  otherwise, we failover to using the default
         // protocol handler.
 
         // XXX should this be generalized into something that searches a
         // category?  (see bug 234714)