r22249 - in /desktop/unstable/libsoup2.4/debian: changelog control patches/redirect_head.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Nov  7 15:03:46 2009
New Revision: 22249

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22249
Log:
* debian/patches/redirect_head.patch:
  - Added. Don't change HEAD to GET on 303 redirect (from upstream git)

Added:
    desktop/unstable/libsoup2.4/debian/patches/redirect_head.patch
Modified:
    desktop/unstable/libsoup2.4/debian/changelog
    desktop/unstable/libsoup2.4/debian/control

Modified: desktop/unstable/libsoup2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/changelog?rev=22249&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/changelog [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/changelog [utf-8] Sat Nov  7 15:03:46 2009
@@ -1,3 +1,10 @@
+libsoup2.4 (2.28.1-3) UNRELEASED; urgency=low
+
+  * debian/patches/redirect_head.patch:
+    - Added. Don't change HEAD to GET on 303 redirect (from upstream git)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 07 Nov 2009 15:00:54 +0000
+
 libsoup2.4 (2.28.1-2) unstable; urgency=low
 
   * debian/patches/sqlite_strcmp_null_string.patch:

Modified: desktop/unstable/libsoup2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/control?rev=22249&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/control [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/control [utf-8] Sat Nov  7 15:03:46 2009
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 5),
                libgconf2-dev,
                libglib2.0-dev (>= 2.21.3),

Added: desktop/unstable/libsoup2.4/debian/patches/redirect_head.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/patches/redirect_head.patch?rev=22249&op=file
==============================================================================
--- desktop/unstable/libsoup2.4/debian/patches/redirect_head.patch (added)
+++ desktop/unstable/libsoup2.4/debian/patches/redirect_head.patch [utf-8] Sat Nov  7 15:03:46 2009
@@ -1,0 +1,48 @@
+commit fd0433d5a04b7d973ef01bfd4f711122728a4db4
+Author: Dan Winship <danw at gnome.org>
+Date:   Thu Nov 5 11:15:38 2009 -0500
+
+    Don't change HEAD to GET on 303 redirect
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=600830
+
+diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
+index 44a4476..8fb28ec 100644
+--- a/libsoup/soup-session.c
++++ b/libsoup/soup-session.c
+@@ -882,10 +882,12 @@ redirect_handler (SoupMessage *msg, gpointer user_data)
+ 	     !SOUP_METHOD_IS_SAFE (msg->method)) ||
+ 	    (msg->status_code == SOUP_STATUS_MOVED_PERMANENTLY &&
+ 	     msg->method == SOUP_METHOD_POST)) {
+-		/* Redirect using a GET */
+-		g_object_set (msg,
+-			      SOUP_MESSAGE_METHOD, SOUP_METHOD_GET,
+-			      NULL);
++		if (msg->method != SOUP_METHOD_HEAD) {
++			/* Redirect using a GET */
++			g_object_set (msg,
++				      SOUP_MESSAGE_METHOD, SOUP_METHOD_GET,
++				      NULL);
++		}
+ 		soup_message_set_request (msg, NULL,
+ 					  SOUP_MEMORY_STATIC, NULL, 0);
+ 		soup_message_headers_set_encoding (msg->request_headers,
+diff --git a/tests/redirect-test.c b/tests/redirect-test.c
+index 20e9d48..cd6f1a5 100644
+--- a/tests/redirect-test.c
++++ b/tests/redirect-test.c
+@@ -44,9 +44,12 @@ static struct {
+ 	{ { { "HEAD", "/302", 302 },
+ 	    { "HEAD", "/", 200 },
+ 	    { NULL } }, 200 },
+-	/* 303 is a nonsensical response to HEAD, so we don't care
+-	 * what happens there.
++	/* 303 is a nonsensical response to HEAD, but some sites do
++	 * it anyway. :-/
+ 	 */
++	{ { { "HEAD", "/303", 303 },
++	    { "HEAD", "/", 200 },
++	    { NULL } }, 200 },
+ 	{ { { "HEAD", "/307", 307 },
+ 	    { "HEAD", "/", 200 },
+ 	    { NULL } }, 200 },