[maemo-commits] [maemo-commits] r8815 - in projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2006-12-19 11:49:43 +0200 (Tue, 19 Dec 2006)
New Revision: 8815

Modified:
   projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog
   projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/patches/27-workaround-broken-http-servers.patch
Log:
Update patch.

Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog	2006-12-19 09:35:36 UTC (rev 8814)
+++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog	2006-12-19 09:49:43 UTC (rev 8815)
@@ -2,6 +2,8 @@
 
   * FIXME: UNRELEASED
   * Update inotify headers from upstream GNOME CVS to get the right license
+  * Update caseless-file-method from the normal file-method
+  * Merge from stable, NB#43533, to work around broken http servers
 
  -- Richard Hult <richard at imendio.com>  Fri, 15 Dec 2006 09:46:01 +0100
 

Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/patches/27-workaround-broken-http-servers.patch
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/patches/27-workaround-broken-http-servers.patch	2006-12-19 09:35:36 UTC (rev 8814)
+++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/patches/27-workaround-broken-http-servers.patch	2006-12-19 09:49:43 UTC (rev 8815)
@@ -1,8 +1,6 @@
-Index: modules/http-neon-method.c
-===================================================================
---- modules/http-neon-method.c	(revision 8808)
-+++ modules/http-neon-method.c	(working copy)
-@@ -1819,6 +1819,41 @@ http_follow_redirect (HttpContext *conte
+--- modules/http-neon-method.c-unmod	2006-12-19 10:44:47.000000000 +0100
++++ modules/http-neon-method.c	2006-12-19 10:45:49.000000000 +0100
+@@ -1817,6 +1817,41 @@ http_follow_redirect (HttpContext *conte
  /* ************************************************************************** */
  /* Http operations */
  
@@ -44,7 +42,7 @@
  static GnomeVFSResult
  http_get_file_info (HttpContext *context, GnomeVFSFileInfo *info)
  {
-@@ -1897,9 +1932,18 @@ http_get_file_info (HttpContext *context
+@@ -1903,9 +1938,18 @@ http_get_file_info (HttpContext *context
  
   head_start:
  	req  = ne_request_create (context->session, "HEAD", context->path);
@@ -65,7 +63,7 @@
  	if (res == NE_REDIRECT) {
  		ne_request_destroy (req);
  		req = NULL;
-@@ -1930,13 +1974,6 @@ http_get_file_info (HttpContext *context
+@@ -1947,12 +1991,6 @@ http_get_file_info (HttpContext *context
  		info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_TYPE;
  
  		std_headers_to_file_info (req, info);
@@ -75,7 +73,6 @@
 -		    && ! g_ascii_strcasecmp (info->mime_type, "audio/mpeg")) {
 -			ne_close_connection (ne_get_session (req));
 -		}
--		
  	}
  	
  	ne_request_destroy (req);