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

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-11-13 11:54:55 +0200 (Tue, 13 Nov 2007)
New Revision: 14771

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/43-NB74125-fix-for-NB54743.patch
Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
NB#B74125

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-11-12 18:00:09 UTC (rev 14770)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-11-13 09:54:55 UTC (rev 14771)
@@ -1,3 +1,9 @@
+osso-gnome-vfs2 (2.16.3-1osso33) unstable; urgency=low
+
+  * Fixes: NB#B74125, RSS crashes while refreshing after a OFF_ON cycle of
+
+ -- Richard Hult <richard at imendio.com>  Tue, 13 Nov 2007 10:31:15 +0100
+
 osso-gnome-vfs2 (2.16.3-1osso32) unstable; urgency=low
 
   * Fixes: NB#65193, It takes about 10 minutes before Samba server is

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/43-NB74125-fix-for-NB54743.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/43-NB74125-fix-for-NB54743.patch	2007-11-12 18:00:09 UTC (rev 14770)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/43-NB74125-fix-for-NB54743.patch	2007-11-13 09:54:55 UTC (rev 14771)
@@ -0,0 +1,30 @@
+--- modules/http-neon-method.c-unmod	2007-11-12 13:40:38.000000000 +0100
++++ modules/http-neon-method.c	2007-11-12 13:45:55.000000000 +0100
+@@ -1852,7 +1852,7 @@ dispatch_head_request (ne_request *req)
+ {
+ 	gboolean must_close = FALSE;
+ 	char buffer[1];
+-	size_t len;
++	size_t len = -1;
+ 	int res;
+ 	
+ 	do {
+@@ -1862,12 +1862,14 @@ dispatch_head_request (ne_request *req)
+ 			len = ne_read_response_block (req, buffer, sizeof buffer);
+ 			must_close = (len > 0);
+ 		}
+-
+-		if (NE_OK == res) {
+-			res = ne_end_request (req);
+-		}
+ 	} while (NE_RETRY == res);
+ 
++	if (len != -1) {
++		do {
++			res = ne_end_request (req);
++		} while (NE_RETRY == res);
++	}
++	
+ 	if (must_close) {
+ 		DEBUG_HTTP ("explictly closing connection");
+ 		ne_close_connection (ne_get_session (req));