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 /modules/proxy | |
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
Diffstat (limited to 'modules/proxy')
-rw-r--r-- | modules/proxy/mod_proxy.h | 6 | ||||
-rw-r--r-- | modules/proxy/mod_proxy_ajp.c | 4 | ||||
-rw-r--r-- | modules/proxy/proxy_util.c | 8 |
3 files changed, 9 insertions, 9 deletions
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) { |