Merge lp:~gue5t/midori/fix-bug1183979 into lp:midori

[gue5t gue5t]

Compare uri schemes case-insensitively.

[Paweł Forysiuk (tuxator)]

Looks good to me.

review: Approve

=== modified file 'midori/sokoke.c'
--- midori/sokoke.c	2013-05-19 09:33:02 +0000
+++ midori/sokoke.c	2013-05-27 00:36:25 +0000
@@ -136,7 +136,7 @@
     gtk_widget_destroy (dialog);
 }
 
-static GAppInfo*
+GAppInfo*
 sokoke_default_for_uri (const gchar* uri,
                         gchar**      scheme_ptr)
 {
@@ -474,10 +474,12 @@
 {
     GAppInfo* info;
 
-    if (!uri || !strncmp (uri, "http", 4)
-             || !strncmp (uri, "file", 4)
-             || !strncmp (uri, "geo", 3)
-             || !strncmp (uri, "about:", 6))
+    /* URI schemes are case-insensitive, followed by ':' - rfc3986 */
+    if (!uri || !strncasecmp (uri, "http:", 5)
+             || !strncasecmp (uri, "https:", 6)
+             || !strncasecmp (uri, "file:", 5)
+             || !strncasecmp (uri, "geo:", 4)
+             || !strncasecmp (uri, "about:", 6))
         return FALSE;
 
     info = sokoke_default_for_uri (uri, NULL);

=== modified file 'tests/magic-uri.c'
--- tests/magic-uri.c	2013-03-12 17:09:26 +0000
+++ tests/magic-uri.c	2013-05-27 00:36:25 +0000
@@ -386,6 +386,40 @@
         }
 }
 
+GAppInfo* sokoke_default_for_uri (const gchar* uri, gchar** scheme_ptr);
+
+static gboolean uri_has_default (const gchar* uri)
+{
+    GAppInfo* info = sokoke_default_for_uri (uri, NULL);
+    if (info)
+        g_object_unref (info);
+    return info != NULL;
+}
+
+static void
+magic_uri_protocols (void)
+{
+    g_assert (!sokoke_external_uri (NULL));
+    g_assert (!sokoke_external_uri (""));
+
+    g_assert (!sokoke_external_uri ("http://google.com"));
+    g_assert (!sokoke_external_uri ("HTTP://google.com"));
+    g_assert (!sokoke_external_uri ("Http://google.com"));
+    g_assert (!sokoke_external_uri ("https://google.com"));
+    g_assert (!sokoke_external_uri ("httPS://google.com"));
+    g_assert (!sokoke_external_uri ("file:///home/"));
+    g_assert (!sokoke_external_uri ("geo:100,3000"));
+    g_assert (!sokoke_external_uri ("about:blank"));
+
+    g_assert (!sokoke_external_uri ("https://"));
+    g_assert (!sokoke_external_uri ("http://"));
+    g_assert (!sokoke_external_uri ("http:/"));
+    g_assert (!sokoke_external_uri ("http"));
+    g_assert (sokoke_external_uri ("ftp://ftphost.org") == uri_has_default ("ftp://ftphost.org"));
+    g_assert (sokoke_external_uri ("geometry:bar") == uri_has_default ("geometry:bar"));
+    g_assert (sokoke_external_uri ("httparty:woo") == uri_has_default ("httparty:woo"));
+}
+
 int
 main (int    argc,
       char** argv)
@@ -404,6 +438,7 @@
     g_test_add_func ("/magic-uri/prefix", magic_uri_prefix);
     g_test_add_func ("/magic-uri/prefetch", magic_uri_prefetch);
     g_test_add_func ("/magic-uri/commands", magic_uri_commands);
+    g_test_add_func ("/magic-uri/protocols", magic_uri_protocols);
 
     return g_test_run ();
 }