Changeset fc3d4fd5 in mainline

Timestamp:

2017-09-06T22:16:31Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

12dcd5f

Parents:

d14840d

Message:

Downloader should properly clean up HTTP connection.

Location:

uspace

Files:

• app/download/main.c (modified) (4 diffs)
• lib/http/src/http.c (modified) (2 diffs)

uspace/app/download/main.c

@@ -72 +72 @@
         void *buf = NULL;
         uri_t *uri = NULL;
+        http_t *http = NULL;
         int rc;
 
@@ -182 +183 @@
         }
         
-        http_t *http = http_create(uri->host, port);
+        http = http_create(uri->host, port);
         if (http == NULL) {
                 fprintf(stderr, "Failed creating HTTP object\n");
@@ -234 +235 @@
         
         free(buf);
+        http_destroy(http);
         uri_destroy(uri);
         if (fclose(ofile) != 0) {
@@ -243 +245 @@
 error:
         free(buf);
+        if (http != NULL)
+                http_destroy(http);
         if (uri != NULL)
                 uri_destroy(uri);

uspace/lib/http/src/http.c

@@ -121 +121 @@
         
         tcp_conn_destroy(http->conn);
+        http->conn = NULL;
         tcp_destroy(http->tcp);
+        http->tcp = NULL;
+        
         return EOK;
 }
@@ -127 +130 @@
 void http_destroy(http_t *http)
 {
+        (void) http_close(http);
         recv_buffer_fini(&http->recv_buffer);
         free(http);