comms/http-client: destroy connection after calling cb

Signed-off-by: Bruno Dilly <[email protected]>
solettaproject · Sep 11, 2015 · 8257928 · 8257928
1 parent 4852ead
commit 8257928
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/lib/comms/sol-http-client-impl-curl.c b/src/lib/comms/sol-http-client-impl-curl.c
@@ -131,7 +131,7 @@ call_connection_finish_cb(struct sol_http_client_connection *connection)
     long response_code;
     char *tmp;
 
-    if (!connection->cb)
+    if (sol_ptr_vector_remove(&global.connections, connection) < 0)
         return;
 
     if (connection->error) {
@@ -168,7 +168,7 @@ call_connection_finish_cb(struct sol_http_client_connection *connection)
 
 out:
     connection->cb((void *)connection->data, connection, param);
-    connection->cb = NULL; /* Don't call again. */
+    destroy_connection(connection);
 }
 
 static size_t
@@ -296,10 +296,6 @@ error_cb(void *data)
 
     call_connection_finish_cb(connection);
 
-    sol_ptr_vector_remove(&global.connections, connection);
-
-    destroy_connection(connection);
-
     return false;
 }