Merge lp:~brian-murray/ubuntu/natty/ubuntu-geoip/fix-719324 into lp:ubuntu/natty/ubuntu-geoip

[Brian Murray]

I created a branch for the patch in bug 719324. From its description:

According to rfc2616 HTTP request methods are case-sensitive. Currently ubunt-geoip-provider makes an HTTP GET request with a lowercase method name.

Example:
get /lookup HTTP/1.1

Expected:
GET /lookup HTTP/1.1

While web servers (like Apache and Squid) accept the lowercase method name, it may not be the case for some less liberal servers.

[Dave Walker (davewalker)]

It seems packaging for this is maintained at lp:~ubuntu-desktop/ubuntu-geoip/ubuntu

Probably wise for this branch to to re-based against that and proposed to be merged there.

[Dave Walker (davewalker)]

Just thought i'd add that this package declares itself as using quilt for a patching system, and this branch directly edits the upstream code.

I'd be surprised if upstream wouldn't accept a branch directly against lp;ubuntu-geoip fixing it upstream, meaning no need to start carrying patches at package level.

Thanks.

[Artur Rona (ari-tczew)]

That's right, please use patch system, put it into debian/patches and forward patch to upstream. Also as Dave wrote, change should be pushed into lp:~ubuntu-desktop/ubuntu-geoip/ubuntu then sponsor pushes changes to archive as well.

[Barry Warsaw (barry)]

Aside from the above suggestions, the patch in question looks okay to me.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-08 11:15:10 +0000
+++ debian/changelog	2011-03-04 22:43:07 +0000
@@ -1,3 +1,10 @@
+ubuntu-geoip (0.0.2-0ubuntu5) natty; urgency=low
+
+  * Per RFC 2616 use upper case for GET request thanks to Andrew Glen-Young
+    for the patch (LP: #719324) 
+
+ -- Brian Murray <[e-mail]>  Fri, 04 Mar 2011 13:58:56 -0800
+
 ubuntu-geoip (0.0.2-0ubuntu4) natty; urgency=low
 
   * debian/control

=== modified file 'src/ubuntu-geoip-provider.c'
--- src/ubuntu-geoip-provider.c	2010-11-15 08:59:29 +0000
+++ src/ubuntu-geoip-provider.c	2011-03-04 22:43:07 +0000
@@ -517,7 +517,7 @@
 		provider->priv->requeue_source = 0;
 	}
 
-	SoupMessage * message = soup_message_new("get", "http://geoip.ubuntu.com/lookup");
+	SoupMessage * message = soup_message_new("GET", "http://geoip.ubuntu.com/lookup");
 	g_signal_connect(G_OBJECT(message), "finished", G_CALLBACK(message_finished), provider);
 
 	soup_session_queue_message(provider->priv->soup, message,