From 63eeace6d6d9e59af9cc269c56ce1dbac35cc192 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 8 Jan 2013 08:34:30 +0000 Subject: [PATCH] forwardport previous efreet desktop command commit ticket #2174 SVN revision: 82390 --- ChangeLog | 4 ++++ NEWS | 1 + src/lib/efreet/efreet_desktop_command.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bd443620db..655639c2e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-01-08 Mike Blumenkrantz + + * Fix efreet desktop command parsing of https + 2013-01-07 Sung W. Park (sung_) * Pulled out evas gl backend binary shader file caching code from diff --git a/NEWS b/NEWS index 15a0fd0681..b685c4d517 100644 --- a/NEWS +++ b/NEWS @@ -103,3 +103,4 @@ Fixes: * Fix mask write lines to not choose too small segments * Fix ecore_con case where freeing server double-frees clients * Fix build of Evas XCB backend + * Fix efreet desktop command parsing of https diff --git a/src/lib/efreet/efreet_desktop_command.c b/src/lib/efreet/efreet_desktop_command.c index beeac761cb..075bdae3b7 100644 --- a/src/lib/efreet/efreet_desktop_command.c +++ b/src/lib/efreet/efreet_desktop_command.c @@ -623,7 +623,7 @@ efreet_desktop_command_file_process(Efreet_Desktop_Command *command, const char f->command = command; /* handle uris */ - if (!strncmp(file, "http://", 7) || !strncmp(file, "ftp://", 6)) + if ((!strncmp(file, "http", 4) && (!strncmp(file + 4, "://", 3) || !strncmp(file + 4, "s://", 4))) || !strncmp(file, "ftp://", 6)) { uri = file; base = ecore_file_file_get(file);