Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/c903c881e62ce020f53da0b03f4e8f388b9bd986
...commit
http://git.netsurf-browser.org/netsurf.git/commit/c903c881e62ce020f53da0b03f4e8f388b9bd986
...tree
http://git.netsurf-browser.org/netsurf.git/tree/c903c881e62ce020f53da0b03f4e8f388b9bd986
The branch, master has been updated
via c903c881e62ce020f53da0b03f4e8f388b9bd986 (commit)
from 5cd45cf7f0093b6b5518d753e4d2738902c8dc35 (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=c903c881e62ce020f53da0b03f4e8f388b9bd986
commit c903c881e62ce020f53da0b03f4e8f388b9bd986
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
browser_window: handle 'back to safety' cleanly
In order to ensure we actually go back to safety, clear the
curent loading parameters, and transfer the load parameters
for where we're going into them to be closer to a real navigate,
otherwise we end up copying the wrong loading parameters over
the top when we complete the back-to-safety navigation.
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index acefc78..cf5ba68 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -873,7 +873,11 @@ browser_window__handle_ssl_query_response(bool proceed,
void *pw)
bw->current_parameters.flags &= ~BW_NAVIGATE_HISTORY;
bw->internal_nav = false;
- return browser_window__navigate_internal(bw,
&bw->current_parameters);
+
+ browser_window__free_fetch_parameters(&bw->loading_parameters);
+ memcpy(&bw->loading_parameters, &bw->current_parameters,
sizeof(bw->loading_parameters));
+ memset(&bw->current_parameters, 0,
sizeof(bw->current_parameters));
+ return browser_window__navigate_internal(bw,
&bw->loading_parameters);
}
/* We're processing a "proceed" attempt from the form */
-----------------------------------------------------------------------
Summary of changes:
desktop/browser_window.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index acefc78..cf5ba68 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -873,7 +873,11 @@ browser_window__handle_ssl_query_response(bool proceed,
void *pw)
bw->current_parameters.flags &= ~BW_NAVIGATE_HISTORY;
bw->internal_nav = false;
- return browser_window__navigate_internal(bw,
&bw->current_parameters);
+
+ browser_window__free_fetch_parameters(&bw->loading_parameters);
+ memcpy(&bw->loading_parameters, &bw->current_parameters,
sizeof(bw->loading_parameters));
+ memset(&bw->current_parameters, 0,
sizeof(bw->current_parameters));
+ return browser_window__navigate_internal(bw,
&bw->loading_parameters);
}
/* We're processing a "proceed" attempt from the form */
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
