www/apache
www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-04-18 22:24:07 +03:00
Code

Fix spelling errors found by codespell. [skip ci]

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1873985 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mike Rumph 2020-02-13 18:15:57 +00:00
parent b6dd2f55dc
commit 85760859ca
101 changed files with 168 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ABOUT_APACHE
View File

@ -69,7 +69,7 @@ is today more widely used than all other web servers combined.
============================================================================
The current project management committe of the Apache HTTP Server
The current project management committee of the Apache HTTP Server
project (as of March, 2011) is:
Aaron Bannert André Malo Astrid Stolper

2
CHANGES
View File

@ -41,7 +41,7 @@ Changes with Apache 2.5.1
*) mod_http2: Fixed interaction with mod_reqtimeout. A loaded mod_http2 was disabling the
ssl handshake timeouts. Also, fixed a mistake of the last version that made `H2Direct`
always `on`, irregardless of configuration. Found and reported by
always `on`, regardless of configuration. Found and reported by
<Armin.Abfalterer@united-security-providers.ch> and
<Marcial.Rion@united-security-providers.ch>. [Stefan Eissing]

2
ROADMAP
View File

@ -116,7 +116,7 @@ MAKING APACHE REPOSITORY-AGNOSTIC
* The translate_name hook goes away
Wrowe altogether disagrees. translate_name today even operates
on URIs ... this mechansim needs to be preserved.
on URIs ... this mechanism needs to be preserved.
* The doc for map_to_storage is totally opaque to me. It has
something to do with filesystems, but it also talks about

4
STATUS
View File

@ -314,7 +314,7 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
and in-your-face.) DocumentRoot unset would be accepted [and would
not permit content to be served, only virtual resources such as
server-info or server-status.
This proposed change would _not_ depricate Alias.
This proposed change would _not_ deprecate Alias.
striker: See the thread starting with Message-ID:
JLEGKKNELMHCJPNMOKHOGEEJFBAA.striker@apache.org.
@ -448,7 +448,7 @@ WISH LIST
HTTP or SNMP?
jerenkrantz says: Yawn. Who cares.
* Regex containers don't work in an intutive way
* Regex containers don't work in an intuitive way
Status: No one has come up with an efficient way to fix this
behavior. Dean has suggested getting rid of regex containers
completely.

6
VERSIONING
View File

@ -31,7 +31,7 @@ STABLE RELEASES, 2.{even}.{revision}
All even numbered releases will be considered stable revisions.
Stable revisions will retain forward compatiblity to the maximum
Stable revisions will retain forward compatibility to the maximum
possible extent. Features may be added during minor revisions, and
features may be deprecated by making appropriate notations in the
documentation, but no features may be removed.
@ -96,12 +96,12 @@ the current stable release. Work proceeds on development releases, permitting
the modification of the MMN at any time in order to correct deficiencies
or shortcomings in the API. This means that modules from one development
release to another may not be binary compatible, or may not successfully
compile without modification to accomodate the API changes.
compile without modification to accommodate the API changes.
The only 'supported' development release at any time will be the most
recently released version. Developers will not be answering bug reports
of older development releases once a new release is available. It becomes
the resposibility of the reporter to use the latest development version
the responsibility of the reporter to use the latest development version
to confirm that any issue still exists.
Any new code, new API features or new ('experimental') modules may be

4
include/ap_expr.h
View File

@ -57,7 +57,7 @@ typedef struct {
* operators)
*/
#define AP_EXPR_FLAG_SSL_EXPR_COMPAT 1
/** Don't add siginificant request headers to the Vary response header */
/** Don't add significant request headers to the Vary response header */
#define AP_EXPR_FLAG_DONT_VARY 2
/** Don't allow functions/vars that bypass the current request's access
* restrictions or would otherwise leak confidential information.
@ -294,7 +294,7 @@ typedef struct {
/** Function for looking up the provider function for a variable, operator
* or function in an expression.
* @param parms The parameter struct, also determins where the result is
* @param parms The parameter struct, also determines where the result is
* stored.
* @return OK on success,
* !OK on failure,

2
include/apreq_cookie.h
View File

@ -155,7 +155,7 @@ void apreq_cookie_tainted_off(apreq_cookie_t *c) {
* @param header the header value
*
* @return APR_SUCCESS.
* @return ::APREQ_ERROR_BADSEQ if an unparseable character sequence appears.
* @return ::APREQ_ERROR_BADSEQ if an unparsable character sequence appears.
* @return ::APREQ_ERROR_MISMATCH if an rfc-cookie attribute appears in a
* netscape cookie header.
* @return ::APR_ENOTIMPL if an unrecognized rfc-cookie attribute appears.

6
include/http_config.h
View File

@ -797,7 +797,7 @@ AP_DECLARE(void) ap_remove_module(module *m);
AP_DECLARE(const char *) ap_add_loaded_module(module *mod, apr_pool_t *p,
const char *s);
/**
* Remove a module fromthe chained modules list and the list of loaded modules
* Remove a module from the chained modules list and the list of loaded modules
* @param mod the module structure of the module to remove
*/
AP_DECLARE(void) ap_remove_loaded_module(module *mod);
@ -918,7 +918,7 @@ AP_DECLARE(const char *) ap_build_cont_config(apr_pool_t *p,
* @param conf_pool The pconf pool
* @param temp_pool The temporary pool
* @param conftree Place to store the root node of the config tree
* @return Error string on erro, NULL otherwise
* @return Error string on error, NULL otherwise
* @note If conf_pool == temp_pool, ap_build_config() will assume .htaccess
* context and use a lower maximum line length.
*/
@ -1080,7 +1080,7 @@ AP_DECLARE(void) ap_run_rewrite_args(process_rec *process);
/**
* Run the register hooks function for a specified module
* @param m The module to run the register hooks function fo
* @param m The module to run the register hooks function from
* @param p The pool valid for the lifetime of the module
*/
AP_DECLARE(void) ap_register_hooks(module *m, apr_pool_t *p);

2
include/http_protocol.h
View File

@ -809,7 +809,7 @@ AP_DECLARE_HOOK(int,protocol_propose,(conn_rec *c, request_rec *r,
* @param c The current connection
* @param r The current request or NULL
* @param s The server/virtual host selected
* @param protocol The protocol identifier we try to swicth to
* @param protocol The protocol identifier we try to switch to
* @return OK or DECLINED
*/
AP_DECLARE_HOOK(int,protocol_switch,(conn_rec *c, request_rec *r,

8
include/http_request.h
View File

@ -345,14 +345,14 @@ void ap_process_async_request(request_rec *r);
/**
* Kill the current request
* @param type Why the request is dieing
* @param type Why the request is dying
* @param r The current request
*/
AP_DECLARE(void) ap_die(int type, request_rec *r);
/**
* Check whether a connection is still established and has data available,
* optionnaly consuming blank lines ([CR]LF).
* optionally consuming blank lines ([CR]LF).
* @param c The current connection
* @param bb The brigade to filter
* @param max_blank_lines Max number of blank lines to consume, or zero
@ -458,7 +458,7 @@ AP_DECLARE_HOOK(int,access_checker,(request_rec *r))
* If "Satisfy any" is in effect, this hook may be skipped.
*
* @param r the current request
* @return OK (allow acces), DECLINED (let later modules decide),
* @return OK (allow access), DECLINED (let later modules decide),
* or HTTP_... (deny access)
* @ingroup hooks
* @see ap_hook_check_access_ex
@ -565,7 +565,7 @@ AP_DECLARE_HOOK(void,insert_filter,(request_rec *r))
* This hook allows modules to affect the request immediately after the
* per-directory configuration for the request has been generated.
* @param r The current request
* @return OK (allow acces), DECLINED (let later modules decide),
* @return OK (allow access), DECLINED (let later modules decide),
* or HTTP_... (deny access)
* @ingroup hooks
*/

10
include/httpd.h
View File

@ -313,7 +313,7 @@ extern "C" {
#define AP_MAX_REG_MATCH 10
/**
* APR_HAS_LARGE_FILES introduces the problem of spliting sendfile into
* APR_HAS_LARGE_FILES introduces the problem of splitting sendfile into
* 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.
@ -682,9 +682,9 @@ struct ap_method_list_t {
#if !APR_CHARSET_EBCDIC
/** linefeed */
#define LF 10
/** carrige return */
/** carriage return */
#define CR 13
/** carrige return /Line Feed Combo */
/** carriage return /Line Feed Combo */
#define CRLF "\015\012"
#else /* APR_CHARSET_EBCDIC */
/* For platforms using the EBCDIC charset, the transition ASCII->EBCDIC is done
@ -735,7 +735,7 @@ struct ap_method_list_t {
/*
* Things which may vary per file-lookup WITHIN a request ---
* e.g., state of MIME config. Basically, the name of an object, info
* about the object, and any other info we may ahve which may need to
* about the object, and any other info we may have which may need to
* change as we go poking around looking for it (e.g., overridden by
* .htaccess files).
*
@ -2022,7 +2022,7 @@ AP_DECLARE(char *) ap_pbase64decode(apr_pool_t *p, const char *bufcoded);
* Unlike ap_pbase64decode(), this function allows encoded NULLs in the input to
* be retained by the caller, by inspecting the len argument after the call
* instead of using strlen(). A NULL terminator is still appended to the buffer
* to faciliate string use (it is not included in len).
* to facilitate string use (it is not included in len).
*
* @param p The pool to allocate from
* @param encoded The encoded string

2
include/mod_auth.h
View File

@ -124,7 +124,7 @@ typedef struct {
} authz_provider;
/* ap_authn_cache_store: Optional function for authn providers
* to enable cacheing their lookups with mod_authn_cache
* to enable caching their lookups with mod_authn_cache
* @param r The request rec
* @param module Module identifier
* @param user User name to authenticate

4
include/scoreboard.h
View File

@ -66,7 +66,7 @@ extern "C" {
#define SERVER_IDLE_KILL 10 /* Server is cleaning up idle children. */
#define SERVER_NUM_STATUS 11 /* number of status settings */
/* Type used for generation indicies. Startup and every restart cause a
/* Type used for generation indices. Startup and every restart cause a
* new generation of children to be spawned. Children within the same
* generation share the same configuration information -- pointers to stuff
* created at config time in the parent are valid across children. However,
@ -152,7 +152,7 @@ struct process_score {
/* Scoreboard is now in 'local' memory, since it isn't updated once created,
* even in forked architectures. Child created-processes (non-fork) will
* set up these indicies into the (possibly relocated) shmem records.
* set up these indices into the (possibly relocated) shmem records.
*/
typedef struct {
global_score *global;

2
include/util_fcgi.h
View File

@ -16,7 +16,7 @@
/**
* @file util_fcgi.h
* @brief FastCGI protocol defitions and support routines
* @brief FastCGI protocol definitions and support routines
*
* @defgroup APACHE_CORE_FASTCGI FastCGI Tools
* @ingroup APACHE_CORE

2
include/util_ldap.h
View File

@ -135,7 +135,7 @@ typedef struct util_ldap_connection_t {
apr_pool_t *rebind_pool; /* frequently cleared pool for rebind data */
int must_rebind; /* The connection was last bound with other then binddn/bindpw */
request_rec *r; /* request_rec used to find this util_ldap_connection_t */
apr_time_t last_backend_conn; /* the approximate time of the last backend LDAP requst */
apr_time_t last_backend_conn; /* the approximate time of the last backend LDAP request */
} util_ldap_connection_t;
typedef struct util_ldap_config_t {

2
modules/aaa/mod_authn_socache.c
View File

@ -298,7 +298,7 @@ static void ap_authn_cache_store(request_rec *r, const char *module,
const char *key;
apr_time_t expiry;
/* first check whether we're cacheing for this module */
/* first check whether we're caching for this module */
dcfg = ap_get_module_config(r->per_dir_config, &authn_socache_module);
if (!configured || !dcfg->providers) {
return;

4
modules/arch/win32/mod_isapi.c
View File

@ -178,7 +178,7 @@ static const command_rec isapi_cmds[] = {
" on or off (default: off)"),
AP_INIT_FLAG("ISAPIAppendLogToQuery", ap_set_flag_slot,
(void *)APR_OFFSETOF(isapi_dir_conf, log_to_query),
OR_FILEINFO, "Append Log requests are concatinated to the query args"
OR_FILEINFO, "Append Log requests are concatenated to the query args"
" on or off (default: on)"),
AP_INIT_FLAG("ISAPIFakeAsync", ap_set_flag_slot,
(void *)APR_OFFSETOF(isapi_dir_conf, fake_async),
@ -257,7 +257,7 @@ static apr_status_t isapi_load(apr_pool_t *p, server_rec *s, isapi_loaded *isa)
isa->isapi_version = apr_pcalloc(p, sizeof(HSE_VERSION_INFO));
/* TODO: These aught to become overrideable, so that we
/* TODO: These aught to become overridable, so that we
* assure a given isapi can be fooled into behaving well.
*
* The tricky bit, they aren't really a per-dir sort of

2
modules/arch/win32/mod_isapi.h
View File

@ -183,7 +183,7 @@ typedef struct HSE_URL_MAPEX_INFO {
#define HSE_REQ_SEND_RESPONSE_HEADER 3
#define HSE_REQ_DONE_WITH_SESSION 4
/* MS Extented methods to ISAPI ServerSupportFunction() HSE_code */
/* MS Extended methods to ISAPI ServerSupportFunction() HSE_code */
#define HSE_REQ_MAP_URL_TO_PATH 1001 /* Emulated */
#define HSE_REQ_GET_SSPI_INFO 1002 /* Not Supported */
#define HSE_APPEND_LOG_PARAMETER 1003 /* Supported */

4
modules/cache/mod_cache.c vendored
View File

@ -986,7 +986,7 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
/* 304 does not contain Content-Type and mod_mime regenerates the
* Content-Type based on the r->filename. This would lead to original
* Content-Type to be lost (overwriten by whatever mod_mime generates).
* Content-Type to be lost (overwritten by whatever mod_mime generates).
* We preserves the original Content-Type here. */
ap_set_content_type(r, apr_table_get(
cache->stale_handle->resp_hdrs, "Content-Type"));
@ -2529,7 +2529,7 @@ static const command_rec cache_cmds[] =
{
/* XXX
* Consider a new config directive that enables loading specific cache
* implememtations (like mod_cache_mem, mod_cache_file, etc.).
* implementations (like mod_cache_mem, mod_cache_file, etc.).
* Rather than using a LoadModule directive, admin would use something
* like CacheModule mem_cache_module | file_cache_module, etc,
* which would cause the approprpriate cache module to be loaded.

4
modules/cache/mod_cache_disk.c vendored
View File

@ -284,11 +284,11 @@ static const char* regen_key(apr_pool_t *p, apr_table_t *headers,
* HTTP URI's (3.2.3) [host and scheme are insensitive]
* HTTP method (5.1.1)
* HTTP-date values (3.3.1)
* 3.7 Media Types [exerpt]
* 3.7 Media Types [excerpt]
* The type, subtype, and parameter attribute names are case-
* insensitive. Parameter values might or might not be case-sensitive,
* depending on the semantics of the parameter name.
* 4.20 Except [exerpt]
* 4.20 Except [excerpt]
* Comparison of expectation values is case-insensitive for unquoted
* tokens (including the 100-continue token), and is case-sensitive for
* quoted-string expectation-extensions.

4
modules/cache/mod_cache_socache.c vendored
View File

@ -298,11 +298,11 @@ static const char* regen_key(apr_pool_t *p, apr_table_t *headers,
* HTTP URI's (3.2.3) [host and scheme are insensitive]
* HTTP method (5.1.1)
* HTTP-date values (3.3.1)
* 3.7 Media Types [exerpt]
* 3.7 Media Types [excerpt]
* The type, subtype, and parameter attribute names are case-
* insensitive. Parameter values might or might not be case-sensitive,
* depending on the semantics of the parameter name.
* 4.20 Except [exerpt]
* 4.20 Except [excerpt]
* Comparison of expectation values is case-insensitive for unquoted
* tokens (including the 100-continue token), and is case-sensitive for
* quoted-string expectation-extensions.

2
modules/cache/mod_socache_dc.c vendored
View File

@ -69,7 +69,7 @@ static apr_status_t socache_dc_init(ap_socache_instance_t *ctx,
/* This mode of operation will open a temporary connection to the 'target'
* for each cache operation - this makes it safe against fork()
* automatically. This mode is preferred when running a local proxy (over
* unix domain sockets) because overhead is negligable and it reduces the
* unix domain sockets) because overhead is negligible and it reduces the
* performance/stability danger of file-descriptor bloatage. */
#define SESSION_CTX_FLAGS 0
#endif

4
modules/core/mod_watchdog.c
View File

@ -473,7 +473,7 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog,
int status = ap_run_watchdog_need(s, w->name, 1,
w->singleton);
if (status == OK) {
/* One of the modules returned OK to this watchog.
/* One of the modules returned OK to this watchdog.
* Mark it as active
*/
w->active = 1;
@ -519,7 +519,7 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog,
int status = ap_run_watchdog_need(s, w->name, 0,
w->singleton);
if (status == OK) {
/* One of the modules returned OK to this watchog.
/* One of the modules returned OK to this watchdog.
* Mark it as active
*/
w->active = 1;

2
modules/dav/fs/lock.c
View File

@ -951,7 +951,7 @@ static dav_error * dav_fs_add_locknull_state(
/*
** dav_fs_remove_locknull_state: Given a request, check to see if r->filename
** is/was a lock-null resource. If so, return it to an existant state, i.e.
** is/was a lock-null resource. If so, return it to an existent state, i.e.
** remove it from the list in the appropriate .DAV/locknull file.
*/
static dav_error * dav_fs_remove_locknull_state(

2
modules/dav/fs/repos.c
View File

@ -1663,7 +1663,7 @@ static dav_error * dav_fs_walker(dav_fs_walker_context *fsctx, int depth)
/* put a slash back on the end of the directory */
fsctx->path1.buf[fsctx->path1.cur_len - 1] = '/';
/* these are all non-existant (files) */
/* these are all non-existent (files) */
fsctx->res1.exists = 0;
fsctx->res1.collection = 0;
memset(&fsctx->info1.finfo, 0, sizeof(fsctx->info1.finfo));

6
modules/dav/main/mod_dav.c
View File

@ -442,7 +442,7 @@ static const char *dav_xml_escape_uri(apr_pool_t *p, const char *uri)
}
/* Write a complete RESPONSE object out as a <DAV:repsonse> xml
/* Write a complete RESPONSE object out as a <DAV:response> xml
element. Data is sent into brigade BB, which is auto-flushed into
the output filter stack for request R. Use POOL for any temporary
allocations.
@ -3373,8 +3373,8 @@ static int dav_method_unlock(request_rec *r)
/* ### RFC 2518 s. 8.11: If this resource is locked by locktoken,
* _all_ resources locked by locktoken are released. It does not say
* resource has to be the root of an infinte lock. Thus, an UNLOCK
* on any part of an infinte lock will remove the lock on all resources.
* resource has to be the root of an infinite lock. Thus, an UNLOCK
* on any part of an infinite lock will remove the lock on all resources.
*
* For us, if r->filename represents an indirect lock (part of an infinity lock),
* we must actually perform an UNLOCK on the direct lock for this resource.

2
modules/filters/mod_proxy_html.c
View File

@ -729,7 +729,7 @@ static meta *metafix(request_rec *r, const char *buf, apr_size_t len)
if ((*p == '\'') || (*p == '"')) {
delim = *p++;
for (q = p; *q && *q != delim; ++q);
/* No terminating delimiter found? Skip the boggus directive */
/* No terminating delimiter found? Skip the bogus directive */
if (*q != delim)
break;
} else {

4
modules/filters/mod_reqtimeout.c
View File

@ -313,7 +313,7 @@ static apr_status_t reqtimeout_filter(ap_filter_t *f,
rv = ap_get_brigade(f->next, bb, mode, block, readbytes);
/* Don't extend the timeout in speculative mode, wait for
* the real (relevant) bytes to be asked later, within the
* currently alloted time.
* currently allotted time.
*/
if (ccfg->cur_stage.rate_factor && rv == APR_SUCCESS
&& mode != AP_MODE_SPECULATIVE) {
@ -627,7 +627,7 @@ static void reqtimeout_hooks(apr_pool_t *pool)
* This ensures that it only influences normal http connections and not
* e.g. mod_ftp. We still process it first though, for the handshake stage
* to work with/before mod_ssl, but since it's disabled by default it won't
* influence non-HTTP modules unless configured explicitely. Also, if
* influence non-HTTP modules unless configured explicitly. Also, if
* mod_reqtimeout used the pre_connection hook, it would be inserted on
* mod_proxy's backend connections, and we don't want this.
*/

2
modules/filters/mod_substitute.c
View File

@ -354,7 +354,7 @@ static apr_status_t do_pattmatch(ap_filter_t *f, apr_bucket *inb,
}
else {
apr_size_t repl_len;
/* acount for string before the match */
/* account for string before the match */
if (space_left <= regm[0].rm_so)
return APR_ENOMEM;
space_left -= regm[0].rm_so;

2
modules/filters/mod_xml2enc.c
View File

@ -70,7 +70,7 @@ module AP_MODULE_DECLARE_DATA xml2enc_module;
(((enc)!=XML_CHAR_ENCODING_NONE)&&((enc)!=XML_CHAR_ENCODING_ERROR))
/*
* XXX: Check all those ap_assert()s ans replace those that should not happen
* XXX: Check all those ap_assert()s and replace those that should not happen
* XXX: with AP_DEBUG_ASSERT and those that may happen with proper error
* XXX: handling.
*/

2
modules/http/http_protocol.c
View File

@ -60,7 +60,7 @@
APLOG_USE_MODULE(http);
/* New Apache routine to map status codes into array indicies
/* New Apache routine to map status codes into array indices
* e.g. 100 -> 0, 101 -> 1, 200 -> 2 ...
* The number of status lines must equal the value of
* RESPONSE_CODES (httpd.h) and must be listed in order.

2
modules/http2/h2.h
View File

@ -138,7 +138,7 @@ struct h2_request {
apr_table_t *headers;
apr_time_t request_time;
unsigned int chunked : 1; /* iff requst body needs to be forwarded as chunked */
unsigned int chunked : 1; /* iff request body needs to be forwarded as chunked */
unsigned int serialize : 1; /* iff this request is written in HTTP/1.1 serialization */
apr_off_t raw_bytes; /* RAW network bytes that generated this request - if known. */
};

6
modules/http2/h2_conn.c
View File

@ -80,7 +80,7 @@ static void check_modules(int force)
mpm_type = H2_MPM_PREFORK;
mpm_module = m;
/* While http2 can work really well on prefork, it collides
* today's use case for prefork: runnning single-thread app engines
* today's use case for prefork: running single-thread app engines
* like php. If we restrict h2_workers to 1 per process, php will
* work fine, but browser will be limited to 1 active request at a
* time. */
@ -284,7 +284,7 @@ conn_rec *h2_slave_create(conn_rec *master, int slave_id, apr_pool_t *parent)
/* We create a pool with its own allocator to be used for
* processing a request. This is the only way to have the processing
* independant of its parent pool in the sense that it can work in
* independent of its parent pool in the sense that it can work in
* another thread. Also, the new allocator needs its own mutex to
* synchronize sub-pools.
*/
@ -378,7 +378,7 @@ apr_status_t h2_slave_run_pre_connection(conn_rec *slave, apr_socket_t *csd)
* reuse internal structures like memory pools.
* The wanted effect of this is that httpd does not try to clean up
* any dangling data on this connection when a request is done. Which
* is unneccessary on a h2 stream.
* is unnecessary on a h2 stream.
*/
slave->keepalive = AP_CONN_CLOSE;
return ap_run_pre_connection(slave, csd);

2
modules/http2/h2_mplx.c
View File

@ -166,7 +166,7 @@ h2_mplx *h2_mplx_create(conn_rec *c, server_rec *s, apr_pool_t *parent,
/* We create a pool with its own allocator to be used for
* processing slave connections. This is the only way to have the
* processing independant of its parent pool in the sense that it
* processing independent of its parent pool in the sense that it
* can work in another thread. Also, the new allocator needs its own
* mutex to synchronize sub-pools.
*/

2
modules/http2/h2_proxy_util.h
View File

@ -185,7 +185,7 @@ struct h2_proxy_request {
apr_time_t request_time;
unsigned int chunked : 1; /* iff requst body needs to be forwarded as chunked */
unsigned int chunked : 1; /* iff request body needs to be forwarded as chunked */
unsigned int serialize : 1; /* iff this request is written in HTTP/1.1 serialization */
};

2
modules/http2/h2_push.c
View File

@ -839,7 +839,7 @@ apr_status_t h2_push_diary_digest_get(h2_push_diary *diary, apr_pool_t *pool,
log2n = h2_log2(N);
/* Now log2p is the max number of relevant bits, so that
* log2p + log2n == mask_bits. We can uise a lower log2p
* log2p + log2n == mask_bits. We can use a lower log2p
* and have a shorter set encoding...
*/
log2pmax = h2_log2(ceil_power_of_2(maxP));

2
modules/http2/h2_request.c
View File

@ -156,7 +156,7 @@ apr_status_t h2_request_end_headers(h2_request *req, apr_pool_t *pool, int eos,
/* rfc7540, ch. 8.1.2.3:
* - if we have :authority, it overrides any Host header
* - :authority MUST be ommited when converting h1->h2, so we
* - :authority MUST be omitted when converting h1->h2, so we
* might get a stream without, but then Host needs to be there */
if (!req->authority) {
const char *host = apr_table_get(req->headers, "Host");

4
modules/http2/h2_session.c
View File

@ -385,7 +385,7 @@ static int on_frame_recv_cb(nghttp2_session *ng2s,
break;
case NGHTTP2_RST_STREAM:
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03067)
"h2_stream(%ld-%d): RST_STREAM by client, errror=%d",
"h2_stream(%ld-%d): RST_STREAM by client, error=%d",
session->id, (int)frame->hd.stream_id,
(int)frame->rst_stream.error_code);
stream = get_stream(session, frame->hd.stream_id);
@ -1415,7 +1415,7 @@ static apr_status_t on_stream_headers(h2_session *session, h2_stream *stream,
&& (headers->status < 400)
&& (headers->status != 304)
&& h2_session_push_enabled(session)) {
/* PUSH is possibe and enabled on server, unless the request
/* PUSH is possible and enabled on server, unless the request
* denies it, submit resources to push */
s = apr_table_get(headers->notes, H2_PUSH_MODE_NOTE);
if (!s || strcmp(s, "0")) {

2
modules/http2/h2_stream.c
View File

@ -446,7 +446,7 @@ apr_status_t h2_stream_recv_frame(h2_stream *stream, int ftype, int flags, size_
ap_assert(stream->request == NULL);
if (stream->rtmp == NULL) {
/* This can only happen, if the stream has received no header
* name/value pairs at all. The lastest nghttp2 version have become
* name/value pairs at all. The latest nghttp2 version have become
* pretty good at detecting this early. In any case, we have
* to abort the connection here, since this is clearly a protocol error */
return APR_EINVAL;

2
modules/http2/h2_stream.h
View File

@ -199,7 +199,7 @@ apr_status_t h2_stream_add_header(h2_stream *stream,
const char *name, size_t nlen,
const char *value, size_t vlen);
/* End the contruction of request headers */
/* End the construction of request headers */
apr_status_t h2_stream_end_headers(h2_stream *stream, int eos, size_t raw_bytes);

2
modules/http2/h2_task.h
View File

@ -35,7 +35,7 @@
*
* Finally, to keep certain connection level filters, such as ourselves and
* especially mod_ssl ones, from messing with our data, we need a filter
* of our own to disble those.
* of our own to disable those.
*/
struct h2_bucket_beam;

2
modules/http2/h2_util.c
View File

@ -1336,7 +1336,7 @@ apr_status_t h2_util_bb_avail(apr_bucket_brigade *bb,
return status;
}
else if (blen == 0) {
/* brigade without data, does it have an EOS bucket somwhere? */
/* brigade without data, does it have an EOS bucket somewhere? */
*plen = 0;
*peos = h2_util_has_eos(bb, -1);
}

2
modules/http2/h2_util.h
View File

@ -228,7 +228,7 @@ apr_status_t h2_fifo_try_pull(h2_fifo *fifo, void **pelem);
typedef enum {
H2_FIFO_OP_PULL, /* pull the element from the queue, ie discard it */
H2_FIFO_OP_REPUSH, /* pull and immediatley re-push it */
H2_FIFO_OP_REPUSH, /* pull and immediately re-push it */
} h2_fifo_op_t;
typedef h2_fifo_op_t h2_fifo_peek_fn(void *head, void *ctx);

2
modules/http2/mod_http2.h
View File

@ -35,7 +35,7 @@ APR_DECLARE_OPTIONAL_FN(int,
/* The following functions were introduced for the experimental mod_proxy_http2
* support, but have been abandoned since.
* They are still declared here for backward compatibiliy, in case someone
* They are still declared here for backward compatibility, in case someone
* tries to build an old mod_proxy_http2 against it, but will disappear
* completely sometime in the future.
*/

4
modules/ldap/util_ldap.c
View File

@ -293,7 +293,7 @@ static apr_status_t util_ldap_connection_remove (void *param)
apr_thread_mutex_unlock(st->mutex);
#endif
/* Destory the pool associated with this connection */
/* Destroy the pool associated with this connection */
apr_pool_destroy(ldc->pool);
@ -2918,7 +2918,7 @@ static void *util_ldap_merge_config(apr_pool_t *p, void *basev,
able to handle the connection timeout per-connection
but the Novell SDK cannot. Allowing the timeout to
be set by each vhost is of little value so rather than
trying to make special expections for one LDAP SDK, GLOBAL_ONLY
trying to make special exceptions for one LDAP SDK, GLOBAL_ONLY
is being enforced on this setting as well. */
st->connectionTimeout = base->connectionTimeout;
st->opTimeout = base->opTimeout;

2
modules/mappers/mod_rewrite.c
View File

@ -4156,7 +4156,7 @@ static int apply_rewrite_rule(rewriterule_entry *p, rewrite_ctx *ctx)
}
/* Additionally we strip the physical path from the url to match
* it independent from the underlaying filesystem.
* it independent from the underlying filesystem.
*/
if (!is_proxyreq && strlen(ctx->uri) >= dirlen &&
!strncmp(ctx->uri, ctx->perdir, dirlen)) {

4
modules/md/md_acme_authz.c
View File

@ -588,8 +588,8 @@ apr_status_t md_acme_authz_respond(md_acme_authz_t *authz, md_acme_t *acme, md_s
* - 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;

2
modules/md/md_acme_order.c
View File

@ -513,7 +513,7 @@ static apr_status_t check_challenges(void *baton, int attempt)
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);
}

2
modules/md/md_acmev1_drive.c
View File

@ -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)
{

2
modules/md/md_crypt.h
View File

@ -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);

12
modules/md/md_http.h
View File

@ -86,7 +86,7 @@ apr_status_t md_http_create(md_http_t **phttp, apr_pool_t *p, const char *user_a
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_request_t *req, md_http_status_cb *cb, voi
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_request_t **preq, md_http_t *http, const
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_request_t **preq, md_http_t *http, cons
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_request_t **preq, md_http_t *http, cons
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_http_request_t **preq, void *baton,
* 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);

4
modules/md/md_reg.c
View File

@ -670,7 +670,7 @@ int md_reg_should_warn(md_reg_t *reg, const md_t *md, apr_pool_t *p)
}
/**************************************************************************************************/
/* 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
*/

6
modules/md/md_reg.h
View File

@ -145,7 +145,7 @@ apr_status_t md_reg_delete_acct(md_reg_t *reg, apr_pool_t *p, const char *acct_i
* 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(md_reg_t *reg, apr_pool_t *p, apr_pool_t
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.

4
modules/md/md_status.h
View File

@ -40,7 +40,7 @@ apr_status_t md_status_get_json(struct md_json_t **pjson, apr_array_header_t *md
/**
* 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, const char *type,
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);

2
modules/md/md_util.h
View File

@ -90,7 +90,7 @@ struct apr_array_header_t *md_array_str_compact(apr_pool_t *p, struct apr_array_
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);

8
modules/md/mod_md.c
View File

@ -854,7 +854,7 @@ static apr_status_t md_post_config_before_ssl(apr_pool_t *p, apr_pool_t *plog,
/* 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.
@ -863,7 +863,7 @@ static apr_status_t md_post_config_before_ssl(apr_pool_t *p, apr_pool_t *plog,
* 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.
@ -880,7 +880,7 @@ static apr_status_t md_post_config_before_ssl(apr_pool_t *p, apr_pool_t *plog,
/*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*/
@ -923,7 +923,7 @@ static apr_status_t md_post_config_after_ssl(apr_pool_t *p, apr_pool_t *plog,
}
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;
}
}

2
modules/metadata/mod_mime_magic.c
View File

@ -2176,7 +2176,7 @@ static int uncompress(request_rec *r, int method,
parm.method = method;
/* We make a sub_pool so that we can collect our child early, otherwise
* there are cases (i.e. generating directory indicies with mod_autoindex)
* there are cases (i.e. generating directory indices with mod_autoindex)
* where we would end up with LOTS of zombies.
*/
if (apr_pool_create(&sub_context, r->pool) != APR_SUCCESS)

2
modules/metadata/mod_unique_id.c
View File

@ -104,7 +104,7 @@ typedef struct {
/*
* Sun Jun 7 05:43:49 CEST 1998 -- Alvaro
* More comments:
* 1) The UUencoding prodecure is now done in a general way, avoiding the problems
* 1) The UUencoding procedure is now done in a general way, avoiding the problems
* with sizes and paddings that can arise depending on the architecture. Now the
* offsets and sizes of the elements of the unique_id_rec structure are calculated
* in unique_id_global_init; and then used to duplicate the structure without the

4
modules/proxy/mod_proxy.c
View File

@ -151,7 +151,7 @@ static const char *set_worker_param(apr_pool_t *p,
return "Max must be a positive number";
worker->s->hmax = ival;
}
/* XXX: More inteligent naming needed */
/* XXX: More intelligent naming needed */
else if (!strcasecmp(key, "smax")) {
/* Maximum number of connections to remote that
* will not be destroyed
@ -3073,7 +3073,7 @@ static int proxy_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
APR_OPTIONAL_HOOK(ap, status_hook, proxy_status_hook, NULL, NULL,
APR_HOOK_MIDDLE);
/* Reset workers count on gracefull restart */
/* Reset workers count on graceful restart */
proxy_lb_workers = 0;
set_worker_hc_param_f = APR_RETRIEVE_OPTIONAL_FN(set_worker_hc_param);
return OK;

2
modules/proxy/mod_proxy.h
View File

@ -687,7 +687,7 @@ PROXY_DECLARE(int) ap_proxyerror(request_rec *r, int statuscode, const char *mes
* @param conf server configuration
* @param hostname hostname from request URI
* @param addr resolved address of hostname, or NULL if not known
* @return OK on success, or else an errro
* @return OK on success, or else an error
*/
PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *conf,
const char *hostname, apr_sockaddr_t *addr);

2
modules/proxy/mod_proxy_ajp.c
View File

@ -244,7 +244,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
return HTTP_INTERNAL_SERVER_ERROR;
}
/* read the first bloc of data */
/* read the first block of data */
input_brigade = apr_brigade_create(p, r->connection->bucket_alloc);
tenc = apr_table_get(r->headers_in, "Transfer-Encoding");
if (tenc && (ap_cstr_casecmp(tenc, "chunked") == 0)) {

6
modules/proxy/mod_proxy_balancer.c
View File

@ -380,7 +380,7 @@ static proxy_worker *find_best_worker(proxy_balancer *balancer,
/* XXX: This can perhaps be build using some
* smarter mechanism, like tread_cond.
* But since the statuses can came from
* different childs, use the provided algo.
* different children, use the provided algo.
*/
apr_interval_time_t timeout = balancer->s->timeout;
apr_interval_time_t step, tval = 0;
@ -795,7 +795,7 @@ static apr_status_t lock_remove(void *data)
/*
* First try to compute an unique ID for each vhost with minimal criteria,
* that is the first Host/IP:port and ServerName. For most cases this should
* be enough and avoids changing the ID unnecessarily accross restart (or
* be enough and avoids changing the ID unnecessarily across restart (or
* stop/start w.r.t. persisted files) for things that this module does not
* care about.
*
@ -1105,7 +1105,7 @@ static void push2table(const char *input, apr_table_t *params,
}
/*
* Process the paramters and add or update the worker of the balancer
* Process the parameters and add or update the worker of the balancer
*/
static int balancer_process_balancer_worker(request_rec *r, proxy_server_conf *conf,
proxy_balancer *bsel,

2
modules/proxy/mod_proxy_connect.c
View File

@ -39,7 +39,7 @@ module AP_MODULE_DECLARE_DATA proxy_connect_module;
* that may be okay, since the data is supposed to
* be transparent. In fact, this doesn't log at all
* yet. 8^)
* FIXME: doesn't check any headers initally sent from the
* FIXME: doesn't check any headers initially sent from the
* client.
* FIXME: should allow authentication, but hopefully the
* generic proxy authentication is good enough.

2
modules/proxy/mod_proxy_ftp.c
View File

@ -929,7 +929,7 @@ static char *ftp_get_PWD(request_rec *r, conn_rec *ftp_ctrl, apr_bucket_brigade
* with username and password (which was presumably queried from the user)
* supplied in the Authorization: header.
* Note that we "invent" a realm name which consists of the
* ftp://user@host part of the reqest (sans password -if supplied but invalid-)
* ftp://user@host part of the request (sans password -if supplied but invalid-)
*/
static int ftp_unauthorized(request_rec *r, int log_it)
{

6
modules/proxy/mod_proxy_http.c
View File

@ -599,7 +599,7 @@ static int ap_proxy_http_prefetch(proxy_http_req_t *req,
* Because the new logic looks at input_brigade, we will self-terminate
* input_brigade and jump past all of the request body logic...
* Reading anything with ap_get_brigade is likely to consume the
* main request's body or read beyond EOS - which would be unplesant.
* main request's body or read beyond EOS - which would be unpleasant.
*
* An exception: when a kept_body is present, then subrequest CAN use
* pass request bodies, and we DONT skip the body.
@ -742,7 +742,7 @@ static int ap_proxy_http_prefetch(proxy_http_req_t *req,
* To reduce server resource use, setenv proxy-sendchunked
*
* Then address specific servers with conditional setenv
* options to restore the default behavior where desireable.
* options to restore the default behavior where desirable.
*
* We have to compute content length by reading the entire request
* body; if request body is not small, we'll spool the remaining
@ -1359,7 +1359,7 @@ int ap_proxy_http_process_response(proxy_http_req_t *req)
/* read the headers. */
/* N.B. for HTTP/1.0 clients, we have to fold line-wrapped headers*/
/* Also, take care with headers with multiple occurences. */
/* Also, take care with headers with multiple occurrences. */
/* First, tuck away all already existing cookies */
save_table = apr_table_make(r->pool, 2);

4
modules/proxy/mod_serf.c
View File

@ -399,7 +399,7 @@ static apr_status_t setup_request(serf_request_t *request,
return APR_SUCCESS;
}
/* TOOD: rewrite drive_serf to make it async */
/* TODO: rewrite drive_serf to make it async */
static int drive_serf(request_rec *r, serf_config_t *conf)
{
apr_status_t rv = 0;
@ -469,7 +469,7 @@ static int drive_serf(request_rec *r, serf_config_t *conf)
return HTTP_INTERNAL_SERVER_ERROR;
}
/* TOOD: restructure try all servers in the array !! */
/* TODO: restructure try all servers in the array !! */
pick = ap_random_pick(0, servers->nelts-1);
choice = APR_ARRAY_IDX(servers, pick, ap_serf_server_t *);

2
modules/proxy/mod_serf.h
View File

@ -41,7 +41,7 @@
#define AP_SERF_CLUSTER_PROVIDER "serf_cluster"
typedef struct ap_serf_server_t ap_serf_server_t;
struct ap_serf_server_t {
/* TOOD: consider using apr_sockaddr_t, except they suck. */
/* TODO: consider using apr_sockaddr_t, except they suck. */
const char *ip;
apr_port_t port;
};

2
modules/proxy/proxy_util.c
View File

@ -2927,7 +2927,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_check_connection(const char *scheme,
/* Filter chain is OK and empty, yet we can't determine from
* ap_check_pipeline (actually ap_core_input_filter) whether
* an empty non-blocking read is EAGAIN or EOF on the socket
* side (it's always SUCCESS), so check it explicitely here.
* side (it's always SUCCESS), so check it explicitly here.
*/
if (ap_proxy_is_socket_connected(conn->sock)) {
rv = APR_SUCCESS;

2
modules/session/mod_session.c
View File

@ -128,7 +128,7 @@ static apr_status_t ap_session_load(request_rec * r, session_rec ** z)
now = apr_time_now();
if (zz) {
/* load the session attibutes */
/* load the session attributes */
rv = ap_run_session_decode(r, zz);
/* having a session we cannot decode is just as good as having

2
modules/slotmem/mod_slotmem_shm.c
View File

@ -56,7 +56,7 @@ struct ap_slotmem_instance_t {
};
/*
* Layout for SHM and persited file :
* Layout for SHM and persisted file :
*
* +-------------------------------------------------------------+~>
* | desc | num_free | base (slots) | inuse (array) | md5 | desc | compat..

2
modules/ssl/mod_ssl_ct.c
View File

@ -681,7 +681,7 @@ static apr_status_t update_log_list_for_cert(server_rec *s, apr_pool_t *p,
rv = apr_uri_parse(p, elts[i], &uri);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
APLOGNO(02697) "unparseable log URL %s in file "
APLOGNO(02697) "unparsable log URL %s in file "
"%s - ignoring",
elts[i], listfile);
/* some garbage in the file? can't map to an auto-maintained SCT,

4
modules/ssl/ssl_engine_io.c
View File

@ -1005,7 +1005,7 @@ static apr_status_t ssl_filter_write(ap_filter_t *f,
alloc)
/* Custom apr_status_t error code, used when a plain HTTP request is
* recevied on an SSL port. */
* received on an SSL port. */
#define MODSSL_ERROR_HTTP_ON_HTTPS (APR_OS_START_USERERR + 0)
/* Custom apr_status_t error code, used when the proxy cannot
@ -2038,7 +2038,7 @@ static apr_status_t ssl_io_filter_buffer(ap_filter_t *f,
}
if (APR_BRIGADE_EMPTY(ctx->bb)) {
/* Suprisingly (and perhaps, wrongly), the request body can be
/* Surprisingly (and perhaps, wrongly), the request body can be
* pulled from the input filter stack more than once; a
* handler may read it, and ap_discard_request_body() will
* attempt to do so again after *every* request. So input

4
modules/ssl/ssl_util_ssl.c
View File

@ -124,7 +124,7 @@ int modssl_smart_shutdown(SSL *ssl)
/*
* Repeat the calls, because SSL_shutdown internally dispatches through a
* little state machine. Usually only one or two interation should be
* little state machine. Usually only one or two iterations should be
* needed, so we restrict the total number of restrictions in order to
* avoid process hangs in case the client played bad with the socket
* connection and OpenSSL cannot recognize it.
@ -134,7 +134,7 @@ int modssl_smart_shutdown(SSL *ssl)
for (i = 0; i < 4 /* max 2x pending + 2x data = 4 */; i++) {
rc = SSL_shutdown(ssl);
if (rc >= 0 && flush && (SSL_get_shutdown(ssl) & SSL_SENT_SHUTDOWN)) {
/* Once the close notity is sent through the output filters,
/* Once the close notify is sent through the output filters,
* ensure it is flushed through the socket.
*/
if (BIO_flush(SSL_get_wbio(ssl)) <= 0) {

4
modules/ssl/ssl_util_stapling.c
View File

@ -54,7 +54,7 @@ static int stapling_cache_mutex_off(server_rec *s);
static int stapling_cb(SSL *ssl, void *arg);
/**
* Maxiumum OCSP stapling response size. This should be the response for a
* Maximum OCSP stapling response size. This should be the response for a
* single certificate and will typically include the responder certificate chain
* so 10K should be more than enough.
*
@ -802,7 +802,7 @@ static int stapling_cb(SSL *ssl, void *arg)
}
if (ssl_run_get_stapling_status(&rspder, &rspderlen, conn, s, x) == APR_SUCCESS) {
/* a hook handles stapling for this certicate and determines the response */
/* a hook handles stapling for this certificate and determines the response */
if (rspder == NULL || rspderlen <= 0) {
return SSL_TLSEXT_ERR_NOACK;
}

2
modules/test/mod_dialup.c
View File

@ -285,7 +285,7 @@ cmd_modem_standard(cmd_parms *cmd,
}
if (dcfg->bytes_per_second == 0) {
return "mod_diaulup: Unkonwn Modem Standard specified.";
return "mod_diaulup: Unknown Modem Standard specified.";
}
return NULL;

2
server/core.c
View File

@ -802,7 +802,7 @@ AP_DECLARE(int) ap_allow_overrides(request_rec *r)
/*
* Optional function coming from mod_authn_core, used for
* retrieving the type of autorization
* retrieving the type of authorization
*/
static APR_OPTIONAL_FN_TYPE(authn_ap_auth_type) *authn_ap_auth_type;

2
server/gen_test_char.c
View File

@ -123,7 +123,7 @@ int main(int argc, char *argv[])
/* Stop for any non-'token' character, including ctrls, obs-text,
* and "tspecials" (RFC2068) a.k.a. "separators" (RFC2616), which
* is easer to express as characters remaining in the ASCII token set
* is easier to express as characters remaining in the ASCII token set
*/
if (!c || !(apr_isalnum(c) || strchr("!#$%&'*+-.^_`|~", c))) {
flags |= T_HTTP_TOKEN_STOP;

6
server/listen.c
View File

@ -300,7 +300,7 @@ static int find_systemd_socket(process_rec * process, apr_port_t port)
if (sdc < 0) {
ap_log_perror(APLOG_MARK, APLOG_CRIT, sdc, process->pool, APLOGNO(02486)
"find_systemd_socket: Error parsing enviroment, sd_listen_fds returned %d",
"find_systemd_socket: Error parsing environment, sd_listen_fds returned %d",
sdc);
return -1;
}
@ -774,7 +774,7 @@ AP_DECLARE(int) ap_setup_listeners(server_rec *s)
if (use_systemd) {
const char *userdata_key = "ap_open_systemd_listeners";
void *data;
/* clear the enviroment on our second run
/* clear the environment on our second run
* so that none of our future children get confused.
*/
apr_pool_userdata_get(&data, userdata_key, s->process->pool);
@ -981,7 +981,7 @@ AP_DECLARE(void) ap_listen_pre_config(void)
*
* *BSDs have SO_REUSEPORT too but with a different semantic: the first
* wildcard address bound socket or the last non-wildcard address bound
* socket will receive connections (no evenness garantee); the rest of
* socket will receive connections (no evenness guarantee); the rest of
* the sockets bound to the same port will not.
* This can't (always) work for httpd.
*

6
server/log.c
View File

@ -212,7 +212,7 @@ AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p,
/*
* You might ponder why stderr_pool should survive?
* The trouble is, stderr_pool may have s_main->error_log,
* so we aren't in a position to destory stderr_pool until
* so we aren't in a position to destroy stderr_pool until
* the next recycle. There's also an apparent bug which
* is not; if some folk decided to call this function before
* the core open error logs hook, this pool won't survive.
@ -239,7 +239,7 @@ static void log_child_errfn(apr_pool_t *pool, apr_status_t err,
}
/* Create a child process running PROGNAME with a pipe connected to
* the childs stdin. The write-end of the pipe will be placed in
* the child's stdin. The write-end of the pipe will be placed in
* *FPIN on successful return. If dummy_stderr is non-zero, the
* stderr for the child will be the same as the stdout of the parent.
* Otherwise the child will inherit the stderr from the parent. */
@ -1121,7 +1121,7 @@ static void log_error_core(const char *file, int line, int module_index,
if (!logf && !(errorlog_provider && errorlog_provider_handle)) {
/* There is no file to send the log message to (or it is
* redirected to /dev/null and therefore any formating done below
* redirected to /dev/null and therefore any formatting done below
* would be lost anyway) and there is no initialized log provider
* available, so we just return here.
*/

2
server/main.c
View File

@ -269,7 +269,7 @@ static void destroy_and_exit_process(process_rec *process,
* Sleep for TASK_SWITCH_SLEEP micro seconds to cause a task switch on
* OS layer and thus give possibly started piped loggers a chance to
* process their input. Otherwise it is possible that they get killed
* by us before they can do so. In this case maybe valueable log messages
* by us before they can do so. In this case maybe valuable log messages
* might get lost.
*/

8
server/mpm/event/event.c
View File

@ -1114,7 +1114,7 @@ read_request:
* completion at some point may require reads (e.g. SSL_ERROR_WANT_READ),
* an output filter can also set the sense to CONN_SENSE_WANT_READ at any
* time for event MPM to do the right thing,
* - suspend the connection (SUSPENDED) such that it now interracts with
* - suspend the connection (SUSPENDED) such that it now interacts with
* the MPM through suspend/resume_connection() hooks, and/or registered
* poll callbacks (PT_USER), and/or registered timed callbacks triggered
* by timer events.
@ -1858,7 +1858,7 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy)
#if HAVE_SERF
rc = serf_context_prerun(g_serf);
if (rc != APR_SUCCESS) {
/* TOOD: what should do here? ugh. */
/* TODO: what should we do here? ugh. */
}
#endif
@ -2466,7 +2466,7 @@ static void setup_threads_runtime(void)
* the connections they handle (i.e. ptrans). We can't use this thread's
* self pool because all these objects survive it, nor use pchild or pconf
* directly because this starter thread races with other modules' runtime,
* nor finally pchild (or subpool thereof) because it is killed explicitely
* nor finally pchild (or subpool thereof) because it is killed explicitly
* before pconf (thus connections/ptrans can live longer, which matters in
* ONE_PROCESS mode). So this leaves us with a subpool of pconf, created
* before any ptrans hence destroyed after.
@ -2771,7 +2771,7 @@ static void child_main(int child_num_arg, int child_bucket)
* from being received. The child processes no longer use signals for
* any communication with the parent process. Let's also do this before
* child_init() hooks are called and possibly create threads that
* otherwise could "steal" (implicitely) MPM's signals.
* otherwise could "steal" (implicitly) MPM's signals.
*/
rv = apr_setup_signal_thread();
if (rv != APR_SUCCESS) {

2
server/mpm/motorz/motorz.c
View File

@ -1008,7 +1008,7 @@ static int make_child(motorz_core_t *mz, server_rec *s, int slot)
apr_signal(SIGHUP, just_die);
apr_signal(SIGTERM, just_die);
/* Ignore SIGINT in child. This fixes race-condition in signals
* handling when httpd is runnning on foreground and user hits ctrl+c.
* handling when httpd is running on foreground and user hits ctrl+c.
* In this case, SIGINT is sent to all children followed by SIGTERM
* from the main process, which interrupts the SIGINT handler and
* leads to inconsistency.

2
server/mpm/mpmt_os2/mpmt_os2.c
View File

@ -26,7 +26,7 @@
*
* Each child process consists of a pool of worker threads and a
* main thread that accepts connections & passes them to the workers via
* a work queue. The worker thread pool is dynamic, managed by a maintanence
* a work queue. The worker thread pool is dynamic, managed by a maintenance
* thread so that the number of idle threads is kept between
* min_spare_threads & max_spare_threads.
*

4
server/mpm/prefork/prefork.c
View File

@ -709,8 +709,8 @@ static int make_child(server_rec *s, int slot)
*/
apr_signal(SIGHUP, just_die);
apr_signal(SIGTERM, just_die);
/* Ignore SIGINT in child. This fixes race-condition in signals
* handling when httpd is runnning on foreground and user hits ctrl+c.
/* Ignore SIGINT in child. This fixes race-conditions in signals
* handling when httpd is running on foreground and user hits ctrl+c.
* In this case, SIGINT is sent to all children followed by SIGTERM
* from the main process, which interrupts the SIGINT handler and
* leads to inconsistency.

2
server/mpm/simple/simple_io.c
View File

@ -290,7 +290,7 @@ apr_status_t simple_io_accept(simple_core_t * sc, simple_sb_t * sb)
apr_status_t simple_io_event_process(simple_core_t * sc, simple_sb_t * sb)
{
/* pqXXXXX: In theory, if we have non-blocking operations on the connection
* we can do them here, before pushing to another thread, thats just
* we can do them here, before pushing to another thread, that's just
* not implemented right now.
*/
return apr_thread_pool_push(sc->workers,

2
server/mpm/simple/simple_run.c
View File

@ -285,7 +285,7 @@ int simple_child_loop(simple_core_t * sc)
return rv;
}
/* XXXXX: Hack. Reseting parts of the simple core needs to be more
/* XXXXX: Hack. Resetting parts of the simple core needs to be more
* thought out than this.
*/
APR_RING_INIT(&sc->timer_ring, simple_timer_t, link);

10
server/mpm/winnt/mpm_winnt.c
View File

@ -436,7 +436,7 @@ static int send_handles_to_child(apr_pool_t *p,
* get_listeners_from_parent()
* The listen sockets are opened in the parent. This function, which runs
* exclusively in the child process, receives them from the parent and
* makes them availeble in the child.
* makes them available in the child.
*/
static void get_listeners_from_parent(server_rec *s)
{
@ -742,7 +742,7 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
* of this event means that the child process has exited prematurely
* due to a seg fault or other irrecoverable error. For server
* robustness, master_main will restart the child process under this
* condtion.
* condition.
*
* master_main uses the child_exit_event to signal the child process
* to exit.
@ -1129,7 +1129,7 @@ static void winnt_rewrite_args(process_rec *process)
"Failed to get the full path of %s", process->argv[0]);
exit(APEXIT_INIT);
}
/* WARNING: There is an implict assumption here that the
/* WARNING: There is an implicit assumption here that the
* executable resides in ServerRoot or ServerRoot\bin
*/
def_server_root = (char *) apr_filepath_name_get(binpath);
@ -1376,7 +1376,7 @@ static int winnt_pre_config(apr_pool_t *pconf_, apr_pool_t *plog, apr_pool_t *pt
ap_exists_config_define("DEBUG"))
one_process = -1;
/* XXX: presume proper privilages; one nice thing would be
/* XXX: presume proper privileges; one nice thing would be
* a loud emit if running as "LocalSystem"/"SYSTEM" to indicate
* they should change to a user with write access to logs/ alone.
*/
@ -1603,7 +1603,7 @@ static int winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pt
CleanNullACL((void *)sa);
/* Create the start mutex, as an unnamed object for security.
* Ths start mutex is used during a restart to prevent more than
* The start mutex is used during a restart to prevent more than
* one child process from entering the accept loop at once.
*/
rv = apr_proc_mutex_create(&start_mutex, NULL,

8
server/mpm/winnt/service.c
View File

@ -803,7 +803,7 @@ apr_status_t mpm_service_install(apr_pool_t *ptemp, int argc,
rv = apr_get_os_error();
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
APLOGNO(00369) "Failed to open the Windows service "
"manager, perhaps you forgot to log in as Adminstrator?");
"manager, perhaps you forgot to log in as Administrator?");
return (rv);
}
@ -959,7 +959,7 @@ apr_status_t mpm_service_uninstall(void)
rv = apr_get_os_error();
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
APLOGNO(10009) "Failed to open the Windows service "
"manager, perhaps you forgot to log in as Adminstrator?");
"manager, perhaps you forgot to log in as Administrator?");
return (rv);
}
@ -1049,7 +1049,7 @@ apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc,
rv = apr_get_os_error();
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
APLOGNO(10011) "Failed to open the Windows service "
"manager, perhaps you forgot to log in as Adminstrator?");
"manager, perhaps you forgot to log in as Administrator?");
return (rv);
}
@ -1159,7 +1159,7 @@ void mpm_signal_service(apr_pool_t *ptemp, int signal)
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP,
apr_get_os_error(), NULL,
APLOGNO(10013) "Failed to open the Windows service "
"manager, perhaps you forgot to log in as Adminstrator?");
"manager, perhaps you forgot to log in as Administrator?");
return;
}

4
server/mpm/worker/worker.c
View File

@ -867,7 +867,7 @@ static void setup_threads_runtime(void)
* the connections they handle (i.e. ptrans). We can't use this thread's
* self pool because all these objects survive it, nor use pchild or pconf
* directly because this starter thread races with other modules' runtime,
* nor finally pchild (or subpool thereof) because it is killed explicitely
* nor finally pchild (or subpool thereof) because it is killed explicitly
* before pconf (thus connections/ptrans can live longer, which matters in
* ONE_PROCESS mode). So this leaves us with a subpool of pconf, created
* before any ptrans hence destroyed after.
@ -1143,7 +1143,7 @@ static void child_main(int child_num_arg, int child_bucket)
* from being received. The child processes no longer use signals for
* any communication with the parent process. Let's also do this before
* child_init() hooks are called and possibly create threads that
* otherwise could "steal" (implicitely) MPM's signals.
* otherwise could "steal" (implicitly) MPM's signals.
*/
rv = apr_setup_signal_thread();
if (rv != APR_SUCCESS) {

2
server/mpm_unix.c
View File

@ -706,7 +706,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
}
else /* ... XXX other request types here? */ {
/* Create an HTTP request string. We include a User-Agent so
* that adminstrators can track down the cause of the
* that administrators can track down the cause of the
* odd-looking requests in their logs. A complete request is
* used since kernel-level filtering may require that much
* data before returning from accept(). */

2
server/protocol.c
View File

@ -2361,7 +2361,7 @@ static int protocol_cmp(const apr_array_header_t *preferences,
return (index2 >= 0) ? -1 : 1;
}
}
/* both have the same index (mabye -1 or no pref configured) and we compare
/* both have the same index (maybe -1 or no pref configured) and we compare
* the names so that spdy3 gets precedence over spdy2. That makes
* the outcome at least deterministic. */
return strcmp(proto1, proto2);

2
server/util_expr_eval.c
View File

@ -333,7 +333,7 @@ static const char *ap_expr_regexec(const char *subject,
}
do {
/* If previous match was empty, we can't issue the exact same one or
* we'd loop indefinitively. So let's instead ask for an anchored and
* we'd loop indefinitely. So let's instead ask for an anchored and
* non-empty match (i.e. something not empty at the start of the value)
* and if nothing is found advance by one character below.
*/

2
server/util_expr_scan.l
View File

@ -450,7 +450,7 @@ BACKREF (\$[0-9])
return T_OP_UNARY;
}
/* Apply subtitution to a string */
/* Apply substitution to a string */
<expr>"sub" {
return T_OP_SUB;
}

2
server/util_pcre.c
View File

@ -302,7 +302,7 @@ AP_DECLARE(int) ap_regexec_len(const ap_regex_t *preg, const char *buff,
#ifdef HAVE_PCRE2
/* TODO: create a generic TLS matchdata buffer of some nmatch limit,
* e.g. 10 matches, to avoid a malloc-per-call. If it must be alloced,
* e.g. 10 matches, to avoid a malloc-per-call. If it must be allocated,
* implement a general context using palloc and no free implementation.
*/
nlim = ((apr_size_t)preg->re_nsub + 1) > nmatch

2
server/util_script.c
View File

@ -45,7 +45,7 @@
/*
* Various utility functions which are common to a whole lot of
* script-type extensions mechanisms, and might as well be gathered
* in one place (if only to avoid creating inter-module dependancies
* in one place (if only to avoid creating inter-module dependencies
* where there don't have to be).
*/

2
support/SHA1/htpasswd-sha1.pl
View File

@ -5,7 +5,7 @@ use strict;
# on the command line and generates a username
# sha1-encrytped password on the stdout.
#
# Typical useage:
# Typical usage:
# ./htpasswd-sha1.pl dirkx MySecret >> sha1-passwd
#
# This is public domain code. Do whatever you want with it.

4
support/ab.c
View File

@ -56,7 +56,7 @@
** trapping of connection errors which influenced measurements.
** Contributed by Sander Temme, Early 2001
** Version 1.3e
** - Changed timeout behavour during write to work whilst the sockets
** - Changed timeout behavior during write to work whilst the sockets
** are filling up and apr_write() does writes a few - but not all.
** This will potentially change results. <dirkx@webweaving.org>, April 2001
** Version 2.0.36-dev
@ -1317,7 +1317,7 @@ static void output_html_results(void)
total = ap_round_ms(total);
if (done > 0) { /* avoid division by zero (if 0 done) */
printf("<tr %s><th %s colspan=4>Connnection Times (ms)</th></tr>\n",
printf("<tr %s><th %s colspan=4>Connection Times (ms)</th></tr>\n",
trstring, tdstring);
printf("<tr %s><th %s>&nbsp;</th> <th %s>min</th> <th %s>avg</th> <th %s>max</th></tr>\n",
trstring, tdstring, tdstring, tdstring, tdstring);

2
support/rotatelogs.c
View File

@ -504,7 +504,7 @@ static void doRotate(rotate_config_t *config, rotate_status_t *status)
/*
* Get a size or time param from a string.
* Parameter 'last' indicates, whether the
* argument is the last commadnline argument.
* argument is the last commandline argument.
* UTC offset is only allowed as a last argument
* in order to make is distinguishable from the
* rotation interval time.

2
support/suexec.c
View File

@ -530,7 +530,7 @@ int main(int argc, char *argv[])
/*
* Get the current working directory, as well as the proper
* document root (dependant upon whether or not it is a
* document root (dependent upon whether or not it is a
* ~userdir request). Error out if we cannot get either one,
* or if the current working directory is not in the docroot.
* Use chdir()s and getcwd()s to avoid problems with symlinked

6
test/make_sni.sh
View File

@ -143,7 +143,7 @@ openssl req -new -nodes -batch \
-keyout ${CDIR}/xs-root-2.key -out ${CDIR}/xs-root-2.pem \
|| exit 2
# Create a chain of just the two access authorites:
# Create a chain of just the two access authorities:
cat ${CDIR}/xs-root-2.pem ${CDIR}/xs-root-1.pem > ${CDIR}/xs-root-chain.pem
# And likewise a directory with the same information (using the
@ -206,7 +206,7 @@ ErrorLog ${DIR}/logs/error_log
SSLSessionCache none
# Note that this SSL configuration is far
# from complete - you propably will want
# from complete - you probably will want
# to configure SSLSession Caches at the
# very least.
@ -295,7 +295,7 @@ do
# Uncomment the following lines if you
# want to only allow access to clients with
# a certificate issued/signed by some
# selection of the issuing authorites
# selection of the issuing authorities
#
# SSLCACertificate ${CDIR}/xs-root-1.pem # just root 1
# SSLCACertificate ${CDIR}/xs-root-2.pem # just root 2

Some files were not shown because too many files have changed in this diff Show More