Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/6bfc8ba547698e81dd33f0fdaff29bb227906d8d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/6bfc8ba547698e81dd33f0fdaff29bb227906d8d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/6bfc8ba547698e81dd33f0fdaff29bb227906d8d
The branch, master has been updated
discards 11f9a84e7a253d3f34ff5e98a6e35d3df40d2f8c (commit)
discards 562979ee141ebd30dae0d2c2fbeb425293251a30 (commit)
via 6bfc8ba547698e81dd33f0fdaff29bb227906d8d (commit)
via 0747e0ed53ed802757d2fa322a96577af4a8a57f (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (11f9a84e7a253d3f34ff5e98a6e35d3df40d2f8c)
\
N -- N -- N (6bfc8ba547698e81dd33f0fdaff29bb227906d8d)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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=6bfc8ba547698e81dd33f0fdaff29bb227906d8d
commit 6bfc8ba547698e81dd33f0fdaff29bb227906d8d
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
HTML content handler: Don't let aborted contents get stuck in LOADING.
Previously, aborted HTML fetches left the content in LOADING state,
and the hlcache clean code does not clean contents in the LOADING
state. They, and their child contents ended up stuck in the
cache forever.
diff --git a/render/html.c b/render/html.c
index 544b7b6..62b7f3e 100644
--- a/render/html.c
+++ b/render/html.c
@@ -1220,6 +1220,7 @@ html_begin_conversion(html_content *htmlc)
if (htmlc->aborted) {
LOG("Conversion aborted (%p) (active: %u)", htmlc,
htmlc->base.active);
+ content_set_error(&htmlc->base);
content_broadcast_errorcode(&htmlc->base, NSERROR_STOPPED);
return false;
}
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=0747e0ed53ed802757d2fa322a96577af4a8a57f
commit 0747e0ed53ed802757d2fa322a96577af4a8a57f
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
HTML object fetch handler: Remove bogus parent content state assertion.
diff --git a/render/html_object.c b/render/html_object.c
index bc35124..e20cd6d 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -124,8 +124,6 @@ html_object_callback(hlcache_handle *object,
int x, y;
struct box *box;
- assert(c->base.status != CONTENT_STATUS_ERROR);
-
box = o->box;
if (box == NULL && event->type != CONTENT_MSG_ERROR) {
return NSERROR_OK;
-----------------------------------------------------------------------
Summary of changes:
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
