summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2014-01-24 21:05:56 +0100
committerMarc-André Lureau <marcandre.lureau@redhat.com>2014-02-21 12:21:50 +0100
commit5dcab09ac32d0578cdd74540abdaea8eea3858d5 (patch)
treebfd67327ed2acbc907323a6176ffd76044bf4b5d
parent3437c442663cdf761e59a5b8353e35efeb841c43 (diff)
spice-proxy: parse https protocol
-rw-r--r--gtk/spice-proxy.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/gtk/spice-proxy.c b/gtk/spice-proxy.c
index 8613469..cf4b6ad 100644
--- a/gtk/spice-proxy.c
+++ b/gtk/spice-proxy.c
@@ -65,9 +65,17 @@ gboolean spice_proxy_parse(SpiceProxy *self, const gchar *proxyuri, GError **err
uri = dup = g_strdup(proxyuri);
/* FIXME: use GUri when it is ready... only support http atm */
/* the code is voluntarily not parsing thoroughly the uri */
- if (g_ascii_strncasecmp("http://", uri, 7) == 0)
+ if (g_ascii_strncasecmp("http://", uri, 7) == 0) {
uri += 7;
-
+ spice_proxy_set_protocol(self, "http");
+ spice_proxy_set_port(self, 3128);
+ } else if (g_ascii_strncasecmp("https://", uri, 8) == 0) {
+ uri += 8;
+ spice_proxy_set_protocol(self, "https");
+ spice_proxy_set_port(self, 3129);
+ } else {
+ return FALSE;
+ }
/* remove trailing slash */
len = strlen(uri);
for (; len > 0; len--)
@@ -76,8 +84,6 @@ gboolean spice_proxy_parse(SpiceProxy *self, const gchar *proxyuri, GError **err
else
break;
- spice_proxy_set_protocol(self, "http");
- spice_proxy_set_port(self, 3128);
/* yes, that parser is bad, we need GUri... */
if (strstr(uri, "@")) {