Changeset 3fbce97 for lib/http_client.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• lib/http_client.c (modified) (4 diffs)

lib/http_client.c

@@ -162 +162 @@
         }
 
-        req->func(req);
+        if (req->func != NULL) {
+                req->func(req);
+        }
         http_free(req);
         return FALSE;
@@ -299 +301 @@
         }
 
-        req->func(req);
+        if (req->func != NULL) {
+                req->func(req);
+        }
         http_free(req);
         return FALSE;
@@ -412 +416 @@
         }
 
-        if ((req->flags & HTTPC_STREAMING) && req->reply_body) {
+        if ((req->flags & HTTPC_STREAMING) && req->reply_body && req->func != NULL) {
                 req->func(req);
         }
@@ -696 +700 @@
                 ssl_disconnect(req->ssl);
         } else {
-                closesocket(req->fd);
+                proxy_disconnect(req->fd);
         }