From: Christophe Jaillet Date: Sun, 26 Dec 2021 09:59:00 +0000 (+0000) Subject: Fix some typo. X-Git-Tag: 2.4.53-rc1-candidate~109 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a47d07ec4a0072fbe21d7a2e8bba880e2a51bea6;p=thirdparty%2Fapache%2Fhttpd.git Fix some typo. Add some missing spaces spotted here and there to better comply with coding style. mod_md is CTR. r1896409 on trunk git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1896410 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/md/md.h b/modules/md/md.h index c7ee08f92d4..5a3aaecdac6 100644 --- a/modules/md/md.h +++ b/modules/md/md.h @@ -95,7 +95,7 @@ struct md_t { struct apr_array_header_t *cert_files; /* != NULL iff pubcerts explicitly configured */ struct apr_array_header_t *pkey_files; /* != NULL iff privkeys explicitly configured */ const char *ca_eab_kid; /* optional KEYID for external account binding */ - const char *ca_eab_hmac; /* optional HMAC for external accont binding */ + const char *ca_eab_hmac; /* optional HMAC for external account binding */ md_state_t state; /* state of this MD */ const char *state_descr; /* description of state of NULL */ diff --git a/modules/md/md_acme.c b/modules/md/md_acme.c index d22aa83ff9c..4366bf695c2 100644 --- a/modules/md/md_acme.c +++ b/modules/md/md_acme.c @@ -714,7 +714,7 @@ static apr_status_t update_directory(const md_http_response_t *res, void *data) /* RFC 8555 only requires "directory" and "newNonce" resources. * mod_md uses "newAccount" and "newOrder" so check for them. * But mod_md does not use the "revokeCert" or "keyChange" - * resources, so tolerate the absense of those keys. In the + * resources, so tolerate the absence of those keys. In the * future if mod_md implements revocation or key rollover then * the use of those features should be predicated on the * server's advertised capabilities. */ diff --git a/modules/md/md_acme_authz.c b/modules/md/md_acme_authz.c index 01431328f1c..1e9aa762784 100644 --- a/modules/md/md_acme_authz.c +++ b/modules/md/md_acme_authz.c @@ -334,7 +334,7 @@ static apr_status_t cha_tls_alpn_01_setup(md_acme_authz_cha_t *cha, md_acme_auth /* Create a "tls-alpn-01" certificate for the domain we want to authenticate. * The server will need to answer a TLS connection with SNI == authz->domain - * and ALPN procotol "acme-tls/1" with this certificate. + * and ALPN protocol "acme-tls/1" with this certificate. */ md_data_init_str(&data, cha->key_authz); rv = md_crypt_sha256_digest_hex(&token, p, &data); diff --git a/modules/md/md_acmev2_drive.c b/modules/md/md_acmev2_drive.c index abb985c44d6..7ee4790b374 100644 --- a/modules/md/md_acmev2_drive.c +++ b/modules/md/md_acmev2_drive.c @@ -169,7 +169,7 @@ retry: if (APR_SUCCESS != rv) goto leave; if (!ad->order->certificate) { - md_result_set(result, APR_EINVAL, "Order valid, but certifiate url is missing."); + md_result_set(result, APR_EINVAL, "Order valid, but certificate url is missing."); goto leave; } md_result_set(result, APR_SUCCESS, NULL); diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c index a264b867c76..73e89009775 100644 --- a/modules/md/md_crypt.c +++ b/modules/md/md_crypt.c @@ -1518,7 +1518,7 @@ apr_status_t md_cert_chain_read_http(struct apr_array_header_t *chain, rv = md_cert_read_chain(chain, res->req->pool, data, data_len); if (APR_SUCCESS == rv && chain->nelts == 0) { md_log_perror(MD_LOG_MARK, MD_LOG_ERR, 0, p, - "certificiate chain response did not contain any certificates " + "certificate chain response did not contain any certificates " "(suspicious content-type: %s)", ct); rv = APR_ENOENT; } diff --git a/modules/md/md_ocsp.c b/modules/md/md_ocsp.c index 01e601f7659..6520c543a92 100644 --- a/modules/md/md_ocsp.c +++ b/modules/md/md_ocsp.c @@ -449,7 +449,7 @@ static void ocsp_get_meta(md_ocsp_cert_stat_t *pstat, md_timeperiod_t *pvalid, { apr_thread_mutex_lock(reg->mutex); if (ostat->resp_der.len <= 0) { - /* No resonse known, check the store if out watchdog retrieved one + /* No response known, check the store if out watchdog retrieved one * in the meantime. */ ocsp_status_refresh(ostat, p); } @@ -640,7 +640,7 @@ static apr_status_t ostat_on_resp(const md_http_response_t *resp, void *baton) switch ((n = OCSP_check_nonce(ostat->ocsp_req, basic_resp))) { case 1: md_log_perror(MD_LOG_MARK, MD_LOG_TRACE3, 0, req->pool, - "req[%d]: OCSP respoonse nonce does match", req->id); + "req[%d]: OCSP response nonce does match", req->id); break; case 0: rv = APR_EINVAL; @@ -650,7 +650,7 @@ static apr_status_t ostat_on_resp(const md_http_response_t *resp, void *baton) case -1: md_log_perror(MD_LOG_MARK, MD_LOG_TRACE3, 0, req->pool, - "req[%d]: OCSP respoonse did not return the nonce", req->id); + "req[%d]: OCSP response did not return the nonce", req->id); break; default: break; diff --git a/modules/md/md_reg.c b/modules/md/md_reg.c index 67746033eae..0fe6fff3056 100644 --- a/modules/md/md_reg.c +++ b/modules/md/md_reg.c @@ -243,7 +243,7 @@ static apr_status_t state_init(md_reg_t *reg, apr_pool_t *p, md_t *md) } else { state = MD_S_ERROR; - state_descr = "error intializing"; + state_descr = "error initializing"; md_log_perror(MD_LOG_MARK, MD_LOG_WARNING, rv, p, "md{%s}: error", md->name); goto cleanup; } diff --git a/modules/md/md_store_fs.c b/modules/md/md_store_fs.c index f70542cbb7d..ab43054ce58 100644 --- a/modules/md/md_store_fs.c +++ b/modules/md/md_store_fs.c @@ -240,8 +240,8 @@ static apr_status_t read_store_file(md_store_fs_t *s_fs, const char *fname, if (APR_SUCCESS == rv) { md_json_setn(MD_STORE_VERSION, json, MD_KEY_STORE, MD_KEY_VERSION, NULL); rv = md_json_freplace(json, ptemp, MD_JSON_FMT_INDENT, fname, MD_FPROT_F_UONLY); - } - md_log_perror(MD_LOG_MARK, MD_LOG_INFO, rv, p, "migrated store"); + } + md_log_perror(MD_LOG_MARK, MD_LOG_INFO, rv, p, "migrated store"); } } return rv; diff --git a/modules/md/mod_md.c b/modules/md/mod_md.c index 6387e4dd200..e8b625038ac 100644 --- a/modules/md/mod_md.c +++ b/modules/md/mod_md.c @@ -98,7 +98,7 @@ static void log_print(const char *file, int line, md_log_level_t level, buffer[LOG_BUF_LEN-1] = '\0'; if (log_server) { - ap_log_error(file, line, APLOG_MODULE_INDEX, (int)level, rv, log_server, "%s",buffer); + ap_log_error(file, line, APLOG_MODULE_INDEX, (int)level, rv, log_server, "%s", buffer); } else { ap_log_perror(file, line, APLOG_MODULE_INDEX, (int)level, rv, p, "%s", buffer); @@ -1167,7 +1167,7 @@ static apr_status_t get_certificates(server_rec *s, apr_pool_t *p, int fallback, } else if (APR_STATUS_IS_ENOENT(rv)) { /* certificate for this pkey is not available, others might - * if pkeys have been added for a runnign mdomain. + * if pkeys have been added for a running mdomain. * see issue #260 */ rv = APR_SUCCESS; }