From 255c8abe7f2e87188a87acc74a3f1c17c6fc91d7 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Jan 08 2010 21:13:14 +0000
Subject: sync with Rawhide: neon-request patch


---

diff --git a/audacious-plugins-2.2-neon-request.patch b/audacious-plugins-2.2-neon-request.patch
index 67f1928..d568aa8 100644
--- a/audacious-plugins-2.2-neon-request.patch
+++ b/audacious-plugins-2.2-neon-request.patch
@@ -1,7 +1,23 @@
-diff -Nur audacious-plugins-2.2-orig/src/neon/neon.c audacious-plugins-2.2-neon/src/neon/neon.c
+diff -Nur audacious-plugins-2.2-orig/src/neon/neon.c audacious-plugins-2.2/src/neon/neon.c
 --- audacious-plugins-2.2-orig/src/neon/neon.c	2009-11-22 23:49:53.000000000 +0100
-+++ audacious-plugins-2.2-neon/src/neon/neon.c	2009-12-19 19:02:17.000000000 +0100
-@@ -1354,7 +1354,9 @@
++++ audacious-plugins-2.2/src/neon/neon.c	2010-01-08 21:39:20.000000000 +0100
+@@ -609,6 +609,7 @@
+             handle->redircount += 1;
+             rediruri = (ne_uri*)ne_redirect_location(handle->session);
+             ne_request_destroy(handle->request);
++            handle->request = NULL;
+ 
+             if (NULL == rediruri) {
+                 _ERROR("<%p> Could not parse redirect response", handle);
+@@ -627,6 +628,7 @@
+                 _ERROR("<%p> neon error string: %s", handle, ne_get_error(handle->session));
+             }
+             ne_request_destroy(handle->request);
++            handle->request = NULL;
+             _LEAVE -1;
+             break;
+     }
+@@ -1354,7 +1356,9 @@
          kill_reader(h);
      }
  
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 64b7a97..9e8b3d2 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -268,6 +268,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Fri Jan  8 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-10
+- In neon transport, after error handling set destroyed request
+  pointers to NULL, so vfs read exits early.
+
 * Fri Jan  8 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-9
 - Enable modplug plugin again: The code is an "in-progress rewrite [...]
   with many fixes for module formats not available in libmodplug, and is