From: Marc-André Lureau <[email protected]>
---
gtk/spice-proxy.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/gtk/spice-proxy.c b/gtk/spice-proxy.c
index 834aa10..ecf7e54 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);
gchar *saveptr, *auth = strtok_r(uri, "@", &saveptr);
if (saveptr && *saveptr) {
@@ -86,7 +92,6 @@ gboolean spice_proxy_parse(SpiceProxy *self, const gchar
*proxyuri, GError **err
const gchar *pass = strtok_r(NULL, ":", &saveptr2);
spice_proxy_set_user(self, user);
spice_proxy_set_password(self, pass);
- g_debug("user: %s pass: %s", user, pass);
uri = saveptr;
}
--
1.8.4.2
_______________________________________________
Spice-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/spice-devel
