summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2011-10-15 11:51:54 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2011-10-15 11:51:54 +0000
commitee930d97e431667cf2d16a9b68f073fafd172f8b (patch)
tree5136e71cf923cb60f3f9ed02bc61614eace436e7
parent8f554bb0e5f76dff0016d682cec6d7f56a6241d3 (diff)
downloadnetsurf-ee930d97e431667cf2d16a9b68f073fafd172f8b.tar.gz
netsurf-ee930d97e431667cf2d16a9b68f073fafd172f8b.tar.bz2
Fix handling of no scheme
svn path=/trunk/netsurf/; revision=13055
-rw-r--r--test/nsurl.c2
-rw-r--r--utils/nsurl.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/test/nsurl.c b/test/nsurl.c
index d504469a6..df1b98595 100644
--- a/test/nsurl.c
+++ b/test/nsurl.c
@@ -39,6 +39,8 @@ static const struct test_pairs create_tests[] = {
{ "http:/a/b", "http://a/b" },
{ "http://a", "http://a/" },
{ "http://a/b", "http://a/b" },
+ { "www.example.org", "http://www.example.org/" },
+ { "www.example.org/x", "http://www.example.org/x" },
{ "http://www.netsurf-browser.org:8080/",
"http://www.netsurf-browser.org:8080/" },
diff --git a/utils/nsurl.c b/utils/nsurl.c
index adc1e35e3..6b309f1f5 100644
--- a/utils/nsurl.c
+++ b/utils/nsurl.c
@@ -263,6 +263,8 @@ static void nsurl__get_string_markers(const char const *url_s,
} else {
/* Not found a scheme */
+ pos = url_s + marker.start;
+
if (joining == false) {
/* Assuming no scheme == http */
is_http = true;