Ubuntu GeoIP

Merge lp:~jbicha/ubuntu-geoip/https into lp:ubuntu-geoip

  1. https
  2. Merge into trunk
Proposed by Jeremy Bícha
Status: Merged
Approved by: Jeremy Bícha
Approved revision: 44
Merged at revision: 44
Proposed branch: lp:~jbicha/ubuntu-geoip/https
Merge into: lp:ubuntu-geoip
Diff against target: 24 lines (+2/-2)
2 files modified
data/com.ubuntu.geoip.gschema.xml.in (+1/-1)
src/ubuntu-geoip-provider.c (+1/-1)
To merge this branch: bzr merge lp:~jbicha/ubuntu-geoip/https
Reviewer Review Type Date Requested Status
Ubuntu GeoIP Team Pending
Review via email: mp+339419@code.launchpad.net

Commit message

Use https for geoip.ubuntu.com (LP: #1617535)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/com.ubuntu.geoip.gschema.xml.in'
2--- data/com.ubuntu.geoip.gschema.xml.in 2013-10-14 19:53:57 +0000
3+++ data/com.ubuntu.geoip.gschema.xml.in 2018-02-23 15:56:38 +0000
4@@ -1,7 +1,7 @@
5 <schemalist>
6 <schema id="com.ubuntu.geoip" path="/com/ubuntu/geoip/">
7 <key name="geoip-url" type="s">
8- <default>"http://geoip.ubuntu.com/lookup"</default>
9+ <default>"https://geoip.ubuntu.com/lookup"</default>
10 <_summary>URL used to get information about the IP</_summary>
11 <_description>URL of a service that can be contacted and returns an XML file containing location information about the requestor's IP address.</_description>
12 </key>
13
14=== modified file 'src/ubuntu-geoip-provider.c'
15--- src/ubuntu-geoip-provider.c 2013-07-19 11:55:56 +0000
16+++ src/ubuntu-geoip-provider.c 2018-02-23 15:56:38 +0000
17@@ -721,7 +721,7 @@
18 if (provider->priv->settings != NULL) {
19 url = g_settings_get_string(provider->priv->settings, GEOIP_URL);
20 } else {
21- url = g_strdup("http://geoip.ubuntu.com/lookup");
22+ url = g_strdup("https://geoip.ubuntu.com/lookup");
23 }
24 g_debug("Using GeoIP URL: %s", url);
25

Subscribers

People subscribed via source and target branches