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

[From: subversion at stage.maemo.org]

Author: richard
Date: 2008-06-03 12:38:51 +0300 (Tue, 03 Jun 2008)
New Revision: 15618

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/48-NB86077-socket.patch
Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
Attempt to fix NB#86077

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2008-06-02 09:25:12 UTC (rev 15617)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2008-06-03 09:38:51 UTC (rev 15618)
@@ -1,8 +1,9 @@
-osso-gnome-vfs2 (2.16.3-1osso38~unreleased) unstable; urgency=low
+osso-gnome-vfs2 (2.16.3-1osso38) unstable; urgency=low
 
-  * 
+  * Fixes: NB#86077, RSS reader keeps crashing - gnomevfs problem
+    (Tries to fix it at least)
 
- -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 05 Mar 2008 14:16:15 +0200
+ -- Richard Hult <richard at imendio.com>  Tue,  3 Jun 2008 11:11:23 +0200
 
 osso-gnome-vfs2 (2.16.3-1osso37) unstable; urgency=low
 

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/48-NB86077-socket.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/48-NB86077-socket.patch	2008-06-02 09:25:12 UTC (rev 15617)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/48-NB86077-socket.patch	2008-06-03 09:38:51 UTC (rev 15618)
@@ -0,0 +1,24 @@
+Index: imported/neon/ne_request.c
+===================================================================
+--- imported/neon/ne_request.c	(revision 15617)
++++ imported/neon/ne_request.c	(working copy)
+@@ -866,6 +866,9 @@ ssize_t ne_read_response_block(ne_reques
+     size_t readlen = buflen;
+     struct ne_response *const resp = &req->resp;
+ 
++    if (req->session->socket == NULL)
++            return -1;
++
+     if (read_response_block(req, resp, buffer, &readlen))
+ 	return -1;
+ 
+@@ -1543,7 +1546,8 @@ static int open_connection(ne_request *r
+     ne_session *sess = req->session;
+     int ret;
+     
+-    if (sess->connected) return NE_OK;
++    if (sess->connected && sess->socket) return NE_OK;
++    sess->connected = 0;
+ 
+     if (!sess->use_proxy)
+ 	ret = do_connect(req, &sess->server, _("Could not connect to server"));