]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
doveadm-server: http: Renamed conn->http_client to conn->http_conn.
authorStephan Bosch <stephan.bosch@dovecot.fi>
Sat, 7 Oct 2017 15:16:22 +0000 (17:16 +0200)
committerStephan Bosch <stephan.bosch@dovecot.fi>
Tue, 24 Oct 2017 20:29:19 +0000 (22:29 +0200)
src/doveadm/client-connection-http.c

index 67c4c8a9f4c02a23fd12d113325574fa27be7e15..5769fabd0030a9a3461c8cb5e3c314eb44d23dbf 100644 (file)
@@ -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);