diff --git a/gnome-vfs-2.15.92-redirect.patch b/gnome-vfs-2.15.92-redirect.patch new file mode 100644 index 0000000..5e9d388 --- /dev/null +++ b/gnome-vfs-2.15.92-redirect.patch @@ -0,0 +1,58 @@ +--- gnome-vfs-2.15.91/modules/http-neon-method.c.redirect 2006-08-30 14:30:23.000000000 -0400 ++++ gnome-vfs-2.15.91/modules/http-neon-method.c 2006-08-30 14:30:40.000000000 -0400 +@@ -1846,8 +1846,11 @@ + + result = http_follow_redirect (context); + +- if (result == GNOME_VFS_OK) ++ if (result == GNOME_VFS_OK) { + goto propfind_start; ++ } else { ++ return result; ++ } + } + + req = ne_propfind_get_request (pfh); +@@ -1896,12 +1899,15 @@ + res = ne_request_dispatch (req); + + if (res == NE_REDIRECT) { +- result = http_follow_redirect (context); +- ++ ne_request_destroy (req); ++ req = NULL; ++ ++ result = http_follow_redirect (context); ++ + if (result == GNOME_VFS_OK) { +- ne_request_destroy (req); +- req = NULL; + goto head_start; ++ } else { ++ return result; + } + } + +@@ -2006,7 +2012,12 @@ + if (res == NE_REDIRECT) { + ne_request_destroy (req); + result = http_follow_redirect (hctx); +- goto options_start; ++ ++ if (result == GNOME_VFS_OK) { ++ goto options_start; ++ } else { ++ return result; ++ } + } + + result = resolve_result (res, req); +@@ -2289,7 +2300,7 @@ + + if (res == NE_REDIRECT) { + result = http_follow_redirect (hctx); +- ++ + if (result == GNOME_VFS_OK) + goto get_start; + } diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index 722655e..5fdf989 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -13,7 +13,7 @@ Summary: The GNOME virtual file-system libraries Name: gnome-vfs2 Version: 2.15.92 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -62,6 +62,9 @@ Patch4: gnome-vfs-2.15.1-use-sys-inotify.patch # RH bug #197868 Patch6: gnome-vfs-2.15.91-mailto-command.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=353337 +Patch7: gnome-vfs-2.15.92-redirect.patch + %description GNOME VFS is the GNOME virtual file system. It is the foundation of the Nautilus file manager. It provides a modular architecture and @@ -105,6 +108,8 @@ shares (SMB) to applications using GNOME VFS. %patch6 -p1 -b .mailto-command +%patch7 -p1 -b .redirect + # send to upstream %patch101 -p1 -b .schema_about @@ -195,6 +200,9 @@ done %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Wed Aug 30 2006 Matthias Clasen - 2.15.92-2 +- Make error handling for http redirect more robust (203678) + * Mon Aug 21 2006 Alexander Larsson - 2.15.92-1 - update to 2.15.92