You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2020/02/21 12:05:23 UTC
svn commit: r1874314 - in /httpd/httpd/trunk/modules/md: md_acme_authz.c
md_acme_order.c md_acmev1_drive.c md_crypt.h md_http.h md_reg.c md_reg.h
md_status.h md_util.h mod_md.c
Author: icing
Date: Fri Feb 21 12:05:18 2020
New Revision: 1874314
URL: http://svn.apache.org/viewvc?rev=1874314&view=rev
Log:
mod_md: re-applying the parts of r1873985 that got overwritten by the latest github sync.
Modified:
httpd/httpd/trunk/modules/md/md_acme_authz.c
httpd/httpd/trunk/modules/md/md_acme_order.c
httpd/httpd/trunk/modules/md/md_acmev1_drive.c
httpd/httpd/trunk/modules/md/md_crypt.h
httpd/httpd/trunk/modules/md/md_http.h
httpd/httpd/trunk/modules/md/md_reg.c
httpd/httpd/trunk/modules/md/md_reg.h
httpd/httpd/trunk/modules/md/md_status.h
httpd/httpd/trunk/modules/md/md_util.h
httpd/httpd/trunk/modules/md/mod_md.c
Modified: httpd/httpd/trunk/modules/md/md_acme_authz.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_acme_authz.c?rev=1874314&r1=1874313&r2=1874314&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_acme_authz.c (original)
+++ httpd/httpd/trunk/modules/md/md_acme_authz.c Fri Feb 21 12:05:18 2020
@@ -588,8 +588,8 @@ apr_status_t md_acme_authz_respond(md_ac
* - if setup failed, continue to look for another supported challenge type
* - if there is no overlap in types, tell the user that she has to configure
* either more types (dns, tls-alpn-01), make ports available or refrain
- * from useing wildcard domains when dns is not available. etc.
- * - if there was an overlap, but no setup was successfull, report that. We
+ * from using wildcard domains when dns is not available. etc.
+ * - if there was an overlap, but no setup was successful, report that. We
* will retry this, maybe the failure is temporary (e.g. command to setup DNS
*/
rv = APR_ENOTIMPL;
Modified: httpd/httpd/trunk/modules/md/md_acme_order.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_acme_order.c?rev=1874314&r1=1874313&r2=1874314&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_acme_order.c (original)
+++ httpd/httpd/trunk/modules/md/md_acme_order.c Fri Feb 21 12:05:18 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 consideres "
+ "domain authorization for %s failed, CA considers "
"answer to challenge invalid, no error given",
authz->domain);
}
Modified: httpd/httpd/trunk/modules/md/md_acmev1_drive.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_acmev1_drive.c?rev=1874314&r1=1874313&r2=1874314&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_acmev1_drive.c (original)
+++ httpd/httpd/trunk/modules/md/md_acmev1_drive.c Fri Feb 21 12:05:18 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 ot, create an AUTHZ resource with challenge data
+ * - if not, create an AUTHZ resource with challenge data
*/
static apr_status_t ad_setup_order(md_proto_driver_t *d, md_result_t *result)
{
Modified: httpd/httpd/trunk/modules/md/md_crypt.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_crypt.h?rev=1874314&r1=1874313&r2=1874314&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_crypt.h (original)
+++ httpd/httpd/trunk/modules/md/md_crypt.h Fri Feb 21 12:05:18 2020
@@ -100,7 +100,7 @@ typedef enum {
} md_cert_state_t;
/**
- * Create a holder of the certificate that will free its memmory when the
+ * Create a holder of the certificate that will free its memory when the
* pool is destroyed.
*/
md_cert_t *md_cert_make(apr_pool_t *p, void *x509);
Modified: httpd/httpd/trunk/modules/md/md_http.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_http.h?rev=1874314&r1=1874313&r2=1874314&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_http.h (original)
+++ httpd/httpd/trunk/modules/md/md_http.h Fri Feb 21 12:05:18 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 reqest. This needs to take everything from
+ * Set the timeout for the complete request. This needs to take everything from
* DNS looksups, to conntects, to transfer of all data into account and should
* be sufficiently large.
* Set to 0 the have no timeout for this.
@@ -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 reqest.
+ * Create a GET request.
* @param preq the created request after success
* @param http the md_http instance
* @param url the url to GET
@@ -144,7 +144,7 @@ apr_status_t md_http_GET_create(md_http_
struct apr_table_t *headers);
/**
- * Create a HEAD reqest.
+ * Create a HEAD request.
* @param preq the created request after success
* @param http the md_http instance
* @param url the url to GET
@@ -154,7 +154,7 @@ apr_status_t md_http_HEAD_create(md_http
struct apr_table_t *headers);
/**
- * Create a POST reqest with a bucket brigade as request body.
+ * Create a POST request with a bucket brigade as request body.
* @param preq the created request after success
* @param http the md_http instance
* @param url the url to GET
@@ -168,7 +168,7 @@ apr_status_t md_http_POST_create(md_http
struct apr_bucket_brigade *body, int detect_len);
/**
- * Create a POST reqest with known request body data.
+ * Create a POST request with known request body data.
* @param preq the created request after success
* @param http the md_http instance
* @param url the url to GET
@@ -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 reqests are done, nextreq will be called one more time. Should it not
+ * When all requests are done, nextreq will be called one more time. Should it not
* return anything, this function returns.
*/
apr_status_t md_http_multi_perform(md_http_t *http, md_http_next_req *nextreq, void *baton);
Modified: httpd/httpd/trunk/modules/md/md_reg.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_reg.c?rev=1874314&r1=1874313&r2=1874314&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_reg.c (original)
+++ httpd/httpd/trunk/modules/md/md_reg.c Fri Feb 21 12:05:18 2020
@@ -670,7 +670,7 @@ int md_reg_should_warn(md_reg_t *reg, co
}
/**************************************************************************************************/
-/* synching */
+/* syncing */
apr_status_t md_reg_set_props(md_reg_t *reg, apr_pool_t *p, int can_http, int can_https)
{
@@ -836,7 +836,7 @@ leave:
}
/**
- * Finish synching an MD with the store.
+ * Finish syncing an MD with the store.
* 1. if there are changed properties (or if the MD is new), save it.
* 2. read any existing certificate and init the state of the memory MD
*/
Modified: httpd/httpd/trunk/modules/md/md_reg.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_reg.h?rev=1874314&r1=1874313&r2=1874314&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_reg.h (original)
+++ httpd/httpd/trunk/modules/md/md_reg.h Fri Feb 21 12:05:18 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 permament storage
+ * @param p pool for permanent storage
* @param ptemp pool for temporary storage
* @param mds the list of configured MDs
*/
@@ -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 shoud be renewed. This includes reaching
+ * Return if the certificate of the MD should be renewed. This includes reaching
* the renewal window of an otherwise valid certificate. It return also !0 iff
* no certificate has been obtained yet.
*/
@@ -222,7 +222,7 @@ struct md_proto_t {
};
/**
- * Run a test intialization of the renew protocol for the given MD. This verifies
+ * Run a test initialization of the renew protocol for the given MD. This verifies
* basic parameter settings and is expected to return a description of encountered
* problems in <pmessage> when != APR_SUCCESS.
* A message return is allocated fromt the given pool.
Modified: httpd/httpd/trunk/modules/md/md_status.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_status.h?rev=1874314&r1=1874313&r2=1874314&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_status.h (original)
+++ httpd/httpd/trunk/modules/md/md_status.h Fri Feb 21 12:05:18 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 intergers for MD_KEY_COMPLETE, MD_KEY_RENEWING,
+ * will carry integers for MD_KEY_COMPLETE, MD_KEY_RENEWING,
* MD_KEY_ERRORED, MD_KEY_READY and MD_KEY_TOTAL.
*/
void md_status_take_stock(struct md_json_t **pjson, apr_array_header_t *mds,
@@ -101,7 +101,7 @@ void md_job_log_append(md_job_t *job, co
const char *status, const char *detail);
/**
- * Retrieve the lastest log entry of a certain type.
+ * Retrieve the latest log entry of a certain type.
*/
md_json_t *md_job_log_get_latest(md_job_t *job, const char *type);
Modified: httpd/httpd/trunk/modules/md/md_util.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_util.h?rev=1874314&r1=1874313&r2=1874314&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_util.h (original)
+++ httpd/httpd/trunk/modules/md/md_util.h Fri Feb 21 12:05:18 2020
@@ -90,7 +90,7 @@ struct apr_array_header_t *md_array_str_
int case_sensitive);
/**
- * Create a new array with all occurances of <exclude> removed.
+ * Create a new array with all occurrences of <exclude> removed.
*/
struct apr_array_header_t *md_array_str_remove(apr_pool_t *p, struct apr_array_header_t *src,
const char *exclude, int case_sensitive);
Modified: httpd/httpd/trunk/modules/md/mod_md.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/mod_md.c?rev=1874314&r1=1874313&r2=1874314&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/mod_md.c (original)
+++ httpd/httpd/trunk/modules/md/mod_md.c Fri Feb 21 12:05:18 2020
@@ -879,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 setttings to the MDs
+ * 2. apply the now complete configuration settings to the MDs
* 3. Link MDs to the server_recs they are used in. Detect unused MDs.
* 4. Update the store with the MDs. Change domain names, create new MDs, etc.
* Basically all MD properties that are configured directly.
@@ -888,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 existance and aspect of
+ * 7. Read back the MD properties that reflect the existence and aspect of
* credentials that are in the store (or missing there).
* Expiry times, MD state, etc.
* 8. Determine the list of MDs that need driving/supervision.
@@ -905,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)
- "synching %d mds to registry", mc->mds->nelts);
+ "syncing %d mds to registry", mc->mds->nelts);
goto leave;
}
/*5*/
@@ -948,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 synching to store", md->name);
+ "md[%s]: error syncing to store", md->name);
goto leave;
}
}