[maemo-commits] [maemo-commits] r11122 - in projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-04-18 15:43:15 +0300 (Wed, 18 Apr 2007)
New Revision: 11122

Added:
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/24-http-neon-file-info-redirect.patch
Modified:
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/changelog
Log:
Fix NB#54416.

Modified: projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/changelog
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/changelog	2007-04-18 12:31:08 UTC (rev 11121)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/changelog	2007-04-18 12:43:15 UTC (rev 11122)
@@ -1,3 +1,9 @@
+osso-gnome-vfs2 (2.12.0.19-2osso3) unstable; urgency=low
+
+  * Fixes NB#54416, gnome-vfs http module crashes of an url with redirect
+
+ -- Richard Hult <richard at imendio.com>  Wed, 18 Feb 2007 13:41:41 +0200
+
 osso-gnome-vfs2 (2.12.0.19-2osso2) unstable; urgency=low
 
   * Fixes NB#50018, Application jams forever when connection is blocked for...

Added: projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/24-http-neon-file-info-redirect.patch
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/24-http-neon-file-info-redirect.patch	2007-04-18 12:31:08 UTC (rev 11121)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/24-http-neon-file-info-redirect.patch	2007-04-18 12:43:15 UTC (rev 11122)
@@ -0,0 +1,62 @@
+--- ../osso-gnome-vfs2-2.12.0.19/modules/http-neon-method.c	2007-03-28 16:10:04.000000000 -0300
++++ modules/http-neon-method.c	2007-03-28 16:23:08.000000000 -0300
+@@ -1942,34 +1942,43 @@
+ 	req  = ne_request_create (context->session, "HEAD", context->path);
+ 
+ 	add_default_header_handlers (req, info);
+-		
+ 	res = dispatch_head_request (req);
++
++	if (res == NE_REDIRECT) {
++		result = http_follow_redirect (context);
++
++		if (result == GNOME_VFS_OK) {
++			ne_request_destroy (req);
++			req = NULL;
++			goto head_start;
++		}
++	}
++
+ 	result = resolve_result (res, req);
++	ne_request_destroy (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 = ne_request_create (context->session, "GET", context->path);
+ 		add_default_header_handlers (req, info);
+ 		res = dispatch_head_request (req);
+-	}
+-	
+-	if (res == NE_REDIRECT) {
+-		result = http_follow_redirect (context);
+-		
+-		if (result == GNOME_VFS_OK) {
+-			ne_request_destroy (req);
+-			req = NULL;
+-			goto head_start;
++
++		if (res == NE_REDIRECT) {
++			result = http_follow_redirect (context);
++
++			if (result == GNOME_VFS_OK) {
++				ne_request_destroy (req);
++				req = NULL;
++				goto head_start;
++			}
+ 		}
+-	}
+ 
++		result = resolve_result (res, req);
++		ne_request_destroy (req);
++	}
+ 
+-	result = resolve_result (res, req);	
+-	ne_request_destroy (req);
+-	
+ 	if (result == GNOME_VFS_OK) {
+ 		const char *name;
+ 		char       *tail;