Mailing List Archive

Re: svn commit: r1874132 - in /httpd/httpd/trunk: ./ modules/md/
Hi Stefan,

it seems that this commit reverts some of the spellcheck fixes from
Mike, see below hunks.
Both this commit (w/o the revert) and the typos have been backported
to 2.4.x, so "restore" needed in trunk only.

Cheers,
Yann.


> --- httpd/httpd/trunk/modules/md/md_acme_order.c (original)
> +++ httpd/httpd/trunk/modules/md/md_acme_order.c Mon Feb 17 14:05:03 2020
> @@ -513,7 +513,7 @@ static apr_status_t check_challenges(voi
> rv = APR_EINVAL;
> if (!authz->error_type) {
> md_result_printf(ctx->result, rv,
> - "domain authorization for %s failed, CA considers "
> + "domain authorization for %s failed, CA consideres "

> --- httpd/httpd/trunk/modules/md/md_acmev1_drive.c (original)
> +++ httpd/httpd/trunk/modules/md/md_acmev1_drive.c Mon Feb 17 14:05:03 2020
> @@ -49,7 +49,7 @@
> * Pre-Req: we have an account for the ACME server that has accepted the current license agreement
> * For each domain in MD:
> * - check if there already is a valid AUTHZ resource
> - * - if not, create an AUTHZ resource with challenge data
> + * - if ot, create an AUTHZ resource with challenge data

> --- httpd/httpd/trunk/modules/md/md_crypt.h (original)
> +++ httpd/httpd/trunk/modules/md/md_crypt.h Mon Feb 17 14:05:03 2020
> @@ -100,7 +100,7 @@ typedef enum {
> } md_cert_state_t;
>
> /**
> - * Create a holder of the certificate that will free its memory when the
> + * Create a holder of the certificate that will free its memmory when the

> --- httpd/httpd/trunk/modules/md/md_http.h (original)
> +++ httpd/httpd/trunk/modules/md/md_http.h Mon Feb 17 14:05:03 2020
> @@ -86,7 +86,7 @@ apr_status_t md_http_create(md_http_t **
> void md_http_set_response_limit(md_http_t *http, apr_off_t resp_limit);
>
> /**
> - * Set the timeout for the complete request. This needs to take everything from
> + * Set the timeout for the complete reqest. This needs to take everything from

> @@ -134,7 +134,7 @@ void md_http_set_on_status_cb(md_http_re> void md_http_set_on_response_cb(md_http_request_t *req, md_http_response_cb *cb, void *baton);
>
> /**
> - * Create a GET request.
> + * Create a GET reqest.

> @@ -144,7 +144,7 @@ apr_status_t md_http_GET_create(md_http_> struct apr_table_t *headers);
>
> /**
> - * Create a HEAD request.
> + * Create a HEAD reqest.

> @@ -154,7 +154,7 @@ apr_status_t md_http_HEAD_create(md_http> struct apr_table_t *headers);
>
> /**
> - * Create a POST request with a bucket brigade as request body.
> + * Create a POST reqest with a bucket brigade as request body.

> @@ -168,7 +168,7 @@ apr_status_t md_http_POST_create(md_http> struct apr_bucket_brigade *body, int detect_len);
>
> /**
> - * Create a POST request with known request body data.
> + * Create a POST reqest with known request body data.

> @@ -213,7 +213,7 @@ typedef apr_status_t md_http_next_req(md> * To limit the number of parallel requests, nextreq should return APR_ENOENT when the limit
> * is reached. It will be called again when the number of in_flight requests changes.
> *
> - * When all requests are done, nextreq will be called one more time. Should it not
> + * When all reqests are done, nextreq will be called one more time. Should it not

> --- httpd/httpd/trunk/modules/md/md_reg.c (original)> +++ httpd/httpd/trunk/modules/md/md_reg.c Mon Feb 17 14:05:03 2020
> @@ -670,7 +670,7 @@ int md_reg_should_warn(md_reg_t *reg, co
> }
>
> /**************************************************************************************************/
> -/* syncing */
> +/* synching */

> @@ -836,7 +836,7 @@ leave:
> }
>
> /**
> - * Finish syncing an MD with the store.
> + * Finish synching an MD with the store.

> --- httpd/httpd/trunk/modules/md/md_reg.h (original)
> +++ httpd/httpd/trunk/modules/md/md_reg.h Mon Feb 17 14:05:03 2020
> @@ -145,7 +145,7 @@ apr_status_t md_reg_delete_acct(md_reg_t
> * Cleanup any challenges that are no longer in use.
> *
> * @param reg the registry
> - * @param p pool for permanent storage
> + * @param p pool for permament storage

> @@ -160,7 +160,7 @@ apr_status_t md_reg_cleanup_challenges(m
> apr_status_t md_reg_freeze_domains(md_reg_t *reg, apr_array_header_t *mds);
>
> /**
> - * Return if the certificate of the MD should be renewed. This includes reaching
> + * Return if the certificate of the MD shoud be renewed. This includes reaching

> @@ -222,7 +222,7 @@ struct md_proto_t {
> };
>
> /**
> - * Run a test initialization of the renew protocol for the given MD. This verifies
> + * Run a test intialization of the renew protocol for the given MD. This verifies

> --- httpd/httpd/trunk/modules/md/md_status.h (original)
> +++ httpd/httpd/trunk/modules/md/md_status.h Mon Feb 17 14:05:03 2020
> @@ -40,7 +40,7 @@ apr_status_t md_status_get_json(struct m
>
> /**
> * Take stock of all MDs given for a short overview. The JSON returned
> - * will carry integers for MD_KEY_COMPLETE, MD_KEY_RENEWING,
> + * will carry intergers for MD_KEY_COMPLETE, MD_KEY_RENEWING,

> @@ -101,7 +101,7 @@ void md_job_log_append(md_job_t *job, co
> const char *status, const char *detail);
>
> /**
> - * Retrieve the latest log entry of a certain type.
> + * Retrieve the lastest log entry of a certain type.

> --- httpd/httpd/trunk/modules/md/md_util.h (original)
> +++ httpd/httpd/trunk/modules/md/md_util.h Mon Feb 17 14:05:03 2020
> @@ -90,7 +90,7 @@ struct apr_array_header_t *md_array_str_
> int case_sensitive);
>
> /**
> - * Create a new array with all occurrences of <exclude> removed.
> + * Create a new array with all occurances of <exclude> removed.

> --- httpd/httpd/trunk/modules/md/mod_md.c (original)
> +++ httpd/httpd/trunk/modules/md/mod_md.c Mon Feb 17 14:05:03 2020
> @@ -854,7 +879,7 @@ static apr_status_t md_post_config_befor
>
> /* How to bootstrap this module:
> * 1. find out if we know if http: and/or https: requests will arrive
> - * 2. apply the now complete configuration settings to the MDs
> + * 2. apply the now complete configuration setttings to the MDs

> @@ -863,7 +888,7 @@ static apr_status_t md_post_config_befor
> * store will find the old settings and "recover" the previous name.
> * 5. Load any staged data from previous driving.
> * 6. on a dry run, this is all we do
> - * 7. Read back the MD properties that reflect the existence and aspect of
> + * 7. Read back the MD properties that reflect the existance and aspect of

> @@ -880,7 +905,7 @@ static apr_status_t md_post_config_befor
> /*4*/
> if (APR_SUCCESS != (rv = md_reg_sync_start(mc->reg, mc->mds, ptemp))) {
> ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10073)
> - "syncing %d mds to registry", mc->mds->nelts);
> + "synching %d mds to registry", mc->mds->nelts);

> @@ -923,7 +948,7 @@ static apr_status_t md_post_config_after
> }
> if (APR_SUCCESS != (rv = md_reg_sync_finish(mc->reg, md, p, ptemp))) {
> ap_log_error( APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10172)
> - "md[%s]: error syncing to store", md->name);
> + "md[%s]: error synching to store", md->name);
Re: svn commit: r1874132 - in /httpd/httpd/trunk: ./ modules/md/ [ In reply to ]
Ah, thanks for catching this, Yann.

> Am 21.02.2020 um 10:49 schrieb Yann Ylavic <ylavic.dev@gmail.com>:
>
> Hi Stefan,
>
> it seems that this commit reverts some of the spellcheck fixes from
> Mike, see below hunks.
> Both this commit (w/o the revert) and the typos have been backported
> to 2.4.x, so "restore" needed in trunk only.
>
> Cheers,
> Yann.
>
>
>> --- httpd/httpd/trunk/modules/md/md_acme_order.c (original)
>> +++ httpd/httpd/trunk/modules/md/md_acme_order.c Mon Feb 17 14:05:03 2020
>> @@ -513,7 +513,7 @@ static apr_status_t check_challenges(voi
>> rv = APR_EINVAL;
>> if (!authz->error_type) {
>> md_result_printf(ctx->result, rv,
>> - "domain authorization for %s failed, CA considers "
>> + "domain authorization for %s failed, CA consideres "
>
>> --- httpd/httpd/trunk/modules/md/md_acmev1_drive.c (original)
>> +++ httpd/httpd/trunk/modules/md/md_acmev1_drive.c Mon Feb 17 14:05:03 2020
>> @@ -49,7 +49,7 @@
>> * Pre-Req: we have an account for the ACME server that has accepted the current license agreement
>> * For each domain in MD:
>> * - check if there already is a valid AUTHZ resource
>> - * - if not, create an AUTHZ resource with challenge data
>> + * - if ot, create an AUTHZ resource with challenge data
>
>> --- httpd/httpd/trunk/modules/md/md_crypt.h (original)
>> +++ httpd/httpd/trunk/modules/md/md_crypt.h Mon Feb 17 14:05:03 2020
>> @@ -100,7 +100,7 @@ typedef enum {
>> } md_cert_state_t;
>>
>> /**
>> - * Create a holder of the certificate that will free its memory when the
>> + * Create a holder of the certificate that will free its memmory when the
>
>> --- httpd/httpd/trunk/modules/md/md_http.h (original)
>> +++ httpd/httpd/trunk/modules/md/md_http.h Mon Feb 17 14:05:03 2020
>> @@ -86,7 +86,7 @@ apr_status_t md_http_create(md_http_t **
>> void md_http_set_response_limit(md_http_t *http, apr_off_t resp_limit);
>>
>> /**
>> - * Set the timeout for the complete request. This needs to take everything from
>> + * Set the timeout for the complete reqest. This needs to take everything from
>
>> @@ -134,7 +134,7 @@ void md_http_set_on_status_cb(md_http_re> void md_http_set_on_response_cb(md_http_request_t *req, md_http_response_cb *cb, void *baton);
>>
>> /**
>> - * Create a GET request.
>> + * Create a GET reqest.
>
>> @@ -144,7 +144,7 @@ apr_status_t md_http_GET_create(md_http_> struct apr_table_t *headers);
>>
>> /**
>> - * Create a HEAD request.
>> + * Create a HEAD reqest.
>
>> @@ -154,7 +154,7 @@ apr_status_t md_http_HEAD_create(md_http> struct apr_table_t *headers);
>>
>> /**
>> - * Create a POST request with a bucket brigade as request body.
>> + * Create a POST reqest with a bucket brigade as request body.
>
>> @@ -168,7 +168,7 @@ apr_status_t md_http_POST_create(md_http> struct apr_bucket_brigade *body, int detect_len);
>>
>> /**
>> - * Create a POST request with known request body data.
>> + * Create a POST reqest with known request body data.
>
>> @@ -213,7 +213,7 @@ typedef apr_status_t md_http_next_req(md> * To limit the number of parallel requests, nextreq should return APR_ENOENT when the limit
>> * is reached. It will be called again when the number of in_flight requests changes.
>> *
>> - * When all requests are done, nextreq will be called one more time. Should it not
>> + * When all reqests are done, nextreq will be called one more time. Should it not
>
>> --- httpd/httpd/trunk/modules/md/md_reg.c (original)> +++ httpd/httpd/trunk/modules/md/md_reg.c Mon Feb 17 14:05:03 2020
>> @@ -670,7 +670,7 @@ int md_reg_should_warn(md_reg_t *reg, co
>> }
>>
>> /**************************************************************************************************/
>> -/* syncing */
>> +/* synching */
>
>> @@ -836,7 +836,7 @@ leave:
>> }
>>
>> /**
>> - * Finish syncing an MD with the store.
>> + * Finish synching an MD with the store.
>
>> --- httpd/httpd/trunk/modules/md/md_reg.h (original)
>> +++ httpd/httpd/trunk/modules/md/md_reg.h Mon Feb 17 14:05:03 2020
>> @@ -145,7 +145,7 @@ apr_status_t md_reg_delete_acct(md_reg_t
>> * Cleanup any challenges that are no longer in use.
>> *
>> * @param reg the registry
>> - * @param p pool for permanent storage
>> + * @param p pool for permament storage
>
>> @@ -160,7 +160,7 @@ apr_status_t md_reg_cleanup_challenges(m
>> apr_status_t md_reg_freeze_domains(md_reg_t *reg, apr_array_header_t *mds);
>>
>> /**
>> - * Return if the certificate of the MD should be renewed. This includes reaching
>> + * Return if the certificate of the MD shoud be renewed. This includes reaching
>
>> @@ -222,7 +222,7 @@ struct md_proto_t {
>> };
>>
>> /**
>> - * Run a test initialization of the renew protocol for the given MD. This verifies
>> + * Run a test intialization of the renew protocol for the given MD. This verifies
>
>> --- httpd/httpd/trunk/modules/md/md_status.h (original)
>> +++ httpd/httpd/trunk/modules/md/md_status.h Mon Feb 17 14:05:03 2020
>> @@ -40,7 +40,7 @@ apr_status_t md_status_get_json(struct m
>>
>> /**
>> * Take stock of all MDs given for a short overview. The JSON returned
>> - * will carry integers for MD_KEY_COMPLETE, MD_KEY_RENEWING,
>> + * will carry intergers for MD_KEY_COMPLETE, MD_KEY_RENEWING,
>
>> @@ -101,7 +101,7 @@ void md_job_log_append(md_job_t *job, co
>> const char *status, const char *detail);
>>
>> /**
>> - * Retrieve the latest log entry of a certain type.
>> + * Retrieve the lastest log entry of a certain type.
>
>> --- httpd/httpd/trunk/modules/md/md_util.h (original)
>> +++ httpd/httpd/trunk/modules/md/md_util.h Mon Feb 17 14:05:03 2020
>> @@ -90,7 +90,7 @@ struct apr_array_header_t *md_array_str_
>> int case_sensitive);
>>
>> /**
>> - * Create a new array with all occurrences of <exclude> removed.
>> + * Create a new array with all occurances of <exclude> removed.
>
>> --- httpd/httpd/trunk/modules/md/mod_md.c (original)
>> +++ httpd/httpd/trunk/modules/md/mod_md.c Mon Feb 17 14:05:03 2020
>> @@ -854,7 +879,7 @@ static apr_status_t md_post_config_befor
>>
>> /* How to bootstrap this module:
>> * 1. find out if we know if http: and/or https: requests will arrive
>> - * 2. apply the now complete configuration settings to the MDs
>> + * 2. apply the now complete configuration setttings to the MDs
>
>> @@ -863,7 +888,7 @@ static apr_status_t md_post_config_befor
>> * store will find the old settings and "recover" the previous name.
>> * 5. Load any staged data from previous driving.
>> * 6. on a dry run, this is all we do
>> - * 7. Read back the MD properties that reflect the existence and aspect of
>> + * 7. Read back the MD properties that reflect the existance and aspect of
>
>> @@ -880,7 +905,7 @@ static apr_status_t md_post_config_befor
>> /*4*/
>> if (APR_SUCCESS != (rv = md_reg_sync_start(mc->reg, mc->mds, ptemp))) {
>> ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10073)
>> - "syncing %d mds to registry", mc->mds->nelts);
>> + "synching %d mds to registry", mc->mds->nelts);
>
>> @@ -923,7 +948,7 @@ static apr_status_t md_post_config_after
>> }
>> if (APR_SUCCESS != (rv = md_reg_sync_finish(mc->reg, md, p, ptemp))) {
>> ap_log_error( APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10172)
>> - "md[%s]: error syncing to store", md->name);
>> + "md[%s]: error synching to store", md->name);