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

Proposed by Brian Murray on 2011-03-04
Status: Merged
Merged at revision: 6
Proposed branch: lp:~brian-murray/ubuntu/natty/ubuntu-geoip/fix-719324
Merge into: lp:ubuntu/natty/ubuntu-geoip
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
src/ubuntu-geoip-provider.c (+1/-1)
To merge this branch: bzr merge lp:~brian-murray/ubuntu/natty/ubuntu-geoip/fix-719324
Reviewer Review Type Date Requested Status
Barry Warsaw (community) 2011-03-04 Approve on 2011-03-07
Review via email: mp+52268@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Dave Walker (davewalker) wrote :

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) wrote :

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) wrote :

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) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-08 11:15:10 +0000
3+++ debian/changelog 2011-03-04 22:43:07 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-geoip (0.0.2-0ubuntu5) natty; urgency=low
6+
7+ * Per RFC 2616 use upper case for GET request thanks to Andrew Glen-Young
8+ for the patch (LP: #719324)
9+
10+ -- Brian Murray <brian@ubuntu.com> Fri, 04 Mar 2011 13:58:56 -0800
11+
12 ubuntu-geoip (0.0.2-0ubuntu4) natty; urgency=low
13
14 * debian/control
15
16=== modified file 'src/ubuntu-geoip-provider.c'
17--- src/ubuntu-geoip-provider.c 2010-11-15 08:59:29 +0000
18+++ src/ubuntu-geoip-provider.c 2011-03-04 22:43:07 +0000
19@@ -517,7 +517,7 @@
20 provider->priv->requeue_source = 0;
21 }
22
23- SoupMessage * message = soup_message_new("get", "http://geoip.ubuntu.com/lookup");
24+ SoupMessage * message = soup_message_new("GET", "http://geoip.ubuntu.com/lookup");
25 g_signal_connect(G_OBJECT(message), "finished", G_CALLBACK(message_finished), provider);
26
27 soup_session_queue_message(provider->priv->soup, message,

Subscribers

People subscribed via source and target branches

to all changes: