Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/9a3f138f9240f2865f5b15a6892da5b7434c2ae7
...commit
http://git.netsurf-browser.org/netsurf.git/commit/9a3f138f9240f2865f5b15a6892da5b7434c2ae7
...tree
http://git.netsurf-browser.org/netsurf.git/tree/9a3f138f9240f2865f5b15a6892da5b7434c2ae7
The branch, master has been updated
via 9a3f138f9240f2865f5b15a6892da5b7434c2ae7 (commit)
via 2538d05bb4b04b0c438e303e8bd67aec28bd3506 (commit)
from b67bbe3280ebdfdfdc4731d977ad7a38b9608c2a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=9a3f138f9240f2865f5b15a6892da5b7434c2ae7
commit 9a3f138f9240f2865f5b15a6892da5b7434c2ae7
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Browser: Do a better job of not leaking query URIs to the frontend
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index adcc8f0..f75a868 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -3007,7 +3007,7 @@ void browser_window_destroy(struct browser_window *bw)
nserror browser_window_refresh_url_bar(struct browser_window *bw)
{
nserror ret;
- nsurl *display_url;
+ nsurl *display_url, *url;
assert(bw);
@@ -3020,8 +3020,17 @@ nserror browser_window_refresh_url_bar(struct
browser_window *bw)
/* no content so return about:blank */
ret = browser_window_refresh_url_bar_internal(bw,
corestring_nsurl_about_blank);
+ } else if (bw->throbbing) {
+ /* We're throbbing, so show the loading parameters url,
+ * or if there isn't one, the current parameters url
+ */
+ if (bw->loading_parameters.url != NULL) {
+ url = bw->loading_parameters.url;
+ } else {
+ url = bw->current_parameters.url;
+ }
+ ret = browser_window_refresh_url_bar_internal(bw, url);
} else if (bw->frag_id == NULL) {
- nsurl *url;
if (bw->internal_nav) {
url = bw->loading_parameters.url;
} else {
@@ -3030,7 +3039,6 @@ nserror browser_window_refresh_url_bar(struct
browser_window *bw)
ret = browser_window_refresh_url_bar_internal(bw, url);
} else {
/* Combine URL and Fragment */
- nsurl *url;
if (bw->internal_nav) {
url = bw->loading_parameters.url;
} else {
@@ -3317,7 +3325,9 @@ browser_window__navigate_internal_real(struct
browser_window *bw,
case NSERROR_OK:
bw->loading_content = c;
browser_window_start_throbber(bw);
- error = browser_window_refresh_url_bar_internal(bw,
params->url);
+ if (bw->internal_nav == false) {
+ error = browser_window_refresh_url_bar_internal(bw,
params->url);
+ }
break;
case NSERROR_NO_FETCH_HANDLER: /* no handler for this type */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=2538d05bb4b04b0c438e303e8bd67aec28bd3506
commit 2538d05bb4b04b0c438e303e8bd67aec28bd3506
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
browser: Turn internal nav URLs into corestring_nsurls
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index 95131d1..adcc8f0 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -1026,10 +1026,7 @@ browser_window__handle_login(struct browser_window *bw,
}
/* Step two, construct our fetch parameters */
- err = nsurl_create("about:query/auth", ¶ms.url);
- if (err != NSERROR_OK) {
- goto out;
- }
+ params.url = nsurl_ref(corestring_nsurl_about_query_auth);
params.referrer = nsurl_ref(url);
params.flags = BW_NAVIGATE_HISTORY |
BW_NAVIGATE_NO_TERMINAL_HISTORY_UPDATE | BW_NAVIGATE_INTERNAL;
@@ -1101,10 +1098,7 @@ browser_window__handle_bad_certs(struct browser_window
*bw,
memset(¶ms, 0, sizeof(params));
- err = nsurl_create("about:query/ssl", ¶ms.url);
- if (err != NSERROR_OK) {
- goto out;
- }
+ params.url = nsurl_ref(corestring_nsurl_about_query_ssl);
err = fetch_multipart_data_new_kv(¶ms.post_multipart,
"siteurl",
@@ -1679,8 +1673,6 @@ browser_window_refresh_url_bar_internal(struct
browser_window *bw, nsurl *url)
return NSERROR_OK;
}
- NSLOG(netsurf, CRITICAL, "Updating the URL to %s", nsurl_access(url));
-
return guit->window->set_url(bw->window, url);
}
@@ -3380,10 +3372,7 @@ browser_window__navigate_internal_query_auth(struct
browser_window *bw,
* about:blank
*/
browser_window__free_fetch_parameters(&bw->loading_parameters);
- res = nsurl_create("about:blank", &bw->loading_parameters.url);
- if (res != NSERROR_OK) {
- return res;
- }
+ bw->loading_parameters.url =
nsurl_ref(corestring_nsurl_about_blank);
bw->loading_parameters.flags =
BW_NAVIGATE_NO_TERMINAL_HISTORY_UPDATE | BW_NAVIGATE_INTERNAL;
bw->internal_nav = true;
return browser_window__navigate_internal(bw,
&bw->loading_parameters);
diff --git a/utils/corestringlist.h b/utils/corestringlist.h
index 82fffe2..f0d39c6 100644
--- a/utils/corestringlist.h
+++ b/utils/corestringlist.h
@@ -358,6 +358,8 @@ CORESTRING_DOM_VALUE(http_equiv, "http-equiv");
CORESTRING_DOM_VALUE(html_namespace, "http://www.w3.org/1999/xhtml";);
CORESTRING_NSURL(about_blank, "about:blank");
+CORESTRING_NSURL(about_query_ssl, "about:query/ssl");
+CORESTRING_NSURL(about_query_auth, "about:query/auth");
#undef CORESTRING_LWC_STRING
#undef CORESTRING_DOM_STRING
-----------------------------------------------------------------------
Summary of changes:
desktop/browser_window.c | 35 +++++++++++++++++------------------
utils/corestringlist.h | 2 ++
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index 95131d1..f75a868 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -1026,10 +1026,7 @@ browser_window__handle_login(struct browser_window *bw,
}
/* Step two, construct our fetch parameters */
- err = nsurl_create("about:query/auth", ¶ms.url);
- if (err != NSERROR_OK) {
- goto out;
- }
+ params.url = nsurl_ref(corestring_nsurl_about_query_auth);
params.referrer = nsurl_ref(url);
params.flags = BW_NAVIGATE_HISTORY |
BW_NAVIGATE_NO_TERMINAL_HISTORY_UPDATE | BW_NAVIGATE_INTERNAL;
@@ -1101,10 +1098,7 @@ browser_window__handle_bad_certs(struct browser_window
*bw,
memset(¶ms, 0, sizeof(params));
- err = nsurl_create("about:query/ssl", ¶ms.url);
- if (err != NSERROR_OK) {
- goto out;
- }
+ params.url = nsurl_ref(corestring_nsurl_about_query_ssl);
err = fetch_multipart_data_new_kv(¶ms.post_multipart,
"siteurl",
@@ -1679,8 +1673,6 @@ browser_window_refresh_url_bar_internal(struct
browser_window *bw, nsurl *url)
return NSERROR_OK;
}
- NSLOG(netsurf, CRITICAL, "Updating the URL to %s", nsurl_access(url));
-
return guit->window->set_url(bw->window, url);
}
@@ -3015,7 +3007,7 @@ void browser_window_destroy(struct browser_window *bw)
nserror browser_window_refresh_url_bar(struct browser_window *bw)
{
nserror ret;
- nsurl *display_url;
+ nsurl *display_url, *url;
assert(bw);
@@ -3028,8 +3020,17 @@ nserror browser_window_refresh_url_bar(struct
browser_window *bw)
/* no content so return about:blank */
ret = browser_window_refresh_url_bar_internal(bw,
corestring_nsurl_about_blank);
+ } else if (bw->throbbing) {
+ /* We're throbbing, so show the loading parameters url,
+ * or if there isn't one, the current parameters url
+ */
+ if (bw->loading_parameters.url != NULL) {
+ url = bw->loading_parameters.url;
+ } else {
+ url = bw->current_parameters.url;
+ }
+ ret = browser_window_refresh_url_bar_internal(bw, url);
} else if (bw->frag_id == NULL) {
- nsurl *url;
if (bw->internal_nav) {
url = bw->loading_parameters.url;
} else {
@@ -3038,7 +3039,6 @@ nserror browser_window_refresh_url_bar(struct
browser_window *bw)
ret = browser_window_refresh_url_bar_internal(bw, url);
} else {
/* Combine URL and Fragment */
- nsurl *url;
if (bw->internal_nav) {
url = bw->loading_parameters.url;
} else {
@@ -3325,7 +3325,9 @@ browser_window__navigate_internal_real(struct
browser_window *bw,
case NSERROR_OK:
bw->loading_content = c;
browser_window_start_throbber(bw);
- error = browser_window_refresh_url_bar_internal(bw,
params->url);
+ if (bw->internal_nav == false) {
+ error = browser_window_refresh_url_bar_internal(bw,
params->url);
+ }
break;
case NSERROR_NO_FETCH_HANDLER: /* no handler for this type */
@@ -3380,10 +3382,7 @@ browser_window__navigate_internal_query_auth(struct
browser_window *bw,
* about:blank
*/
browser_window__free_fetch_parameters(&bw->loading_parameters);
- res = nsurl_create("about:blank", &bw->loading_parameters.url);
- if (res != NSERROR_OK) {
- return res;
- }
+ bw->loading_parameters.url =
nsurl_ref(corestring_nsurl_about_blank);
bw->loading_parameters.flags =
BW_NAVIGATE_NO_TERMINAL_HISTORY_UPDATE | BW_NAVIGATE_INTERNAL;
bw->internal_nav = true;
return browser_window__navigate_internal(bw,
&bw->loading_parameters);
diff --git a/utils/corestringlist.h b/utils/corestringlist.h
index 82fffe2..f0d39c6 100644
--- a/utils/corestringlist.h
+++ b/utils/corestringlist.h
@@ -358,6 +358,8 @@ CORESTRING_DOM_VALUE(http_equiv, "http-equiv");
CORESTRING_DOM_VALUE(html_namespace, "http://www.w3.org/1999/xhtml";);
CORESTRING_NSURL(about_blank, "about:blank");
+CORESTRING_NSURL(about_query_ssl, "about:query/ssl");
+CORESTRING_NSURL(about_query_auth, "about:query/auth");
#undef CORESTRING_LWC_STRING
#undef CORESTRING_DOM_STRING
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
