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

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-02-02 16:31:36 +0200 (Fri, 02 Feb 2007)
New Revision: 9571

Added:
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/23-http-timeout.patch
Modified:
   projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/changelog
Log:
Prepare for release.

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-02-02 14:18:00 UTC (rev 9570)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/changelog	2007-02-02 14:31:36 UTC (rev 9571)
@@ -1,3 +1,9 @@
+osso-gnome-vfs2 (2.12.0.19-2osso2) unstable; urgency=low
+
+  * Fixes NB#50018, Application jams forever when connection is blocked for...
+
+ -- Richard Hult <richard at imendio.com>  Fri,  2 Feb 2007 15:25:43 +0100
+
 osso-gnome-vfs2 (2.12.0.19-2osso1) unstable; urgency=low
 
   * Revert the change in .18 since we don't want that in this branch

Added: projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/23-http-timeout.patch
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/23-http-timeout.patch	2007-02-02 14:18:00 UTC (rev 9570)
+++ projects/haf/branches/osso-gnome-vfs2/2.12.x/trunk/debian/patches/23-http-timeout.patch	2007-02-02 14:31:36 UTC (rev 9571)
@@ -0,0 +1,14 @@
+Index: modules/http-neon-method.c
+===================================================================
+--- modules/http-neon-method.c	(revision 8989)
++++ modules/http-neon-method.c	(arbetskopia)
+@@ -1640,6 +1640,9 @@ http_acquire_connection (HttpContext *co
+ 		return GNOME_VFS_ERROR_INTERNAL;
+ 	}
+ 
++	/* Set the timeout, filed as upstream bug #402851, NB#50018. */
++	ne_set_read_timeout (session, 30);
++	
+ 	user_agent = getenv (CUSTOM_USER_AGENT_VARIABLE);
+ 	   
+ 	if (user_agent == NULL) {