Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/a1ee078701a1815bafaafa235d2361c45adfdeb6
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/a1ee078701a1815bafaafa235d2361c45adfdeb6
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/a1ee078701a1815bafaafa235d2361c45adfdeb6

The branch, ashmew2/nskolibrios has been updated
       via  a1ee078701a1815bafaafa235d2361c45adfdeb6 (commit)
      from  238bc66f0dc8cb9aee2c01a28a3ae9d6a1fd88c0 (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=a1ee078701a1815bafaafa235d2361c45adfdeb6
commit a1ee078701a1815bafaafa235d2361c45adfdeb6
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>

    Free the fetch (and http.obj handle) when errored out or finished or aborted

diff --git a/content/fetchers/httplib_kolibri.c 
b/content/fetchers/httplib_kolibri.c
index f9a0d95..1aae7e5 100644
--- a/content/fetchers/httplib_kolibri.c
+++ b/content/fetchers/httplib_kolibri.c
@@ -268,14 +268,17 @@ bool start_fetch(void *httpf) {
 
 bool abort_fetch(void *httpf) {
   LOG("aborting fetch 0x%x", ((struct httpfetcher *)httpf)->owner);
-  http_disconnect_asm(((struct httpfetcher *)httpf)->handle);
   remove_from_poll(((struct httpfetcher *) httpf)->handle);
   fetch_remove_from_queues(((struct httpfetcher *)httpf)->owner);
-  /* fetch_free(((struct httpfetcher *)httpf)->owner); */
+  fetch_free(((struct httpfetcher *)httpf)->owner);
   return true;
 }
 
 bool free_fetch(void *httpf) {
+  LOG("free_fetch called for 0x%x", ((struct httpfetcher *)httpf)->owner);
+  debug_board_printf("Closing http connection in free_fetch\n");
+  http_disconnect_asm((((struct httpfetcher *)httpf)->handle));
+
   LOG("Freeing fetch 0x%x", ((struct httpfetcher *)httpf)->owner);
   http_free_asm((((struct httpfetcher *)httpf)->handle));
   free((struct httpfetcher *)httpf);
@@ -384,7 +387,7 @@ void poll_fetch(lwc_string *scheme) {
           t->headercbdone = true;
           remove_from_poll(t->handle);
           fetch_remove_from_queues(t->owner);
-          /* fetch_free(t->owner); */
+          fetch_free(t->owner);
           /* t = t->next; */
           t = head;
           continue;
@@ -429,7 +432,7 @@ void poll_fetch(lwc_string *scheme) {
       struct httpfetcher *tnext = t->next;
       remove_from_poll(t->handle);
       fetch_remove_from_queues(t->owner);
-      /* fetch_free(t->owner); */
+      fetch_free(t->owner);
       t = head;
       /* t = tnext; */
       continue;


-----------------------------------------------------------------------

Summary of changes:
 content/fetchers/httplib_kolibri.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/content/fetchers/httplib_kolibri.c 
b/content/fetchers/httplib_kolibri.c
index f9a0d95..1aae7e5 100644
--- a/content/fetchers/httplib_kolibri.c
+++ b/content/fetchers/httplib_kolibri.c
@@ -268,14 +268,17 @@ bool start_fetch(void *httpf) {
 
 bool abort_fetch(void *httpf) {
   LOG("aborting fetch 0x%x", ((struct httpfetcher *)httpf)->owner);
-  http_disconnect_asm(((struct httpfetcher *)httpf)->handle);
   remove_from_poll(((struct httpfetcher *) httpf)->handle);
   fetch_remove_from_queues(((struct httpfetcher *)httpf)->owner);
-  /* fetch_free(((struct httpfetcher *)httpf)->owner); */
+  fetch_free(((struct httpfetcher *)httpf)->owner);
   return true;
 }
 
 bool free_fetch(void *httpf) {
+  LOG("free_fetch called for 0x%x", ((struct httpfetcher *)httpf)->owner);
+  debug_board_printf("Closing http connection in free_fetch\n");
+  http_disconnect_asm((((struct httpfetcher *)httpf)->handle));
+
   LOG("Freeing fetch 0x%x", ((struct httpfetcher *)httpf)->owner);
   http_free_asm((((struct httpfetcher *)httpf)->handle));
   free((struct httpfetcher *)httpf);
@@ -384,7 +387,7 @@ void poll_fetch(lwc_string *scheme) {
           t->headercbdone = true;
           remove_from_poll(t->handle);
           fetch_remove_from_queues(t->owner);
-          /* fetch_free(t->owner); */
+          fetch_free(t->owner);
           /* t = t->next; */
           t = head;
           continue;
@@ -429,7 +432,7 @@ void poll_fetch(lwc_string *scheme) {
       struct httpfetcher *tnext = t->next;
       remove_from_poll(t->handle);
       fetch_remove_from_queues(t->owner);
-      /* fetch_free(t->owner); */
+      fetch_free(t->owner);
       t = head;
       /* t = tnext; */
       continue;


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to