Skip to content

Commit

Permalink
doveadm-server: http: Renamed conn->http_client to conn->http_conn.
Browse files Browse the repository at this point in the history
  • Loading branch information
stephanbosch committed Oct 24, 2017
1 parent 80a225c commit 2045a5d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/doveadm/client-connection-http.c
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
}
}
Expand All @@ -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;
}
Expand All @@ -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);
Expand Down

0 comments on commit 2045a5d

Please sign in to comment.