Initial original import from: fuse-2.4.2-2.fc4

[captive.git] / src / install / acquire / cabinet.c

diff --git a/src/install/acquire/cabinet.c b/src/install/acquire/cabinet.c
index a748492..3967631 100644 (file)
--- a/src/install/acquire/cabinet.c
+++ b/src/install/acquire/cabinet.c
@@ -102,7 +102,7 @@ static void handler_SIGALRM(int signo)
 /* FIXME: This is hack.
  * Correct way would be to use 'GnomeVFSCancellation'
  * to abort 'GnomeVFSInetConnection' acting as 'GnomeVFSSocket'.
- * This abort should be handled from 'http'/'httpcaptive' handler
+ * This abort should be handled from 'http' handler
  * but gnome_vfs_cancellation_cancel() cannot be invoked from
  * the asynchronous slave thread.
  */
@@ -127,6 +127,7 @@ GnomeVFSHandle *handle_new;
 struct sigaction oldact;
 int errint;
 struct itimerval itimerval;
+GnomeVFSFileSize offset_current;
 
                if ((*ui_progress)(NULL))
                        return GNOME_VFS_ERROR_INTERRUPTED;
@@ -149,7 +150,13 @@ struct itimerval itimerval;
                                        &itimerval,     /* value */
                                        NULL);  /* ovalue */
                        g_assert(errint==0);
-                       errvfsresult=gnome_vfs_seek(*acquire_cabinet->handlep,GNOME_VFS_SEEK_START,offset);
+                       /* Optimization avoid resetting connection
+                        * in neon "http" handler of: FC4 gnome-vfs2-2.10.0-5
+                        * http://bugzilla.gnome.org/show_bug.cgi?id=324984
+                        */
+                       errvfsresult=gnome_vfs_tell(*acquire_cabinet->handlep,&offset_current);
+                       if (GNOME_VFS_OK==errvfsresult && (GnomeVFSFileOffset)offset_current!=offset)
+                               errvfsresult=gnome_vfs_seek(*acquire_cabinet->handlep,GNOME_VFS_SEEK_START,offset);
                        if (GNOME_VFS_OK==errvfsresult)
                                errvfsresult=gnome_vfs_read(*acquire_cabinet->handlep,buffer,bytes,bytes_read);
                        }
@@ -175,7 +182,8 @@ struct itimerval itimerval;
 
                /* Reopen '*acquire_cabinet->handlep' */
                g_assert(acquire_cabinet->handle_uri!=NULL);
-               if (GNOME_VFS_OK==(errvfsresult=gnome_vfs_open_uri(&handle_new,acquire_cabinet->handle_uri,GNOME_VFS_OPEN_READ))) {
+               if (GNOME_VFS_OK==(errvfsresult=gnome_vfs_open_uri(&handle_new,acquire_cabinet->handle_uri,
+                                       GNOME_VFS_OPEN_READ|GNOME_VFS_OPEN_RANDOM))) {
                        gnome_vfs_close(*acquire_cabinet->handlep);     /* errors ignored */
                        *acquire_cabinet->handlep=handle_new;
                        }
@@ -322,33 +330,7 @@ struct acquire_cabinet *r;
        r->cabinet_done=0;
        r->cabinet_used=cabinet_used;
 
-       /* Replace 'http://' by 'httpcaptive://' if system 'http' does not support seek(). */
-       gnome_vfs_uri_ref(uri);
-       if (GNOME_VFS_ERROR_NOT_SUPPORTED==gnome_vfs_seek(
-                       *handlep,       /* handle */
-                       GNOME_VFS_SEEK_START,   /* whence */
-                       0)) {   /* offset */
-gchar *href;
-const gchar *href2;
-GnomeVFSURI *uri2;
-
-               href=gnome_vfs_uri_to_string(uri,GNOME_VFS_URI_HIDE_NONE);
-               if (strncmp(href,"http://",strlen("http://"))) {
-                       g_warning(_("Destination file URL not valid: %s"),href);
-                       goto href_done;
-                       }
-               href2=captive_printf_alloca("httpcaptive://%s",href+strlen("http://"));
-               if (!(uri2=gnome_vfs_uri_new(href2))) {
-                       g_warning(_("'httpcaptive' GnomeVFS method not supported; install package 'gnomevfs-httpcaptive'; URL: %s"),href2);
-                       goto href_done;
-                       }
-               gnome_vfs_uri_unref(uri);
-               uri=uri2;
-href_done:;
-               }
-
        acquire_cabinet_set_uri(r,uri);
-       gnome_vfs_uri_unref(uri);
        r->memory=acquire_cabinet_memory_object_new();
 
        return r;