summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann <sandmann@redhat.com>2007-07-31 22:55:08 -0400
committerSøren Sandmann <sandmann@redhat.com>2007-07-31 22:55:08 -0400
commitbb9d528ffe7279664448308aa512118ef1a5f512 (patch)
tree18a0b97c2633837f71e987e9d32b0a16fdd3896c
parent730be95a442f5d5514311150a9ee8da906a3c3d8 (diff)
Fixe http vs. https mixup
-rw-r--r--src/lacuri.c2
-rw-r--r--tests/uri-test.c11
2 files changed, 11 insertions, 2 deletions
diff --git a/src/lacuri.c b/src/lacuri.c
index 60c0719..640dfe2 100644
--- a/src/lacuri.c
+++ b/src/lacuri.c
@@ -359,7 +359,7 @@ lac_uri_unknown_to_http (LacUri *uri,
path = uri->u.unknown.path;
query = uri->u.unknown.query;
- uri->scheme = is_https? LAC_SCHEME_HTTP : LAC_SCHEME_HTTP;
+ uri->scheme = is_https? LAC_SCHEME_HTTPS : LAC_SCHEME_HTTP;
uri->u.http.host = host;
uri->u.http.port = port;
diff --git a/tests/uri-test.c b/tests/uri-test.c
index 55fd3a3..c040098 100644
--- a/tests/uri-test.c
+++ b/tests/uri-test.c
@@ -41,7 +41,11 @@ print_uri (LacUri *uri, gchar *base_uri_str, gchar *uri_str)
g_print (" fragment: %s\n", uri->fragment);
break;
case LAC_SCHEME_HTTP:
- g_print ("HTTP\n");
+ case LAC_SCHEME_HTTPS:
+ if (uri->scheme == LAC_SCHEME_HTTP)
+ g_print ("HTTP\n");
+ else
+ g_print ("HTTPS\n");
g_print (" host: %s\n", uri->u.http.host);
g_print (" port: %d\n", uri->u.http.port);
g_print (" path: %s\n", uri->u.http.path);
@@ -246,6 +250,11 @@ main ()
print_uri (uri, base_uri_str, uri_str);
base_uri_str = NULL;
+ uri_str = "https://www.daimi.au.dk/";
+ uri = lac_uri_new_from_string (NULL, uri_str);
+ print_uri (uri, base_uri_str, uri_str);
+
+ base_uri_str = NULL;
uri_str = "../birnan.html";
uri = lac_uri_new_from_string (NULL, uri_str);
print_uri (uri, base_uri_str, uri_str);