diff options
| -rw-r--r-- | lib/http.c | 25 | ||||
| -rw-r--r-- | lib/http2.c | 11 |
2 files changed, 13 insertions, 23 deletions
diff --git a/lib/http.c b/lib/http.c index a1eef815b..8d5b9a408 100644 --- a/lib/http.c +++ b/lib/http.c @@ -86,7 +86,6 @@ * Forward declarations. */ -static CURLcode http_disconnect(struct connectdata *conn, bool dead); static int http_getsock_do(struct connectdata *conn, curl_socket_t *socks, int numsocks); @@ -117,7 +116,7 @@ const struct Curl_handler Curl_handler_http = { http_getsock_do, /* doing_getsock */ ZERO_NULL, /* domore_getsock */ ZERO_NULL, /* perform_getsock */ - http_disconnect, /* disconnect */ + ZERO_NULL, /* disconnect */ ZERO_NULL, /* readwrite */ PORT_HTTP, /* defport */ CURLPROTO_HTTP, /* protocol */ @@ -141,7 +140,7 @@ const struct Curl_handler Curl_handler_https = { http_getsock_do, /* doing_getsock */ ZERO_NULL, /* domore_getsock */ ZERO_NULL, /* perform_getsock */ - http_disconnect, /* disconnect */ + ZERO_NULL, /* disconnect */ ZERO_NULL, /* readwrite */ PORT_HTTPS, /* defport */ CURLPROTO_HTTPS, /* protocol */ @@ -169,26 +168,6 @@ CURLcode Curl_http_setup_conn(struct connectdata *conn) return CURLE_OK; } -static CURLcode http_disconnect(struct connectdata *conn, bool dead_connection) -{ -#ifdef USE_NGHTTP2 - struct HTTP *http = conn->data->req.protop; - if(http) { - Curl_add_buffer_free(http->header_recvbuf); - http->header_recvbuf = NULL; /* clear the pointer */ - for(; http->push_headers_used > 0; --http->push_headers_used) { - free(http->push_headers[http->push_headers_used - 1]); - } - free(http->push_headers); - http->push_headers = NULL; - } -#else - (void)conn; -#endif - (void)dead_connection; - return CURLE_OK; -} - /* * checkheaders() checks the linked list of custom HTTP headers for a * particular header (prefix). diff --git a/lib/http2.c b/lib/http2.c index 1a2c48649..eec0c9fca 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -80,6 +80,7 @@ static int http2_getsock(struct connectdata *conn, static CURLcode http2_disconnect(struct connectdata *conn, bool dead_connection) { + struct HTTP *http = conn->data->req.protop; struct http_conn *c = &conn->proto.httpc; (void)dead_connection; @@ -89,6 +90,16 @@ static CURLcode http2_disconnect(struct connectdata *conn, Curl_safefree(c->inbuf); Curl_hash_destroy(&c->streamsh); + if(http) { + Curl_add_buffer_free(http->header_recvbuf); + http->header_recvbuf = NULL; /* clear the pointer */ + for(; http->push_headers_used > 0; --http->push_headers_used) { + free(http->push_headers[http->push_headers_used - 1]); + } + free(http->push_headers); + http->push_headers = NULL; + } + DEBUGF(infof(conn->data, "HTTP/2 DISCONNECT done\n")); return CURLE_OK; |