From: Christophe Jaillet Date: Sat, 24 Mar 2018 20:05:19 +0000 (+0000) Subject: Fix some typos reported in PR 59998 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e56c5b221363bdb59f5442768d223345363964d;p=apache Fix some typos reported in PR 59998 Most add already been fixed when PR 59990 had been applied on trunk. Thx klemens git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827669 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/apreq.h b/include/apreq.h index 9faebdb0b7..bc3cda8401 100644 --- a/include/apreq.h +++ b/include/apreq.h @@ -227,7 +227,7 @@ void apreq_value_table_add(const apreq_value_t *v, apr_table_t *t) { * and apreq_post_initialize() instead. * * @param pool a base pool persisting while libapreq2 is used - * @remarks after you detroy the pool, you have to call this function again + * @remarks after you destroy the pool, you have to call this function again * with a new pool if you still plan to use libapreq2 */ APREQ_DECLARE(apr_status_t) apreq_initialize(apr_pool_t *pool); @@ -241,7 +241,7 @@ APREQ_DECLARE(apr_status_t) apreq_initialize(apr_pool_t *pool); * create a post-config hook using APR_HOOK_MIDDLE. * * @param pool a base pool persisting while libapreq2 is used - * @remarks after you detroyed the pool, you have to call this function again + * @remarks after you destroyed the pool, you have to call this function again * with a new pool if you still plan to use libapreq2 */ APREQ_DECLARE(apr_status_t) apreq_pre_initialize(apr_pool_t *pool); diff --git a/include/apreq_parser.h b/include/apreq_parser.h index e719b8b019..11465d0eaa 100644 --- a/include/apreq_parser.h +++ b/include/apreq_parser.h @@ -278,7 +278,7 @@ typedef struct apreq_hook_find_param_ctx_t { /** * Special purpose utility for locating a parameter - * during parsing. The hook's ctx shoud be initialized + * during parsing. The hook's ctx should be initialized * to an apreq_hook_find_param_ctx_t *, with the name * attribute set to the sought parameter name, the param * attribute set to NULL, and the prev attribute set to diff --git a/include/apreq_util.h b/include/apreq_util.h index c8708f41d2..58d57a16c8 100644 --- a/include/apreq_util.h +++ b/include/apreq_util.h @@ -158,7 +158,7 @@ APREQ_DECLARE(apreq_charset_t) apreq_charset_divine(const char *src, * @return ::APREQ_ERROR_BADSEQ or ::APREQ_ERROR_BADCHAR on malformed input. * * @remarks In the non-success case, dlen will be set to include - * the last succesfully decoded value. This function decodes + * the last successfully decoded value. This function decodes * \%uXXXX into a utf8 (wide) character, following ECMA-262 * (the Javascript spec) Section B.2.1. */ @@ -181,7 +181,7 @@ APREQ_DECLARE(apr_status_t) apreq_decode(char *dest, apr_size_t *dlen, * @return ::APREQ_ERROR_BADSEQ or ::APREQ_ERROR_BADCHAR on malformed input. * * @remarks In the non-APR_SUCCESS case, dlen will be set to include - * the last succesfully decoded value. This function decodes + * the last successfully decoded value. This function decodes * \%uXXXX into a utf8 (wide) character, following ECMA-262 * (the Javascript spec) Section B.2.1. */ diff --git a/include/http_config.h b/include/http_config.h index 549e1d16be..996b358b07 100644 --- a/include/http_config.h +++ b/include/http_config.h @@ -427,7 +427,7 @@ struct module_struct { * The AP_MAYBE_UNUSED macro is used for variable declarations that * might potentially exhibit "unused var" warnings on some compilers if * left untreated. - * Since static intializers are not part of the C language (C89), making + * Since static initializers are not part of the C language (C89), making * (void) usage is not possible. However many compiler have proprietary * mechanism to suppress those warnings. */ diff --git a/modules/filters/mod_sed.c b/modules/filters/mod_sed.c index f788cba92e..8d29a03707 100644 --- a/modules/filters/mod_sed.c +++ b/modules/filters/mod_sed.c @@ -59,7 +59,7 @@ typedef struct sed_filter_ctxt module AP_MODULE_DECLARE_DATA sed_module; /* This function will be call back from libsed functions if there is any error - * happend during execution of sed scripts + * happened during execution of sed scripts */ static apr_status_t log_sed_errf(void *data, const char *error) { @@ -412,7 +412,7 @@ static apr_status_t sed_request_filter(ap_filter_t *f, * the buckets in bbinp and read the data from buckets and invoke * sed_eval_buffer on the data. libsed will generate its output using * sed_write_output which will add data in ctx->bb. Do it until it have - * atleast one bucket in ctx->bb. At the end of data eos bucket + * at least one bucket in ctx->bb. At the end of data eos bucket * should be there. * * Once eos bucket is seen, then invoke sed_finalize_eval to clear the diff --git a/modules/http/http_request.c b/modules/http/http_request.c index 0b05b3d842..6e6e35c7d3 100644 --- a/modules/http/http_request.c +++ b/modules/http/http_request.c @@ -378,7 +378,7 @@ AP_DECLARE(void) ap_process_request_after_handler(request_rec *r) /* The EOR bucket has either been handled by an output filter (eg. * deleted or moved to a buffered_bb => no more in bb), or an error - * occured before that (eg. c->aborted => still in bb) and we ought + * occurred before that (eg. c->aborted => still in bb) and we ought * to destroy it now. So cleanup any remaining bucket along with * the orphan request (if any). */ @@ -779,7 +779,7 @@ AP_DECLARE(void) ap_internal_redirect(const char *new_uri, request_rec *r) AP_INTERNAL_REDIRECT(r->uri, new_uri); - /* ap_die was already called, if an error occured */ + /* ap_die was already called, if an error occurred */ if (!new) { return; } @@ -803,7 +803,7 @@ AP_DECLARE(void) ap_internal_redirect_handler(const char *new_uri, request_rec * int access_status; request_rec *new = internal_internal_redirect(new_uri, r); - /* ap_die was already called, if an error occured */ + /* ap_die was already called, if an error occurred */ if (!new) { return; } diff --git a/modules/http2/h2_config.c b/modules/http2/h2_config.c index 876635509c..9d9be90749 100644 --- a/modules/http2/h2_config.c +++ b/modules/http2/h2_config.c @@ -419,7 +419,7 @@ static const char *h2_conf_add_push_priority(cmd_parms *cmd, void *_cfg, else if (!strcasecmp("BEFORE", sdependency)) { dependency = H2_DEPENDANT_BEFORE; if (sweight) { - return "dependecy 'Before' does not allow a weight"; + return "dependency 'Before' does not allow a weight"; } } else if (!strcasecmp("INTERLEAVED", sdependency)) { diff --git a/modules/http2/h2_ngn_shed.c b/modules/http2/h2_ngn_shed.c index fb8577616b..a9a234437f 100644 --- a/modules/http2/h2_ngn_shed.c +++ b/modules/http2/h2_ngn_shed.c @@ -281,7 +281,7 @@ apr_status_t h2_ngn_shed_pull_request(h2_ngn_shed *shed, if (H2_REQ_ENTRIES_EMPTY(&ngn->entries)) { if (want_shutdown) { ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, shed->c, - "h2_ngn_shed(%ld): emtpy queue, shutdown engine %s", + "h2_ngn_shed(%ld): empty queue, shutdown engine %s", shed->c->id, ngn->id); ngn->shutdown = 1; } diff --git a/modules/http2/h2_task.h b/modules/http2/h2_task.h index ab6a7469bc..52fe3fb96a 100644 --- a/modules/http2/h2_task.h +++ b/modules/http2/h2_task.h @@ -21,7 +21,7 @@ /** * A h2_task fakes a HTTP/1.1 request from the data in a HTTP/2 stream - * (HEADER+CONT.+DATA) the module recieves. + * (HEADER+CONT.+DATA) the module receives. * * In order to answer a HTTP/2 stream, we want all Apache httpd infrastructure * to be involved as usual, as if this stream can as a separate HTTP/1.1 @@ -113,7 +113,7 @@ void h2_task_rst(h2_task *task, int error); void h2_task_register_hooks(void); /* - * One time, post config intialization. + * One time, post config initialization. */ apr_status_t h2_task_init(apr_pool_t *pool, server_rec *s); diff --git a/modules/http2/h2_util.c b/modules/http2/h2_util.c index 2fa1c6a924..624e9d9f95 100644 --- a/modules/http2/h2_util.c +++ b/modules/http2/h2_util.c @@ -421,7 +421,7 @@ void h2_iq_clear(h2_iqueue *q) void h2_iq_sort(h2_iqueue *q, h2_iq_cmp *cmp, void *ctx) { /* Assume that changes in ordering are minimal. This needs, - * best case, q->nelts - 1 comparisions to check that nothing + * best case, q->nelts - 1 comparisons to check that nothing * changed. */ if (q->nelts > 0) { diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c index f9f9ae640a..6349dba2d0 100644 --- a/modules/lua/lua_request.c +++ b/modules/lua/lua_request.c @@ -334,7 +334,7 @@ static char* ap_lua_binstrstr (const char * haystack, size_t hsize, const char* return NULL; } -/* r:parsebody(): Parses regular (url-enocded) or multipart POST data and returns two tables*/ +/* r:parsebody(): Parses regular (url-encoded) or multipart POST data and returns two tables*/ static int req_parsebody(lua_State *L) { apr_array_header_t *pairs; @@ -1599,7 +1599,7 @@ static int lua_ap_set_context_info(lua_State *L) /** * ap_os_escape_path (apr_pool_t *p, const char *path, int partial) - * convert an OS path to a URL in an OS dependant way. + * convert an OS path to a URL in an OS dependent way. * @param p The pool to allocate from * @param path The path to convert * @param partial if set, assume that the path will be appended to something diff --git a/modules/mappers/mod_imagemap.c b/modules/mappers/mod_imagemap.c index 187a500a5d..8e76a089a6 100644 --- a/modules/mappers/mod_imagemap.c +++ b/modules/mappers/mod_imagemap.c @@ -858,7 +858,7 @@ menu_bail: /* There's not much else we can do ... we've already sent the headers * to the client. */ - ap_rputs("\n\n[an internal server error occured]\n", r); + ap_rputs("\n\n[an internal server error occurred]\n", r); menu_footer(r); return OK; } diff --git a/modules/proxy/mod_serf.h b/modules/proxy/mod_serf.h index 39fb541b30..cab6da5572 100644 --- a/modules/proxy/mod_serf.h +++ b/modules/proxy/mod_serf.h @@ -77,7 +77,7 @@ struct ap_serf_cluster_provider_t { * unable to contact any of the servers, a 502 will be returned to the * client. * - * Returns OK on sucess, all other return codes will result in a 500. + * Returns OK on success, all other return codes will result in a 500. * * This field must be set. */ diff --git a/modules/ssl/mod_ssl_ct.c b/modules/ssl/mod_ssl_ct.c index 15fe288560..913c5b78f6 100644 --- a/modules/ssl/mod_ssl_ct.c +++ b/modules/ssl/mod_ssl_ct.c @@ -2387,7 +2387,7 @@ static int ssl_ct_init_server(server_rec *s, apr_pool_t *p, int is_proxy, NULL, NULL, client_extension_parse_callback, cbi)) { ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, - APLOGNO(02740) "Unable to initalize Certificate " + APLOGNO(02740) "Unable to initialize Certificate " "Transparency client extension callbacks " "(callback for %d already registered?)", CT_EXTENSION_TYPE); @@ -2409,7 +2409,7 @@ static int ssl_ct_init_server(server_rec *s, apr_pool_t *p, int is_proxy, NULL, NULL, server_extension_parse_callback, cbi)) { ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, - APLOGNO(02741) "Unable to initalize Certificate " + APLOGNO(02741) "Unable to initialize Certificate " "Transparency server extension callback " "(callbacks for %d already registered?)", CT_EXTENSION_TYPE); diff --git a/server/apreq_cookie.c b/server/apreq_cookie.c index 585482c68a..53ae16f64d 100644 --- a/server/apreq_cookie.c +++ b/server/apreq_cookie.c @@ -429,7 +429,7 @@ APREQ_DECLARE(apr_status_t)apreq_parse_cookie_header(apr_pool_t *p, APREQ_DECLARE(int) apreq_cookie_serialize(const apreq_cookie_t *c, char *buf, apr_size_t len) { - /* The format string must be large enough to accomodate all + /* The format string must be large enough to accommodate all * of the cookie attributes. The current attributes sum to * ~90 characters (w/ 6-8 padding chars per attr), so anything * over 100 should be fine. diff --git a/server/apreq_module_cgi.c b/server/apreq_module_cgi.c index b7aa8b719e..3b03c378e0 100644 --- a/server/apreq_module_cgi.c +++ b/server/apreq_module_cgi.c @@ -42,7 +42,7 @@ /** Interactive patch: * TODO Don't use 65K buffer - * TODO Handle empty/non-existant parameters + * TODO Handle empty/non-existent parameters * TODO Allow body elements to be files * TODO When running body/get/cookies all at once, include previous cached * values (and don't start at 0 in count) @@ -947,7 +947,7 @@ static apr_status_t ba_cleanup(void *data) Always check query_string before prompting user, but rewrite body/cookies to get if interactive - Definately more work needed here... + Definitely more work needed here... */ static int is_interactive_mode(apr_pool_t *pool) {