never treat URI schemes case-sensitively

4 files changed, 7 insertions, 4 deletions

diff --git a/src/capi.c b/src/capi.c
index 281eb6f3..6db7484c 100644
--- a/src/capi.c
+++ b/src/capi.c
@@ -233,7 +233,7 @@ int a_Capi_dpi_verify_request(BrowserWindow *bw, DilloUrl *url)
       if (!(URL_FLAGS(url) & (URL_Post + URL_Get))) {
          allow = TRUE;
       } else if (!(URL_FLAGS(url) & URL_Post) &&
-                 strncmp(URL_STR(url), "dpi:/vsource/", 13) == 0) {
+                 strncmp(URL_PATH(url), "/vsource/", 9) == 0) {
          allow = TRUE;
       } else {
          /* only allow GET&POST dpi-requests from dpi-generated urls */
diff --git a/src/dillo.cc b/src/dillo.cc
index b05cb16a..ff450fe5 100644
--- a/src/dillo.cc
+++ b/src/dillo.cc
@@ -410,7 +410,8 @@ int main(int argc, char **argv)
 
    if (idx == argc) {
       /* No URLs/files on cmdline. Send startup screen */
-      if (strcmp(URL_STR(prefs.start_page), "about:blank") == 0)
+      if (dStrAsciiCasecmp(URL_SCHEME(prefs.start_page), "about") == 0 &&
+          strcmp(URL_PATH(prefs.start_page), "blank") == 0)
          a_UIcmd_open_url(bw, NULL);
       else
          a_UIcmd_open_url(bw, prefs.start_page);
diff --git a/src/menu.cc b/src/menu.cc
index 3aa30faa..fe8ff139 100644
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -327,7 +327,8 @@ void a_Menu_page_popup(BrowserWindow *bw, const DilloUrl *url,
 
    has_bugs == TRUE ? pm[1].activate() : pm[1].deactivate();
 
-   if (strncmp(URL_STR(url), "dpi:/vsource/", 13) == 0)
+   if (dStrAsciiCasecmp(URL_SCHEME(url), "dpi") == 0 &&
+       strncmp(URL_PATH(url), "/vsource/", 9) == 0)
       pm[0].deactivate();
    else
       pm[0].activate();
diff --git a/src/nav.c b/src/nav.c
index cb4b071f..7a567710 100644
--- a/src/nav.c
+++ b/src/nav.c
@@ -481,7 +481,8 @@ static void Nav_reload_callback(void *data)
    a_Nav_cancel_expect(bw);
    if (a_Nav_stack_size(bw)) {
       h_url = a_History_get_url(NAV_TOP_UIDX(bw));
-      if (strncmp(URL_STR(h_url), "dpi:/vsource/", 13) == 0) {
+      if (dStrAsciiCasecmp(URL_SCHEME(h_url), "dpi") == 0 &&
+          strncmp(URL_PATH(h_url), "/vsource/", 9) == 0) {
          /* allow reload for view source dpi */
          confirmed = 1;
       } else if (URL_FLAGS(h_url) & URL_Post) {