[maemo-commits] [maemo-commits] r11238 - in projects/haf/trunk/osso-gnome-vfs2/debian: . patches

[From: subversion at stage.maemo.org]

Author: martyn
Date: 2007-04-24 14:49:31 +0300 (Tue, 24 Apr 2007)
New Revision: 11238

Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/27-workaround-broken-http-servers.patch
Log:
Fixes: NB#54743, hildon_uri_get_actions_by_uri aborts calling ...

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-04-24 10:26:23 UTC (rev 11237)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-04-24 11:49:31 UTC (rev 11238)
@@ -1,3 +1,10 @@
+osso-gnome-vfs2 (2.16.3-1osso15) unstable; urgency=low
+
+  * UNRELEASED!
+  * Fixes: NB#54743, hildon_uri_get_actions_by_uri aborts calling ...
+
+ -- Martyn Russell <martyn at imendio.com>  Fri, 27 Apr 2007 15:10:07 +0100
+
 osso-gnome-vfs2 (2.16.3-1osso14) unstable; urgency=low
 
   * Added a patch 29 to fix upstream bug with umounting monitored uris 
@@ -17,6 +24,8 @@
 
  -- Richard Hult <richard at imendio.com>  Fri, 30 Mar 2007 17:22:17 +0200
 
+
+
 osso-gnome-vfs2 (2.16.3-1osso11) unstable; urgency=low
 
   * Don't package .la files
@@ -34,18 +43,22 @@
 
  -- Richard Hult <richard at imendio.com>  Fri,  9 Mar 2007 09:08:28 +0100
 
+
+
 osso-gnome-vfs2 (2.16.3-1osso9) unstable; urgency=low
 
   * Make a release with samba enabled
 
  -- Richard Hult <richard at imendio.com>  Fri, 16 Feb 2007 16:01:10 +0100
 
+
 osso-gnome-vfs2 (2.16.3-1osso7) unstable; urgency=low
 
   * Really apply the patch for NB#50018
 
  -- Richard Hult <richard at imendio.com>  Fri,  2 Feb 2007 15:41:41 +0100
 
+
 osso-gnome-vfs2 (2.16.3-1osso6) unstable; urgency=low
 
   * Split out samba package into its own binary package

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/patches/27-workaround-broken-http-servers.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/27-workaround-broken-http-servers.patch	2007-04-24 10:26:23 UTC (rev 11237)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/27-workaround-broken-http-servers.patch	2007-04-24 11:49:31 UTC (rev 11238)
@@ -1,8 +1,10 @@
---- modules/http-neon-method.c-unmod	2007-02-02 14:59:12.000000000 +0100
-+++ modules/http-neon-method.c	2007-02-02 15:00:39.000000000 +0100
-@@ -1831,6 +1831,41 @@ strip_query (const char *path)
- 	return g_strndup (path, tmp - path);
- }
+Index: modules/http-neon-method.c
+===================================================================
+--- modules/http-neon-method.c	(revision 11158)
++++ modules/http-neon-method.c	(working copy)
+@@ -1819,6 +1819,41 @@ http_follow_redirect (HttpContext *conte
+ /* ************************************************************************** */
+ /* Http operations */
  
 +/* Sends a HEAD/GET request where we are not interested in any information
 + * except headers. Some broken servers send the content for HEAD requests, so we
@@ -42,28 +44,49 @@
  static GnomeVFSResult
  http_get_file_info (HttpContext *context, GnomeVFSFileInfo *info)
  {
-@@ -1921,9 +1956,18 @@ http_get_file_info (HttpContext *context
- 
+@@ -1898,7 +1933,7 @@ http_get_file_info (HttpContext *context
   head_start:
  	req  = ne_request_create (context->session, "HEAD", context->path);
+ 
+-	res = ne_request_dispatch (req);
 +	res = dispatch_head_request (req);
-+	result = resolve_result (res, req);
  
--	res = ne_request_dispatch (req);
--
+ 	if (res == NE_REDIRECT) {
+ 		ne_request_destroy (req);
+@@ -1916,6 +1951,32 @@ http_get_file_info (HttpContext *context
+ 
+ 	result = resolve_result (res, req);	
+ 	
 +	if (res == NE_ERROR || result == GNOME_VFS_ERROR_NOT_SUPPORTED) {
 +		/* Assume that there was a broken server... fallback to GET. */
 +		DEBUG_HTTP ("Fall back to GET request");
 +		
 +		ne_request_destroy (req);
++		req = NULL;
++
 +		req = ne_request_create (context->session, "GET", context->path);
 +		res = dispatch_head_request (req);
++
++		if (res == NE_REDIRECT) {
++			result = http_follow_redirect (context);		
++
++			ne_request_destroy (req);
++			req = NULL;
++		
++			if (result == GNOME_VFS_OK) {
++				goto head_start;
++			} else {
++				return result;
++			}
++		}
++
++		result = resolve_result (res, req);	
 +	}
 +	
- 	if (res == NE_REDIRECT) {
- 		ne_request_destroy (req);
- 		req = NULL;
-@@ -1967,13 +2011,6 @@ http_get_file_info (HttpContext *context
+ 	if (result == GNOME_VFS_OK) {
+ 		const char *name;	
+ 		
+@@ -1930,13 +1991,6 @@ http_get_file_info (HttpContext *context
  		info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_TYPE;
  
  		std_headers_to_file_info (req, info);