diff options
| author | Jim Jagielski <jim@apache.org> | 2016-08-25 12:48:18 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2016-08-25 12:48:18 +0000 |
| commit | 4199cb4047f29b859a9bfc32f940cef6e013e5d5 (patch) | |
| tree | b3cdc108574b3cca2218300d216bd7dc1620678e | |
| parent | d8eca0e4056e5d8d91acbe283833f0d1d501e1c6 (diff) | |
| download | httpd-4199cb4047f29b859a9bfc32f940cef6e013e5d5.tar.gz | |
Merge r1756038 from trunk:
Fix spelling in comments and text files.
No functional change.
PR 59990
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757669 13f79535-47bb-0310-9956-ffa450edef68
72 files changed, 123 insertions, 133 deletions
@@ -204,7 +204,7 @@ Changes with Apache 2.4.20 *) mod_proxy_express: Fix possible use of DB handle after close. PR 59230. [Petr <pgajdos suse.cz>] - *) core/util_script: relax alphanumeric filter of enviroment variable names + *) core/util_script: relax alphanumeric filter of environment variable names on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al. unadulterated in 64 bit versions of Windows. PR 46751. [John <john leineweb de>] @@ -481,7 +481,7 @@ Changes with Apache 2.4.18 fixes crash on a request that did not produce any response. [Stefan Eissing] - *) mod_http2: trailers are sent after reponse body if set in request_rec + *) mod_http2: trailers are sent after response body if set in request_rec trailers_out before the end-of-request bucket is sent through the output filters. [Stefan Eissing] @@ -837,7 +837,7 @@ Changes with Apache 2.4.13 (not released) [Yann Ylavic] *) mod_proxy_connect/wstunnel: If both client and backend sides get readable - at the same time, don't lose errors occuring while forwarding on the first + at the same time, don't lose errors occurring while forwarding on the first side when none occurs next on the other side, and abort. [Yann Ylavic] *) mod_rewrite: Improve relative substitutions in per-directory/htaccess @@ -990,7 +990,7 @@ Changes with Apache 2.4.11 (not released) the URL parameter interpolates to an empty string. PR 56603. [<ajprout hotmail.com>] - *) core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts. + *) core: Fix -D[efined] or <Define>[d] variables lifetime across restarts. PR 57328. [Armin Abfalterer <a.abfalterer gmail.com>, Yann Ylavic]. *) mod_proxy: Preserve original request headers even if they differ @@ -1599,7 +1599,7 @@ Changes with Apache 2.4.7 instead of an explicit cn=* filter. [David Hawes <dhawes vt.edu>] *) ab: Add wait time, fix processing time, and output write errors only if - they occured. [Christophe Jaillet] + they occurred. [Christophe Jaillet] *) worker MPM: Don't forcibly kill worker threads if the child process is exiting gracefully. [Oracle Corporation] @@ -1612,7 +1612,7 @@ Changes with Apache 2.4.7 [Chris Darroch] *) ab: Add a new -l parameter in order not to check the length of the responses. - This can be usefull with dynamic pages. + This can be useful with dynamic pages. PR9945, PR27888, PR42040 [<ccikrs1 cranbrook edu>] *) Suppress formatting of startup messages written to the console when @@ -1993,7 +1993,7 @@ Changes with Apache 2.4.5 request information to the request_rec structure. [Daniel Gruno] *) mod_lua: Add a server scope for Lua states, which creates a pool of - states with managable minimum and maximum size. [Daniel Gruno] + states with manageable minimum and maximum size. [Daniel Gruno] *) mod_lua: Add new directive, LuaMapHandler, for dynamically mapping URIs to Lua scripts and functions using regular expressions. @@ -2046,7 +2046,7 @@ Changes with Apache 2.4.4 *) mod_slotmem_shm: Fix mistaken reset of num_free for restored shm. [Jim Jagielski] - *) mod_proxy: non-existance of byrequests is not an immediate error. + *) mod_proxy: non-existence of byrequests is not an immediate error. [Jim Jagielski] *) mod_proxy_balancer: Improve output of balancer-manager (re: Drn, @@ -2988,7 +2988,7 @@ Changes with Apache 2.3.14 binary needs PCRE. [Rainer Jung] *) configure: tolerate dependency checking failures for modules if - they have been enabled implicitely. [Rainer Jung] + they have been enabled implicitly. [Rainer Jung] *) configure: Allow to specify module specific custom linker flags via the MOD_XXX_LDADD variables. [Rainer Jung] @@ -3094,7 +3094,7 @@ Changes with Apache 2.3.13 state after a timeout when discarding a request body. PR 51103. [Stefan Fritsch] - *) core: Add various file existance test operators to ap_expr. + *) core: Add various file existence test operators to ap_expr. [Stefan Fritsch] *) mod_proxy_express: New mass reverse-proxy switch extension for @@ -4370,7 +4370,7 @@ Changes with Apache 2.3.2 *) mod_mime_magic: Fix detection of compressed content. [Rainer Jung] - *) mod_negotiation: Escape pathes of filenames in 406 responses to avoid + *) mod_negotiation: Escape paths of filenames in 406 responses to avoid HTML injections and HTTP response splitting. PR 46837. [Geoff Keating <geoffk apple.com>] @@ -117,16 +117,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) Typo fixes in comments and text files. PR 59990. - Trunk version of patch: - http://svn.apache.org/r1756038 - Backport version for 2.4.x of patch: - http://home.apache.org/~rjung/patches/httpd-2.4.x-typo-PR59990.patch - (trunk version of patch merge plus CHANGES plus STATUS - plus one hunk in modules/aaa/mod_auth_digest.c) - +1: rjung, ylavic, jchampion - jchampion: IMO, spell-checking STATUS is probably unnecessary. - *) mod_proxy_fcgi: read the whole FCGI response even when the content has not been modified (HTTP 304) to avoid subsequent bogus reads and confusing error messages logged. @@ -331,7 +321,7 @@ PATCHES/ISSUES THAT ARE STALLED +1: jkaluza +1: covener w/ doc or code to fix syntax (providername:providerarg not supported like syslog or socacheproviders, needs 2 args which is not valid in ErrorLog manual) - trawick: nit: fix "writing" in "/* NULL if we are writting to syslog */" + trawick: nit: fix "writing" in "/* NULL if we are writing to syslog */" (sorry, haven't finished reviewing completely) jim: What is the status of this?? @@ -392,7 +382,7 @@ PATCHES/ISSUES THAT ARE STALLED +1: jkaluza * mod_proxy: Ensure network errors detected by the proxy are returned as - 504 Gateway Timout as opposed to 502 Bad Gateway + 504 Gateway Timeout as opposed to 502 Bad Gateway trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1480058 2.4.x patch: trunk patch works modulo CHANGES +1: @@ -439,7 +429,7 @@ PATCHES/ISSUES THAT ARE STALLED of described indirectly in a sample? Why are these new samples added to the install without three votes? (I didn't veto it; put your name next to the two - existing ones and I'll be satisified that enough people + existing ones and I'll be satisfied that enough people considered this addition as an appropriate solution for a real httpd usability problem.) wrowe: I'd agree with trawick, and suggest that these scripts can begin diff --git a/include/http_config.h b/include/http_config.h index da24d70f79..5321a8a506 100644 --- a/include/http_config.h +++ b/include/http_config.h @@ -50,7 +50,7 @@ enum cmd_how { RAW_ARGS, /**< cmd_func parses command line itself */ TAKE1, /**< one argument only */ TAKE2, /**< two arguments only */ - ITERATE, /**< one argument, occuring multiple times + ITERATE, /**< one argument, occurring multiple times * (e.g., IndexIgnore) */ ITERATE2, /**< two arguments, 2nd occurs multiple times @@ -812,7 +812,7 @@ AP_DECLARE(apr_status_t) ap_cfg_getc(char *ch, ap_configfile_t *cfp); /** * Detach from open ap_configfile_t, calling the close handler * @param cfp The file to close - * @return 1 on sucess, 0 on failure + * @return 1 on success, 0 on failure */ AP_DECLARE(int) ap_cfg_closefile(ap_configfile_t *cfp); diff --git a/include/http_log.h b/include/http_log.h index 801dccebb1..2b61a110bf 100644 --- a/include/http_log.h +++ b/include/http_log.h @@ -141,7 +141,7 @@ extern "C" { * Constant to store module_index for the current file. * Objects with static storage duration are set to NULL if not * initialized explicitly. This means that if aplog_module_index - * is not initalized using the ::APLOG_USE_MODULE or the + * is not initialized using the ::APLOG_USE_MODULE or the * ::AP_DECLARE_MODULE macro, we can safely fall back to * use ::APLOG_NO_MODULE. This variable will usually be optimized away. */ diff --git a/include/http_request.h b/include/http_request.h index 3d0b143e78..4d0109adfc 100644 --- a/include/http_request.h +++ b/include/http_request.h @@ -218,7 +218,7 @@ AP_DECLARE(void) ap_clear_auth_internal(void); * Determine whether access control hooks will be run for all internal * requests with URIs distinct from that of the initial request, or only * those for which different configurations apply than those which applied - * to the initial request. To accomodate legacy external modules which + * to the initial request. To accommodate legacy external modules which * may expect access control hooks to be run for all internal requests * with distinct URIs, this is the default behaviour unless all access * control hooks and authentication and authorization providers are diff --git a/include/httpd.h b/include/httpd.h index 5035a6100a..e02bcc09fb 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -309,7 +309,7 @@ extern "C" { /** * APR_HAS_LARGE_FILES introduces the problem of spliting sendfile into - * mutiple buckets, no greater than MAX(apr_size_t), and more granular + * multiple buckets, no greater than MAX(apr_size_t), and more granular * than that in case the brigade code/filters attempt to read it directly. * ### 16mb is an invention, no idea if it is reasonable. */ @@ -354,7 +354,7 @@ extern "C" { * use by modules. The difference between #AP_DECLARE and * #AP_DECLARE_NONSTD is that the latter is required for any functions * which use varargs or are used via indirect function call. This - * is to accomodate the two calling conventions in windows dlls. + * is to accommodate the two calling conventions in windows dlls. */ # define AP_DECLARE_NONSTD(type) type #endif diff --git a/include/util_ldap.h b/include/util_ldap.h index aa79fc3065..f7cd736177 100644 --- a/include/util_ldap.h +++ b/include/util_ldap.h @@ -254,7 +254,7 @@ APR_DECLARE_OPTIONAL_FN(util_ldap_connection_t *,uldap_connection_find,(request_ * @param dn The first DN to compare. * @param reqdn The DN to compare the first DN to. * @param compare_dn_on_server Flag to determine whether the DNs should be checked using - * LDAP calls or with a direct string comparision. A direct + * LDAP calls or with a direct string comparison. A direct * string comparison is faster, but not as accurate - false * negative comparisons are possible. * @tip Two DNs can be equal and still fail a string comparison. Eg "dc=example,dc=com" diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile index 337d6f6dd7..ac8ee3e035 100644 --- a/modules/NWGNUmakefile +++ b/modules/NWGNUmakefile @@ -22,7 +22,7 @@ endif endif endif -# If USE_STDSOCKETS is defined we allways build mod_ssl +# If USE_STDSOCKETS is defined we always build mod_ssl ifdef USE_STDSOCKETS WITH_SSL = 1 endif diff --git a/modules/aaa/mod_allowmethods.c b/modules/aaa/mod_allowmethods.c index bcde09924f..dd411969e0 100644 --- a/modules/aaa/mod_allowmethods.c +++ b/modules/aaa/mod_allowmethods.c @@ -26,7 +26,7 @@ * This module makes it easy to restrict what HTTP methods can be ran against * a server. * - * It provides one comand: + * It provides one command: * AllowMethods * This command takes a list of HTTP methods to allow. * diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c index 1d72ff681d..62d7f0c678 100644 --- a/modules/aaa/mod_auth_basic.c +++ b/modules/aaa/mod_auth_basic.c @@ -381,7 +381,7 @@ static int authenticate_basic_user(request_rec *r) apr_table_unset(r->notes, AUTHN_PROVIDER_NAME_NOTE); - /* Something occured. Stop checking. */ + /* Something occurred. Stop checking. */ if (auth_result != AUTH_USER_NOT_FOUND) { break; } diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c index dcf1e15ba1..44b5fc853b 100644 --- a/modules/aaa/mod_auth_digest.c +++ b/modules/aaa/mod_auth_digest.c @@ -1404,7 +1404,7 @@ static authn_status get_hash(request_rec *r, const char *user, apr_table_unset(r->notes, AUTHN_PROVIDER_NAME_NOTE); - /* Something occured. Stop checking. */ + /* Something occurred. Stop checking. */ if (auth_result != AUTH_USER_NOT_FOUND) { break; } @@ -1746,7 +1746,7 @@ static int authenticate_digest_user(request_rec *r) * works out ok, since we can hash the header and get the same * result. however, the uri from the request line won't match * the uri Authorization component since the header lacks the - * query string, leaving us incompatable with a (broken) MSIE. + * query string, leaving us incompatible with a (broken) MSIE. * * the workaround is to fake a query string match if in the proper * environment - BrowserMatch MSIE, for example. the cool thing diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c index 2306ab1de6..5cf6fb0b38 100644 --- a/modules/aaa/mod_auth_form.c +++ b/modules/aaa/mod_auth_form.c @@ -798,7 +798,7 @@ static int check_authn(request_rec * r, const char *sent_user, const char *sent_ apr_table_unset(r->notes, AUTHN_PROVIDER_NAME_NOTE); - /* Something occured. Stop checking. */ + /* Something occurred. Stop checking. */ if (auth_result != AUTH_USER_NOT_FOUND) { break; } diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c index b669c8c8db..c5e5969182 100644 --- a/modules/aaa/mod_authz_core.c +++ b/modules/aaa/mod_authz_core.c @@ -976,7 +976,7 @@ static const char *all_parse_config(cmd_parms *cmd, const char *require_line, /* * If the argument to the 'all' provider is 'granted' then just let * everybody in. This would be equivalent to the previous syntax of - * 'allow from all'. If the argument is 'denied' we reject everbody, + * 'allow from all'. If the argument is 'denied' we reject everybody, * which is equivalent to 'deny from all'. */ if (strcasecmp(require_line, "granted") == 0) { diff --git a/modules/aaa/mod_authz_groupfile.c b/modules/aaa/mod_authz_groupfile.c index e1df12918a..76957f71af 100644 --- a/modules/aaa/mod_authz_groupfile.c +++ b/modules/aaa/mod_authz_groupfile.c @@ -18,7 +18,7 @@ * * AuthGroupFile standard /path/to/file * - * and the presense of a + * and the presence of a * * require group <list-of-groups> * diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c index fc8af9889e..298554a6e5 100644 --- a/modules/arch/netware/mod_nw_ssl.c +++ b/modules/arch/netware/mod_nw_ssl.c @@ -778,7 +778,7 @@ static int nwssl_post_config(apr_pool_t *pconf, apr_pool_t *plog, for (sl = ap_seclisteners; sl != NULL; sl = sl->next) { /* If we find a pre-existing listen socket and it has already been - created, then no neeed to go any further, just reuse it. */ + created, then no need to go any further, just reuse it. */ if (((sl->fd = find_secure_listener(sl)) >= 0) && (sl->used)) { continue; } diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c index bd7cae77c1..2e51d51538 100644 --- a/modules/arch/win32/mod_isapi.c +++ b/modules/arch/win32/mod_isapi.c @@ -27,7 +27,7 @@ * It is a complete implementation of the ISAPI 2.0 specification, * except for "Microsoft extensions" to the API which provide * asynchronous I/O. It is further extended to include additional - * "Microsoft extentions" through IIS 5.0, with some deficiencies + * "Microsoft extensions" through IIS 5.0, with some deficiencies * where one-to-one mappings don't exist. * * Refer to /manual/mod/mod_isapi.html for additional details on @@ -152,7 +152,7 @@ static const char *isapi_cmd_cachefile(cmd_parms *cmd, void *dummy, return NULL; } - /* Load the extention as cached (with null request_rec) */ + /* Load the extension as cached (with null request_rec) */ rv = isapi_lookup(cmd->pool, cmd->server, NULL, fspec, &isa); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_WARNING, rv, cmd->server, APLOGNO(02106) @@ -753,7 +753,7 @@ static apr_ssize_t send_response_header(isapi_cid *cid, /* Well... either there is no dwHttpStatusCode or it's HTTP_OK. * In any case, we don't have a good status to return yet... * Perhaps the one we came in with will be better. Let's use it, - * if we were given one (note this is a pendantic case, it would + * if we were given one (note this is a pedantic case, it would * normally be covered above unless the scan script code unset * the r->status). Should there be a check here as to whether * we are setting a valid response code? diff --git a/modules/arch/win32/mod_isapi.h b/modules/arch/win32/mod_isapi.h index 88f5017798..6afa27b3cf 100644 --- a/modules/arch/win32/mod_isapi.h +++ b/modules/arch/win32/mod_isapi.h @@ -136,7 +136,7 @@ typedef struct HSE_SEND_HEADER_EX_INFO { #define HSE_IO_NODELAY 4096 /* The Completion function prototype. This callback may be fixed with - * the HSE_REQ_IO_COMPLETION ServerSupportFunction call, or overriden + * the HSE_REQ_IO_COMPLETION ServerSupportFunction call, or overridden * for the HSE_REQ_TRANSMIT_FILE call. */ typedef void (APR_THREAD_FUNC *PFN_HSE_IO_COMPLETION) diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c index 091d52706f..f2779d6a9d 100644 --- a/modules/cache/mod_cache.c +++ b/modules/cache/mod_cache.c @@ -1277,7 +1277,7 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in) /* It's safe to cache the response. * - * There are two possiblities at this point: + * There are two possibilities at this point: * - cache->handle == NULL. In this case there is no previously * cached entity anywhere on the system. We must create a brand * new entity and store the response in it. diff --git a/modules/cluster/README.heartbeat b/modules/cluster/README.heartbeat index e216db6799..5eec5495d6 100644 --- a/modules/cluster/README.heartbeat +++ b/modules/cluster/README.heartbeat @@ -14,7 +14,7 @@ Consuming: Every 1 second, this module generates a single multicast UDP packet, containing the number of busy and idle workers. - The packet is a simple ASCII format, similiar to GET query parameters in UDP. + The packet is a simple ASCII format, similar to GET query parameters in UDP. An Example packet: v=1&ready=75&busy=0 diff --git a/modules/core/mod_macro.c b/modules/core/mod_macro.c index 4cd1d41256..dae4fcd297 100644 --- a/modules/core/mod_macro.c +++ b/modules/core/mod_macro.c @@ -377,7 +377,7 @@ static char *substitute(char *buf, } /* - find first occurence of args in buf. + find first occurrence of args in buf. in case of conflict, the LONGEST argument is kept. (could be the FIRST?). returns the pointer and the whichone found, or NULL. */ @@ -464,7 +464,7 @@ static const char *process_content(apr_pool_t * pool, /* for each line of the macro body */ for (i = 0; i < contents->nelts; i++) { const char *errmsg; - /* copy the line and subtitute macro parameters */ + /* copy the line and substitute macro parameters */ strncpy(line, ((char **) contents->elts)[i], MAX_STRING_LEN - 1); errmsg = substitute_macro_args(line, MAX_STRING_LEN, macro, replacements, used); @@ -916,7 +916,7 @@ static int macro_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte /* macro module commands. configuration file macro stuff - they are processed immediatly when found, hence the EXEC_ON_READ. + they are processed immediately when found, hence the EXEC_ON_READ. */ static const command_rec macro_cmds[] = { AP_INIT_RAW_ARGS(BEGIN_MACRO, macro_section, NULL, EXEC_ON_READ | OR_ALL, diff --git a/modules/core/mod_so.c b/modules/core/mod_so.c index eeacec6741..6eafbe9aea 100644 --- a/modules/core/mod_so.c +++ b/modules/core/mod_so.c @@ -193,7 +193,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy, const char *error; /* we need to setup this value for dummy to make sure that we don't try - * to add a non-existant tree into the build when we return to + * to add a non-existent tree into the build when we return to * execute_now. */ *(ap_directive_t **)dummy = NULL; @@ -321,7 +321,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy, /* * This implements the LoadFile directive and loads an arbitrary - * shared object file into the adress space of the server process. + * shared object file into the address space of the server process. */ static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename) diff --git a/modules/dav/main/mod_dav.h b/modules/dav/main/mod_dav.h index 93b9b4e27d..3aaae2e565 100644 --- a/modules/dav/main/mod_dav.h +++ b/modules/dav/main/mod_dav.h @@ -437,7 +437,7 @@ typedef struct dav_locktoken dav_locktoken; ** the sub-pools are a bit more general and heavyweight than these buffers. */ -/* buffer for reuse; can grow to accomodate needed size */ +/* buffer for reuse; can grow to accommodate needed size */ typedef struct { apr_size_t alloc_len; /* how much has been allocated */ @@ -455,7 +455,7 @@ DAV_DECLARE(void) dav_set_bufsize(apr_pool_t *p, dav_buffer *pbuf, DAV_DECLARE(void) dav_buffer_init(apr_pool_t *p, dav_buffer *pbuf, const char *str); -/* check that the buffer can accomodate <extra_needed> more bytes */ +/* check that the buffer can accommodate <extra_needed> more bytes */ DAV_DECLARE(void) dav_check_bufsize(apr_pool_t *p, dav_buffer *pbuf, apr_size_t extra_needed); @@ -921,7 +921,7 @@ struct dav_hooks_liveprop ** ** This structure is used as a standard way to determine if a particular ** property is a live property. Its use is not part of the mandated liveprop -** interface, but can be used by liveprop providers in conjuction with the +** interface, but can be used by liveprop providers in conjunction with the ** utility routines below. ** ** spec->name == NULL is the defined end-sentinel for a list of specs. @@ -2368,7 +2368,7 @@ struct dav_hooks_vsn ** exist. Any <DAV:mkworkspace> element is passed to the provider ** in the "doc" structure; it may be empty. ** - ** If workspace creation is succesful, the state of the resource + ** If workspace creation is successful, the state of the resource ** object is updated appropriately. ** ** This hook is optional; if the provider does not support workspaces, @@ -2391,7 +2391,7 @@ struct dav_hooks_vsn ** Create an activity resource. The resource must not already ** exist. ** - ** If activity creation is succesful, the state of the resource + ** If activity creation is successful, the state of the resource ** object is updated appropriately. ** ** This hook is optional; if the provider does not support activities, diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c index 8d4f64a2bd..9f24604794 100644 --- a/modules/dav/main/util.c +++ b/modules/dav/main/util.c @@ -428,7 +428,7 @@ DAV_DECLARE(void) dav_xmlns_add(dav_xmlns_info *xi, apr_hash_set(xi->prefix_uri, prefix, APR_HASH_KEY_STRING, uri); /* note: this may overwrite an existing URI->prefix mapping, but it - doesn't matter -- any prefix is usuable to specify the URI. */ + doesn't matter -- any prefix is usable to specify the URI. */ apr_hash_set(xi->uri_prefix, uri, APR_HASH_KEY_STRING, prefix); } @@ -587,7 +587,7 @@ static dav_error * dav_add_if_state(apr_pool_t *p, dav_if_header *ih, } /* fetch_next_token returns the substring from str+1 - * to the next occurence of char term, or \0, whichever + * to the next occurrence of char term, or \0, whichever * occurs first. Leading whitespace is ignored. */ static char *dav_fetch_next_token(char **str, char term) diff --git a/modules/examples/README b/modules/examples/README index 02b1c919ed..2e03362aeb 100644 --- a/modules/examples/README +++ b/modules/examples/README @@ -32,7 +32,7 @@ For windows, the process is slightly different; A. copy modules\examples\mod_example_hooks.c modules\examples\mod_myexample.c B. copy modules\examples\mod_example_hooks.dsp modules\examples\mod_myexample.dsp - C. replace the occurances of 'example_hooks' with your module name. + C. replace the occurrences of 'example_hooks' with your module name. D. add the new .dsp to your Apache.dsw workspace, with dependencies on the libapr, libaprutil and libhttpd projects. With the newer Developer Studio 2002 through 2005, when you add the new .dsp diff --git a/modules/http/http_core.c b/modules/http/http_core.c index 57404e66ec..f395bcc445 100644 --- a/modules/http/http_core.c +++ b/modules/http/http_core.c @@ -66,7 +66,7 @@ static const char *set_keep_alive_timeout(cmd_parms *cmd, void *dummy, * set for the main server, because if no http_module directive is used * for a vhost, it will inherit the http_srv_cfg from the main server. * However keep_alive_timeout_set helps determine whether the vhost should - * use its own configured timeout or the one from the vhost delared first + * use its own configured timeout or the one from the vhost declared first * on the same IP:port (ie. c->base_server, and the legacy behaviour). */ if (cmd->server->is_virtual) { diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c index ed8749f996..88772ecbe9 100644 --- a/modules/http/http_filters.c +++ b/modules/http/http_filters.c @@ -1295,7 +1295,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f, } /* - * Control cachability for non-cachable responses if not already set by + * Control cachability for non-cacheable responses if not already set by * some other part of the server configuration. */ if (r->no_cache && !apr_table_get(r->headers_out, "Expires")) { diff --git a/modules/http2/README.h2 b/modules/http2/README.h2 index 399086b70b..f2956f3c33 100644 --- a/modules/http2/README.h2 +++ b/modules/http2/README.h2 @@ -60,7 +60,7 @@ TLS CONFIGURATION If you want to use HTTP/2 with a browser, most modern browsers will support it without further configuration. However, browsers so far only support -HTTP/2 over TLS and are expecially picky about the certificate and +HTTP/2 over TLS and are especially picky about the certificate and encryption ciphers used. Server admins may look for up-to-date information about "modern" TLS diff --git a/modules/http2/h2_conn.h b/modules/http2/h2_conn.h index e52fc8d69e..84f7616858 100644 --- a/modules/http2/h2_conn.h +++ b/modules/http2/h2_conn.h @@ -31,7 +31,7 @@ apr_status_t h2_conn_setup(struct h2_ctx *ctx, conn_rec *c, request_rec *r); /** * Run the HTTP/2 connection in synchronous fashion. * Return when the HTTP/2 session is done - * and the connection will close or a fatal error occured. + * and the connection will close or a fatal error occurred. * * @param ctx the http2 context to run * @return APR_SUCCESS when session is done. diff --git a/modules/http2/h2_h2.h b/modules/http2/h2_h2.h index 592001e992..fad129abb3 100644 --- a/modules/http2/h2_h2.h +++ b/modules/http2/h2_h2.h @@ -17,7 +17,7 @@ #define __mod_h2__h2_h2__ /** - * List of ALPN protocol identifiers that we suport in cleartext + * List of ALPN protocol identifiers that we support in cleartext * negotiations. NULL terminated. */ extern const char *h2_clear_protos[]; @@ -36,7 +36,7 @@ extern const char *h2_tls_protos[]; const char *h2_h2_err_description(unsigned int h2_error); /* - * One time, post config intialization. + * One time, post config initialization. */ apr_status_t h2_h2_init(apr_pool_t *pool, server_rec *s); diff --git a/modules/http2/h2_proxy_util.c b/modules/http2/h2_proxy_util.c index 839f4a5a94..040671172c 100644 --- a/modules/http2/h2_proxy_util.c +++ b/modules/http2/h2_proxy_util.c @@ -279,7 +279,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/http2/h2_push.c b/modules/http2/h2_push.c index 977fab58a3..f385e3e35a 100644 --- a/modules/http2/h2_push.c +++ b/modules/http2/h2_push.c @@ -561,7 +561,7 @@ static h2_push_diary *diary_create(apr_pool_t *p, h2_push_digest_type dtype, diary->NMax = ceil_power_of_2(N); diary->N = diary->NMax; - /* the mask we use in value comparision depends on where we got + /* the mask we use in value comparison depends on where we got * the values from. If we calculate them ourselves, we can use * the full 64 bits. * If we set the diary via a compressed golomb set, we have less diff --git a/modules/http2/h2_response.h b/modules/http2/h2_response.h index 5d1bf3767e..bc2fdb936e 100644 --- a/modules/http2/h2_response.h +++ b/modules/http2/h2_response.h @@ -62,7 +62,7 @@ h2_response *h2_response_die(int stream_id, apr_status_t type, h2_response *h2_response_clone(apr_pool_t *pool, h2_response *from); /** - * Set the trailers in the reponse. Will replace any existing trailers. Will + * Set the trailers in the response. Will replace any existing trailers. Will * *not* clone the table. * * @param response the repsone to set the trailers for diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c index 77369cb74c..e6214088aa 100644 --- a/modules/http2/h2_session.c +++ b/modules/http2/h2_session.c @@ -1582,7 +1582,7 @@ static apr_status_t h2_session_read(h2_session *session, int block) /* successful read, reset our idle timers */ rstatus = APR_SUCCESS; if (block) { - /* successfull blocked read, try unblocked to + /* successful blocked read, try unblocked to * get more. */ block = 0; } diff --git a/modules/http2/h2_session.h b/modules/http2/h2_session.h index 3db70b3589..e905a390a2 100644 --- a/modules/http2/h2_session.h +++ b/modules/http2/h2_session.h @@ -31,7 +31,7 @@ * New incoming HEADER frames are converted into a h2_stream+h2_task instance * that both represent a HTTP/2 stream, but may have separate lifetimes. This * allows h2_task to be scheduled in other threads without semaphores - * all over the place. It allows task memory to be freed independant of + * all over the place. It allows task memory to be freed independent of * session lifetime and sessions may close down while tasks are still running. * * @@ -100,7 +100,7 @@ typedef struct h2_session { unsigned int flush : 1; /* flushing output necessary */ unsigned int have_read : 1; /* session has read client data */ unsigned int have_written : 1; /* session did write data to client */ - apr_interval_time_t wait_us; /* timout during BUSY_WAIT state, micro secs */ + apr_interval_time_t wait_us; /* timeout during BUSY_WAIT state, micro secs */ struct h2_push_diary *push_diary; /* remember pushes, avoid duplicates */ @@ -156,7 +156,7 @@ h2_session *h2_session_rcreate(request_rec *r, struct h2_ctx *ctx, /** * Process the given HTTP/2 session until it is ended or a fatal - * error occured. + * error occurred. * * @param session the sessionm to process */ @@ -175,7 +175,7 @@ apr_status_t h2_session_pre_close(h2_session *session, int async); void h2_session_eoc_callback(h2_session *session); /** - * Called when a serious error occured and the session needs to terminate + * Called when a serious error occurred and the session needs to terminate * without further connection io. * @param session the session to abort * @param reason the apache status that caused the abort diff --git a/modules/http2/h2_stream.h b/modules/http2/h2_stream.h index b7eb5ed4a4..7edfae754a 100644 --- a/modules/http2/h2_stream.h +++ b/modules/http2/h2_stream.h @@ -162,13 +162,13 @@ void h2_stream_rst(h2_stream *stream, int error_code); /** * Schedule the stream for execution. All header information must be - * present. Use the given priority comparision callback to determine + * present. Use the given priority comparison callback to determine * order in queued streams. * * @param stream the stream to schedule * @param eos != 0 iff no more input will arrive - * @param cmp priority comparision - * @param ctx context for comparision + * @param cmp priority comparison + * @param ctx context for comparison */ apr_status_t h2_stream_schedule(h2_stream *stream, int eos, int push_enabled, h2_stream_pri_cmp *cmp, void *ctx); diff --git a/modules/http2/h2_switch.h b/modules/http2/h2_switch.h index 3d9c628c76..10cee960f6 100644 --- a/modules/http2/h2_switch.h +++ b/modules/http2/h2_switch.h @@ -17,7 +17,7 @@ #define __mod_h2__h2_switch__ /* - * One time, post config intialization. + * One time, post config initialization. */ apr_status_t h2_switch_init(apr_pool_t *pool, server_rec *s); diff --git a/modules/http2/h2_util.h b/modules/http2/h2_util.h index 7cae0ac016..13b3b284ba 100644 --- a/modules/http2/h2_util.h +++ b/modules/http2/h2_util.h @@ -365,7 +365,7 @@ do { \ /** * Transfer buckets from one brigade to another with a limit on the - * maximum amount of bytes transfered. Does no setaside magic, lifetime + * maximum amount of bytes transferred. Does no setaside magic, lifetime * of brigades must fit. * @param to brigade to transfer buckets to * @param from brigades to remove buckets from diff --git a/modules/ldap/util_ldap_cache_mgr.c b/modules/ldap/util_ldap_cache_mgr.c index 2389b5d07a..4a0cc9767b 100644 --- a/modules/ldap/util_ldap_cache_mgr.c +++ b/modules/ldap/util_ldap_cache_mgr.c @@ -497,7 +497,7 @@ void *util_ald_cache_insert(util_ald_cache_t *cache, void *payload) } } - /* Take a copy of the payload before proceeeding. */ + /* Take a copy of the payload before proceeding. */ tmp_payload = (*cache->copy)(cache, payload); if (tmp_payload == NULL) { /* diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c index b6dc9ff40b..4270b3f241 100644 --- a/modules/loggers/mod_log_config.c +++ b/modules/loggers/mod_log_config.c @@ -39,7 +39,7 @@ * the request will be logged to the log file(s) defined outside * the virtual host section. If a TransferLog or CustomLog directive * appears in the VirtualHost section, the log files defined outside - * the VirtualHost will _not_ be used. This makes this module compatable + * the VirtualHost will _not_ be used. This makes this module compatible * with the CLF and config log modules, where the use of TransferLog * inside the VirtualHost section overrides its use outside. * diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c index cc2f00fad1..459e252e4e 100644 --- a/modules/lua/mod_lua.c +++ b/modules/lua/mod_lua.c @@ -905,7 +905,7 @@ typedef struct cr_ctx } cr_ctx; -/* Okay, this deserves a little explaination -- in order for the errors that lua +/* Okay, this deserves a little explanation -- in order for the errors that lua * generates to be 'accuarate', including line numbers, we basically inject * N line number new lines into the 'top' of the chunk reader..... * diff --git a/modules/mappers/mod_actions.c b/modules/mappers/mod_actions.c index c311a3bef4..2a67a2742a 100644 --- a/modules/mappers/mod_actions.c +++ b/modules/mappers/mod_actions.c @@ -118,7 +118,7 @@ static const char *set_script(cmd_parms *cmd, void *m_v, } else { /* ap_method_register recognizes already registered methods, - * so don't bother to check its previous existence explicitely. + * so don't bother to check its previous existence explicitly. */ methnum = ap_method_register(cmd->pool, method); } diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c index 71fc0a95b7..b008f5cb1b 100644 --- a/modules/mappers/mod_negotiation.c +++ b/modules/mappers/mod_negotiation.c @@ -2252,7 +2252,7 @@ static int variant_has_language(var_rec *variant, const char *lang) } /* check for environment variables 'no-gzip' and - * 'gzip-only-text/html' to get a behaviour similiar + * 'gzip-only-text/html' to get a behaviour similar * to mod_deflate */ static int discard_variant_by_env(var_rec *variant, int discard) @@ -2775,7 +2775,7 @@ static int setup_choice_response(request_rec *r, negotiation_state *neg, * see that Vary header yet at this point in the control flow. * This won't cause any cache consistency problems _unless_ the * CGI script also returns a Cache-Control header marking the - * response as cachable. This needs to be fixed, also there are + * response as cacheable. This needs to be fixed, also there are * problems if a CGI returns an Etag header which also need to be * fixed. */ @@ -3127,7 +3127,7 @@ static int handle_multi(request_rec *r) ap_internal_fast_redirect(sub_req, r); /* give no advise for time on this subrequest. Perhaps we - * should tally the last mtime amoung all variants, and date + * should tally the last mtime among all variants, and date * the most recent, but that could confuse the proxies. */ r->mtime = 0; diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index 7b2737c5ff..56957c904a 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -4077,7 +4077,7 @@ static int apply_rewrite_rule(rewriterule_entry *p, rewrite_ctx *ctx) /* Ok, we already know the pattern has matched, but we now * additionally have to check for all existing preconditions * (RewriteCond) which have to be also true. We do this at - * this very late stage to avoid unnessesary checks which + * this very late stage to avoid unnecessary checks which * would slow down the rewriting engine. */ rewriteconds = p->rewriteconds; @@ -4871,7 +4871,7 @@ static int hook_fixup(request_rec *r) /* * Do the Options check after engine check, so - * the user is able to explicitely turn RewriteEngine Off. + * the user is able to explicitly turn RewriteEngine Off. */ if (!(ap_allow_options(r) & (OPT_SYM_LINKS | OPT_SYM_OWNER))) { /* FollowSymLinks is mandatory! */ @@ -4886,7 +4886,7 @@ static int hook_fixup(request_rec *r) /* * remember the current filename before rewriting for later check * to prevent deadlooping because of internal redirects - * on final URL/filename which can be equal to the inital one. + * on final URL/filename which can be equal to the initial one. * also, we'll restore original r->filename if we decline this * request */ diff --git a/modules/metadata/mod_env.c b/modules/metadata/mod_env.c index 5a98c801f3..e3e1d4e061 100644 --- a/modules/metadata/mod_env.c +++ b/modules/metadata/mod_env.c @@ -63,7 +63,7 @@ static void *merge_env_dir_configs(apr_pool_t *p, void *basev, void *addv) * table_set( res->vars, $element.key, $element.val ); * * add->unsetenv already removed the vars from add->vars, - * if they preceeded the UnsetEnv directive. + * if they preceded the UnsetEnv directive. */ res->vars = apr_table_copy(p, base->vars); res->unsetenv = NULL; diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c index 693ceca808..22dadaf6fb 100644 --- a/modules/metadata/mod_mime_magic.c +++ b/modules/metadata/mod_mime_magic.c @@ -161,7 +161,7 @@ struct magic { unsigned char hl[4]; /* 2 bytes of a fixed-endian "long" */ } value; /* either number or string */ unsigned long mask; /* mask before comparison with value */ - char nospflag; /* supress space character */ + char nospflag; /* suppress space character */ /* NOTE: this string is suspected of overrunning - find it! */ char desc[MAXDESC]; /* description */ diff --git a/modules/metadata/mod_version.c b/modules/metadata/mod_version.c index 7bf369bc3a..688cd8df27 100644 --- a/modules/metadata/mod_version.c +++ b/modules/metadata/mod_version.c @@ -49,7 +49,7 @@ * = / == match; regex must be surrounded by slashes * ~ match; regex MAY NOT be surrounded by slashes * - * Note that all operators may be preceeded by an exclamation mark + * Note that all operators may be preceded by an exclamation mark * (without spaces) in order to reverse their meaning. * */ diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index f1413c5637..db4da70b47 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -374,7 +374,7 @@ typedef struct { unsigned int fnv; } proxy_hashes ; -/* Runtime worker status informations. Shared in scoreboard */ +/* Runtime worker status information. Shared in scoreboard */ /* The addition of member uds_path in 2.4.7 was an incompatible API change. */ typedef struct { char name[PROXY_WORKER_MAX_NAME_SIZE]; @@ -580,7 +580,7 @@ APR_DECLARE_EXTERNAL_HOOK(proxy, PROXY, int, fixups, (request_rec *r)) /** * pre request hook. * It will return the most suitable worker at the moment - * and coresponding balancer. + * and corresponding balancer. * The url is rewritten from balancer://cluster/uri to scheme://host:port/uri * and then the scheme_handler is called. * @@ -763,7 +763,7 @@ PROXY_DECLARE(char *) ap_proxy_update_balancer(apr_pool_t *p, * @param url url containing balancer name * @param alias alias/fake-path to this balancer * @param do_malloc true if shared struct should be malloced - * @return error message or NULL if successfull + * @return error message or NULL if successful */ PROXY_DECLARE(char *) ap_proxy_define_balancer(apr_pool_t *p, proxy_balancer **balancer, diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c index 0014a7c6bb..ef9f247a61 100644 --- a/modules/proxy/mod_proxy_ajp.c +++ b/modules/proxy/mod_proxy_ajp.c @@ -141,7 +141,7 @@ static apr_off_t get_content_length(request_rec * r) * XXX: AJP Auto Flushing * * When processing CMD_AJP13_SEND_BODY_CHUNK AJP messages we will do a poll - * with FLUSH_WAIT miliseconds timeout to determine if more data is currently + * with FLUSH_WAIT milliseconds timeout to determine if more data is currently * available at the backend. If there is no more data available, we flush * the data to the client by adding a flush bucket to the brigade we pass * up the filter chain. @@ -358,7 +358,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r, } return HTTP_INTERNAL_SERVER_ERROR; } - /* parse the reponse */ + /* parse the response */ result = ajp_parse_type(r, conn->data); output_brigade = apr_brigade_create(p, r->connection->bucket_alloc); diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 0d2c8563b2..66ba17a0b6 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -1798,13 +1798,13 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_worker(proxy_worker *worker, ser if (worker->s->smax == -1 || worker->s->smax > worker->s->hmax) { worker->s->smax = worker->s->hmax; } - /* Set min to be lower then smax */ + /* Set min to be lower than smax */ if (worker->s->min > worker->s->smax) { worker->s->min = worker->s->smax; } } else { - /* This will supress the apr_reslist creation */ + /* This will suppress the apr_reslist creation */ worker->s->min = worker->s->smax = worker->s->hmax = 0; } } @@ -2328,7 +2328,7 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, } /* - * Worker can have the single constant backend adress. + * Worker can have the single constant backend address. * The single DNS lookup is used once per worker. * If dynamic change is needed then set the addr to NULL * inside dynamic config to force the lookup. @@ -3469,7 +3469,7 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_pool_t *p, * * The HTTP/1.1 Via: header is designed for passing client * information through proxies to a server, and should be used in - * a forward proxy configuation instead of X-Forwarded-*. See the + * a forward proxy configuration instead of X-Forwarded-*. See the * ProxyVia option for details. */ if (dconf->add_forwarded_headers) { diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c index 4f0eeeaeb9..04258def0e 100644 --- a/modules/slotmem/mod_slotmem_shm.c +++ b/modules/slotmem/mod_slotmem_shm.c @@ -753,7 +753,7 @@ static const ap_slotmem_provider_t storage = { &slotmem_fgrab }; -/* make the storage usuable from outside */ +/* make the storage usable from outside */ static const ap_slotmem_provider_t *slotmem_shm_getstorage(void) { return (&storage); diff --git a/modules/ssl/README b/modules/ssl/README index c46377f27c..5fc7312434 100644 --- a/modules/ssl/README +++ b/modules/ssl/README @@ -59,7 +59,7 @@ DATA STRUCTURES For an overview how these are related and chained together have a look at the page in README.dsov.{fig,ps}. It contains overview diagrams for those data structures. It's designed for DIN A4 paper size, but you can easily generate - a smaller version inside XFig by specifing a magnification on the Export + a smaller version inside XFig by specifying a magnification on the Export panel. INCOMPATIBILITIES @@ -81,7 +81,7 @@ MAJOR CHANGES o The DBM based session cache is now based on APR's DBM API only. o The shared memory based session cache is now based on APR's APIs. o SSL I/O is now implemented in terms of filters rather than BUFF - o Eliminated ap_global_ctx. Storing Persistant information in + o Eliminated ap_global_ctx. Storing Persistent information in process_rec->pool->user_data. The ssl_pphrase_Handle_CB() and ssl_config_global_* () functions have an extra parameter now - "server_rec *" - which is used to retrieve the SSLModConfigRec. diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index 9adca48acd..cb3efa2929 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -924,7 +924,7 @@ static apr_status_t ssl_init_ctx_cert_chain(server_rec *s, * SSLCACertificateFile and also use client authentication mod_ssl * would accept all clients also issued by this CA. Obviously this * isn't what we want in this situation. So this feature here exists - * to allow one to explicity configure CA certificates which are + * to allow one to explicitly configure CA certificates which are * used only for the server certificate chain. */ if (!chain) { diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index ea2319328d..20e9136048 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -218,7 +218,7 @@ static int bio_filter_out_write(BIO *bio, const char *in, int inl) * * Historically, this flush call was performed only for an SSLv2 * connection or for a proxy connection. Calling _out_flush can - * be expensive in cases where requests/reponses are pipelined, + * be expensive in cases where requests/responses are pipelined, * so limit the performance impact to handshake time. */ #if OPENSSL_VERSION_NUMBER < 0x0009080df diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index 8b6149d8ec..97c794d6f2 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -1017,7 +1017,7 @@ int ssl_hook_Access(request_rec *r) return HTTP_FORBIDDEN; } - /* Full renegotiation successfull, we now have handshaken with + /* Full renegotiation successful, we now have handshaken with * this server's parameters. */ sslconn->server = r->server; @@ -1159,7 +1159,7 @@ int ssl_hook_Access(request_rec *r) * Fake a Basic authentication from the X509 client certificate. * * This must be run fairly early on to prevent a real authentication from - * occuring, in particular it must be run before anything else that + * occurring, in particular it must be run before anything else that * authenticates a user. This means that the Module statement for this * module should be LAST in the Configuration file. */ diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c index 093a69bed3..6b14a55e3f 100644 --- a/modules/ssl/ssl_engine_vars.c +++ b/modules/ssl/ssl_engine_vars.c @@ -1083,7 +1083,7 @@ apr_array_header_t *ssl_ext_list(apr_pool_t *p, conn_rec *c, int peer, } count = X509_get_ext_count(xs); - /* Create an array large enough to accomodate every extension. This is + /* Create an array large enough to accommodate every extension. This is * likely overkill, but safe. */ array = apr_array_make(p, count, sizeof(char *)); diff --git a/os/bs2000/ebcdic.c b/os/bs2000/ebcdic.c index dd5ef54f42..7ec00768ed 100644 --- a/os/bs2000/ebcdic.c +++ b/os/bs2000/ebcdic.c @@ -25,7 +25,7 @@ Within the POSIX subsystem, the same character set was chosen as in "native BS2000", namely EBCDIC. EBCDIC Table. (Yes, in EBCDIC, the letters 'a'..'z' are not contiguous!) -This apr_table_t is bijective, i.e. there are no ambigous or duplicate characters +This apr_table_t is bijective, i.e. there are no ambiguous or duplicate characters 00 00 01 02 03 85 09 86 7f 87 8d 8e 0b 0c 0d 0e 0f *................* 10 10 11 12 13 8f 0a 08 97 18 19 9c 9d 1c 1d 1e 1f *................* 20 80 81 82 83 84 92 17 1b 88 89 8a 8b 8c 05 06 07 *................* diff --git a/os/netware/pre_nw.h b/os/netware/pre_nw.h index dcb1145e48..eef1f6f10b 100644 --- a/os/netware/pre_nw.h +++ b/os/netware/pre_nw.h @@ -55,7 +55,7 @@ #endif #endif -/* C9X defintion used by MSL C++ library */ +/* C9X definition used by MSL C++ library */ #define DECIMAL_DIG 17 /* some code may want to use the MS convention for long long */ diff --git a/os/win32/ap_regkey.c b/os/win32/ap_regkey.c index e080ab4f1f..13c2377804 100644 --- a/os/win32/ap_regkey.c +++ b/os/win32/ap_regkey.c @@ -488,7 +488,7 @@ AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result, #if APR_HAS_ANSI_FS ELSE_WIN_OS_IS_ANSI { - /* Small possiblity the array is either unterminated + /* Small possibility the array is either unterminated * or single NULL terminated. Avert. */ buf = (char *)value; diff --git a/server/config.c b/server/config.c index 7c7a1e0033..61daeaf4a9 100644 --- a/server/config.c +++ b/server/config.c @@ -15,7 +15,7 @@ */ /* - * http_config.c: once was auxillary functions for reading httpd's config + * http_config.c: once was auxiliary functions for reading httpd's config * file and converting filenames into a namespace * * Rob McCool @@ -737,7 +737,7 @@ AP_DECLARE(void) ap_remove_loaded_module(module *mod) * * Note: 1. We cannot determine if the module was successfully * removed by ap_remove_module(). - * 2. We have not to complain explicity when the module + * 2. We have not to complain explicitly when the module * is not found because ap_remove_module() did it * for us already. */ @@ -1326,7 +1326,7 @@ static const char *ap_walk_config_sub(const ap_directive_t *current, if (retval != NULL && strcmp(retval, DECLINE_CMD) != 0) { /* If the directive in error has already been set, don't * replace it. Otherwise, an error inside a container - * will be reported as occuring on the first line of the + * will be reported as occurring on the first line of the * container. */ if (!parms->err_directive) { diff --git a/server/gen_test_char.c b/server/gen_test_char.c index e25238f31b..9cace3e4ee 100644 --- a/server/gen_test_char.c +++ b/server/gen_test_char.c @@ -90,7 +90,7 @@ int main(int argc, char *argv[]) * since Win32/OS2 use carets or doubled-double quotes, * and neither lf nor cr can be escaped. We escape unix * specific as well, to assure that cross-compiled unix - * applications behave similiarly when invoked on win32/os2. + * applications behave similarly when invoked on win32/os2. * * Rem please keep in-sync with apr's list in win32/filesys.c */ diff --git a/server/listen.c b/server/listen.c index 1d9be83f0f..98cd117c56 100644 --- a/server/listen.c +++ b/server/listen.c @@ -763,7 +763,7 @@ AP_DECLARE(void) ap_listen_pre_config(void) /* Check once whether or not SO_REUSEPORT is supported. */ if (ap_have_so_reuseport < 0) { /* This is limited to Linux with defined SO_REUSEPORT (ie. 3.9+) for - * now since the implementation evenly distributes connections accross + * now since the implementation evenly distributes connections across * all the listening threads/processes. * * *BSDs have SO_REUSEPORT too but with a different semantic: the first diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index baeb5a76eb..e53ea0f5ff 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -347,7 +347,7 @@ typedef struct event_retained_data { #endif int hold_off_on_exponential_spawning; /* - * Current number of listeners buckets and maximum reached accross + * Current number of listeners buckets and maximum reached across * restarts (to size retained data according to dynamic num_buckets, * eg. idle_spawn_rate). */ @@ -2830,7 +2830,7 @@ static int event_run(apr_pool_t * _pconf, apr_pool_t * plog, server_rec * s) if (ap_daemons_to_start < num_buckets) ap_daemons_to_start = num_buckets; /* We want to create as much children at a time as the number of buckets, - * so to optimally accept connections (evenly distributed accross buckets). + * so to optimally accept connections (evenly distributed across buckets). * Thus min_spare_threads should at least maintain num_buckets children, * and max_spare_threads allow num_buckets more children w/o triggering * immediately (e.g. num_buckets idle threads margin, one per bucket). diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 273126ad81..8bb46a3948 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -703,7 +703,7 @@ static void child_main(int child_num_arg, int child_bucket) SAFE_ACCEPT(accept_mutex_off()); /* unlock after "accept" */ if (status == APR_EGENERAL) { - /* resource shortage or should-not-occur occured */ + /* resource shortage or should-not-occur occurred */ clean_child_exit(APEXIT_CHILDSICK); } else if (status != APR_SUCCESS) { diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index e0f07849ff..8d3a5ff839 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -1004,7 +1004,7 @@ static void winnt_rewrite_args(process_rec *process) * -k config * -k uninstall * -k stop - * -k shutdown (same as -k stop). Maintained for backward compatability. + * -k shutdown (same as -k stop). Maintained for backward compatibility. * * We can't leave this phase until we know our identity * and modify the command arguments appropriately. @@ -1050,7 +1050,7 @@ static void winnt_rewrite_args(process_rec *process) my_pid = GetCurrentProcessId(); parent_pid = (DWORD) atol(pid); - /* Prevent holding open the (nonexistant) console */ + /* Prevent holding open the (nonexistent) console */ ap_real_exit_code = 0; /* The parent gave us stdin, we need to remember this diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c index 457ff8cf99..22f044dd2f 100644 --- a/server/mpm/winnt/service.c +++ b/server/mpm/winnt/service.c @@ -104,7 +104,7 @@ static APR_INLINE SC_HANDLE OpenSCManager(const void *lpMachine, * * If ap_real_exit_code is reset to 0, it will not be set or trigger this * behavior on exit. All service and child processes are expected to - * reset this flag to zero to avoid undesireable side effects. + * reset this flag to zero to avoid undesirable side effects. */ AP_DECLARE_DATA int ap_real_exit_code = 1; diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index d0ed604063..73c33bfabc 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -168,7 +168,7 @@ typedef struct worker_retained_data { #endif int hold_off_on_exponential_spawning; /* - * Current number of listeners buckets and maximum reached accross + * Current number of listeners buckets and maximum reached across * restarts (to size retained data according to dynamic num_buckets, * eg. idle_spawn_rate). */ @@ -1837,7 +1837,7 @@ static int worker_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) if (ap_daemons_to_start < num_buckets) ap_daemons_to_start = num_buckets; /* We want to create as much children at a time as the number of buckets, - * so to optimally accept connections (evenly distributed accross buckets). + * so to optimally accept connections (evenly distributed across buckets). * Thus min_spare_threads should at least maintain num_buckets children, * and max_spare_threads allow num_buckets more children w/o triggering * immediately (e.g. num_buckets idle threads margin, one per bucket). diff --git a/server/vhost.c b/server/vhost.c index b8b25e64ba..67572c8a31 100644 --- a/server/vhost.c +++ b/server/vhost.c @@ -228,7 +228,7 @@ const char *ap_parse_vhost_addrs(apr_pool_t *p, server_addr_rec **addrs; const char *err; - /* start the list of addreses */ + /* start the list of addresses */ addrs = &s->addrs; while (hostname[0]) { err = get_addresses(p, ap_getword_conf(p, &hostname), &addrs, s->port); @@ -574,7 +574,7 @@ AP_DECLARE(void) ap_fini_vhost_config(apr_pool_t *p, server_rec *main_s) /* The next things to go into the hash table are the virtual hosts * themselves. They're listed off of main_s->next in the reverse - * order they occured in the config file, so we insert them at + * order they occurred in the config file, so we insert them at * the iphash_table_tail but don't advance the tail. */ diff --git a/support/checkgid.c b/support/checkgid.c index 2a918b2956..29de65026b 100644 --- a/support/checkgid.c +++ b/support/checkgid.c @@ -15,7 +15,7 @@ */ /* - * Given one or more group identifers on the command line (e.g., + * Given one or more group identifiers on the command line (e.g., * "httpd" or "#-1"), figure out whether they'll be valid for * the server to use at run-time. * diff --git a/support/htcacheclean.c b/support/htcacheclean.c index 92d09e183a..8692377d0c 100644 --- a/support/htcacheclean.c +++ b/support/htcacheclean.c @@ -1046,9 +1046,9 @@ static void purge(char *path, apr_pool_t *pool, apr_off_t max, return; } - /* process remaining entries oldest to newest, the check for an emtpy + /* process remaining entries oldest to newest, the check for an empty * ring actually isn't necessary except when the compiler does - * corrupt 64bit arithmetics which happend to me once, so better safe + * corrupt 64bit arithmetics which happened to me once, so better safe * than sorry */ while (!((!s.max || s.sum <= s.max) && (!s.inodes || s.nodes <= s.inodes)) diff --git a/support/logresolve.c b/support/logresolve.c index 71dca45243..87df4e82e8 100644 --- a/support/logresolve.c +++ b/support/logresolve.c @@ -258,7 +258,7 @@ int main(int argc, const char * const argv[]) resolves++; /* From here on our we cache each result, even if it was not - * succesful + * successful */ cachesize++; diff --git a/support/logresolve.pl.in b/support/logresolve.pl.in index 9fd7cefe3b..2cd212dfdb 100644 --- a/support/logresolve.pl.in +++ b/support/logresolve.pl.in @@ -41,7 +41,7 @@ # logfile lines processed per hour compared to ~45,000 per hour # with 'logresolve'. # -# I haven't yet seen any noticable reduction in the percentage of IPs +# I haven't yet seen any noticeable reduction in the percentage of IPs # that fail to get resolved. Your mileage will no doubt vary. 5s is long # enough to wait IMO. # @@ -207,7 +207,7 @@ sub nslookup { # do the hostname lookup inside an eval. The eval will use the # already configured SIGnal handler and drop out of the {} block - # regardless of whether the alarm occured or not. + # regardless of whether the alarm occurred or not. eval { alarm($TIMEOUT); $hostname = gethostbyaddr(gethostbyname($ip), AF_INET); diff --git a/test/make_sni.sh b/test/make_sni.sh index e76d2da702..b8b651df46 100644 --- a/test/make_sni.sh +++ b/test/make_sni.sh @@ -82,7 +82,7 @@ do done if [ $# = 1 ]; then - echo "Aborted - just specifing one vhost makes no sense for SNI testing. Go wild !" + echo "Aborted - just specifying one vhost makes no sense for SNI testing. Go wild !" exit 1 fi |