From 2045a5dff5368835a5c51c5cce93b5c5ad450949 Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Sat, 7 Oct 2017 17:16:22 +0200 Subject: [PATCH] doveadm-server: http: Renamed conn->http_client to conn->http_conn. --- src/doveadm/client-connection-http.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/doveadm/client-connection-http.c b/src/doveadm/client-connection-http.c index 67c4c8a9f4..5769fabd00 100644 --- a/src/doveadm/client-connection-http.c +++ b/src/doveadm/client-connection-http.c @@ -35,7 +35,7 @@ struct client_connection_http { struct client_connection conn; - struct http_server_connection *http_client; + struct http_server_connection *http_conn; struct http_server_request *http_server_request; const struct http_request *http_request; @@ -131,9 +131,9 @@ client_connection_http_free(struct client_connection *_conn) o_stream_destroy(&conn->output); i_stream_destroy(&conn->input); - if (conn->http_client != NULL) { + if (conn->http_conn != NULL) { /* We're not in the lib-http/server's connection destroy callback. */ - http_server_connection_close(&conn->http_client, + http_server_connection_close(&conn->http_conn, "Server shutting down"); } } @@ -154,7 +154,7 @@ client_connection_http_create(int fd, bool ssl) } conn->conn.free = client_connection_http_free; - conn->http_client = http_server_connection_create(doveadm_http_server, + conn->http_conn = http_server_connection_create(doveadm_http_server, fd, fd, ssl, &doveadm_http_callbacks, conn); return &conn->conn; } @@ -167,13 +167,13 @@ doveadm_http_server_connection_destroy(void *context, (struct client_connection_http *)context; struct client_connection *bconn = &conn->conn; - if (conn->http_client == NULL) { + if (conn->http_conn == NULL) { /* already destroying client directly */ return; } /* HTTP connection is destroyed already now */ - conn->http_client = NULL; + conn->http_conn = NULL; /* destroy the connection itself */ client_connection_destroy(&bconn);