Commit 442fba33 authored by Bastien Nocera's avatar Bastien Nocera

ephy-string: Avoid poking at remote websites

Epiphany tries to query the existence of remote sites before loading
their page. This causes problems when the remote site is not available
and loading it requires the query to timeout (epiphany would look like
it's not loading the site for up to 60 seconds) or for one-time URLs
(where it might invalidate the query, such as for password resets, or
confirmation e-mails).

We'll now only check whether the file exists so that incomplete URLs
("epiphany foo.com/bar.html") still loads the bar.html file if it exists
locally, but the remote website if not.

https://bugzilla.gnome.org/show_bug.cgi?id=703772
parent 18d58e52
......@@ -493,7 +493,7 @@ ephy_string_expand_initial_tilde (const char *path)
* ephy_string_commandline_args_to_uris:
* @arguments: a %NULL-terminated array of chars.
*
* Transform commandline arguments to URIs if they exist,
* Transform commandline arguments to URIs if they are native,
* otherwise simply transform them to UTF-8.
*
* Returns: a newly allocated array with the URIs and
......@@ -513,7 +513,7 @@ ephy_string_commandline_args_to_uris (char **arguments, GError **error)
for (i = 0; arguments[i] != NULL; ++i) {
file = g_file_new_for_commandline_arg (arguments [i]);
if (g_file_query_exists (file, NULL)) {
if (g_file_is_native (file) && g_file_query_exists (file, NULL)) {
args[i] = g_file_get_uri (file);
} else {
args[i] = g_locale_to_utf8 (arguments [i], -1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment