Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/b9cb2cab0bf34f34dfcfb3b59fa659a41ed7c54c
...commit
http://git.netsurf-browser.org/netsurf.git/commit/b9cb2cab0bf34f34dfcfb3b59fa659a41ed7c54c
...tree
http://git.netsurf-browser.org/netsurf.git/tree/b9cb2cab0bf34f34dfcfb3b59fa659a41ed7c54c
The branch, master has been updated
via b9cb2cab0bf34f34dfcfb3b59fa659a41ed7c54c (commit)
from 614a563d2f16703b96e18e6c65cdb2765efdbaac (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=b9cb2cab0bf34f34dfcfb3b59fa659a41ed7c54c
commit b9cb2cab0bf34f34dfcfb3b59fa659a41ed7c54c
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
browser_window: Don't use the fetch parameters for page info
In order to cope with redirects properly, use the content's URL
not the fetch parameters.
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index ac3dc1e..dea507f 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -4652,13 +4652,13 @@ browser_window_page_info_state
browser_window_get_page_info_state(
assert(bw != NULL);
- /* Do we have any parameters? If not -- UNKNOWN */
- if (bw->current_parameters.url == NULL ||
- bw->current_content == NULL) {
+ /* Do we have any content? If not -- UNKNOWN */
+ if (bw->current_content == NULL) {
return PAGE_STATE_UNKNOWN;
}
- scheme = nsurl_get_component(bw->current_parameters.url, NSURL_SCHEME);
+ scheme = nsurl_get_component(
+ hlcache_handle_get_url(bw->current_content), NSURL_SCHEME);
/* Is this an internal scheme? */
if ((lwc_string_isequal(scheme, corestring_lwc_about,
-----------------------------------------------------------------------
Summary of changes:
desktop/browser_window.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index ac3dc1e..dea507f 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -4652,13 +4652,13 @@ browser_window_page_info_state
browser_window_get_page_info_state(
assert(bw != NULL);
- /* Do we have any parameters? If not -- UNKNOWN */
- if (bw->current_parameters.url == NULL ||
- bw->current_content == NULL) {
+ /* Do we have any content? If not -- UNKNOWN */
+ if (bw->current_content == NULL) {
return PAGE_STATE_UNKNOWN;
}
- scheme = nsurl_get_component(bw->current_parameters.url, NSURL_SCHEME);
+ scheme = nsurl_get_component(
+ hlcache_handle_get_url(bw->current_content), NSURL_SCHEME);
/* Is this an internal scheme? */
if ((lwc_string_isequal(scheme, corestring_lwc_about,
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
