Use lowercase 'tls' in debug and log messages for consistency.

Requested by reyk@

diff --git a/usr.sbin/httpd/config.c b/usr.sbin/httpd/config.c
index 36b9abd..4f8ef4c 100644 (file)
--- a/usr.sbin/httpd/config.c
+++ b/usr.sbin/httpd/config.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: config.c,v 1.46 2016/05/31 15:28:08 jsing Exp $       */
+/*     $OpenBSD: config.c,v 1.47 2016/08/15 14:14:55 jsing Exp $       */
 
 /*
  * Copyright (c) 2011 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -241,10 +241,10 @@ config_settls(struct httpd *env, struct server *srv)
        if ((srv_conf->flags & SRVFLAG_TLS) == 0)
                return (0);
 
-       log_debug("%s: configuring TLS for %s", __func__, srv_conf->name);
+       log_debug("%s: configuring tls for %s", __func__, srv_conf->name);
 
        if (srv_conf->tls_cert_len != 0) {
-               DPRINTF("%s: sending TLS cert \"%s[%u]\" to %s fd %d", __func__,
+               DPRINTF("%s: sending tls cert \"%s[%u]\" to %s fd %d", __func__,
                    srv_conf->name, srv_conf->id, ps->ps_title[PROC_SERVER],
                    srv->srv_s);
 
@@ -266,7 +266,7 @@ config_settls(struct httpd *env, struct server *srv)
        }
 
        if (srv_conf->tls_key_len != 0) {
-               DPRINTF("%s: sending TLS key \"%s[%u]\" to %s fd %d", __func__,
+               DPRINTF("%s: sending tls key \"%s[%u]\" to %s fd %d", __func__,
                    srv_conf->name, srv_conf->id, ps->ps_title[PROC_SERVER],
                    srv->srv_s);
 
@@ -580,7 +580,7 @@ config_gettls(struct httpd *env, struct imsg *imsg)
                goto fail;
        }
 
-       DPRINTF("%s: %s %d TLS configuration \"%s[%u]\"", __func__,
+       DPRINTF("%s: %s %d tls configuration \"%s[%u]\"", __func__,
            ps->ps_title[privsep_process], ps->ps_instance,
            srv_conf->name, srv_conf->id);
 

diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c
index 7404d49..d584dec 100644 (file)
--- a/usr.sbin/httpd/server.c
+++ b/usr.sbin/httpd/server.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: server.c,v 1.86 2016/08/15 13:48:24 jsing Exp $       */
+/*     $OpenBSD: server.c,v 1.87 2016/08/15 14:14:55 jsing Exp $       */
 
 /*
  * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -186,7 +186,7 @@ server_tls_init(struct server *srv)
        if ((srv->srv_conf.flags & SRVFLAG_TLS) == 0)
                return (0);
 
-       log_debug("%s: setting up TLS for %s", __func__, srv->srv_conf.name);
+       log_debug("%s: setting up tls for %s", __func__, srv->srv_conf.name);
 
        if (tls_init() != 0) {
                log_warnx("%s: failed to initialise tls", __func__);
@@ -232,7 +232,7 @@ server_tls_init(struct server *srv)
        }
 
        if (tls_configure(srv->srv_tls_ctx, srv->srv_tls_config) != 0) {
-               log_warnx("%s: failed to configure TLS - %s", __func__,
+               log_warnx("%s: failed to configure tls - %s", __func__,
                    tls_error(srv->srv_tls_ctx));
                return (-1);
        }
@@ -972,7 +972,7 @@ server_handshake_tls(int fd, short event, void *arg)
        int ret;
 
        if (event == EV_TIMEOUT) {
-               server_close(clt, "TLS handshake timeout");
+               server_close(clt, "tls handshake timeout");
                return;
        }
 
@@ -991,9 +991,9 @@ server_handshake_tls(int fd, short event, void *arg)
                    server_handshake_tls, &clt->clt_tv_start,
                    &srv->srv_conf.timeout, clt);
        } else {
-               log_warnx("%s: TLS handshake failed - %s", __func__,
+               log_warnx("%s: tls handshake failed - %s", __func__,
                    tls_error(clt->clt_tls_ctx));
-               server_close(clt, "TLS handshake failed");
+               server_close(clt, "tls handshake failed");
        }
 }