From: Yann Ylavic Date: Thu, 9 Jul 2015 18:07:50 +0000 (+0000) Subject: s/\<\(\w\+\)\>\s\+\<\1\>/\1/g X-Git-Tag: 2.5.0-alpha~3012 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9a3b7892685685b41cd7994c567741c1dbdee04;p=apache s/\<\(\w\+\)\>\s\+\<\1\>/\1/g git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690137 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/developer/thread_safety.xml b/docs/manual/developer/thread_safety.xml index 9ba0bace15..9aa61188ef 100644 --- a/docs/manual/developer/thread_safety.xml +++ b/docs/manual/developer/thread_safety.xml @@ -93,7 +93,7 @@ time with your delimiter which it then remembers and on each subsequent call it returns the next token. Obviously if multiple threads are calling it you will have a problem. Most systems have a reentrant version - of of the function called strtok_r() where you pass in an + of the function called strtok_r() where you pass in an extra argument which contains an allocated char * which the function will use instead of its own static storage for maintaining the tokenizing state. If you are using diff --git a/docs/manual/mod/mod_auth_form.xml b/docs/manual/mod/mod_auth_form.xml index 8f2dc1fe24..6330d6b339 100644 --- a/docs/manual/mod/mod_auth_form.xml +++ b/docs/manual/mod/mod_auth_form.xml @@ -487,7 +487,7 @@ lower level modules

The AuthFormMethod directive specifies the name of an HTML field which, if present, will contain the - mimetype of the request to to submit should login be successful.

+ mimetype of the request to submit should login be successful.

By populating the form with fields described by AuthFormMethod, diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index 8507a8b82a..b2ab2bfa51 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -1198,7 +1198,7 @@ ProxyPass "/example" "http://backend.example.com" max=20 ttl=120 retry=300 like JSESSIONID or PHPSESSIONID, and it depends on the backend application server that support sessions. If the backend application server uses different name for cookies - and url encoded id (like servlet containers) use | to to separate them. + and url encoded id (like servlet containers) use | to separate them. The first part is for the cookie the second for the path.
Available in Apache HTTP Server 2.4.4 and later. diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml index a10acce596..941ac13bac 100644 --- a/docs/manual/mod/mod_rewrite.xml +++ b/docs/manual/mod/mod_rewrite.xml @@ -631,7 +631,7 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3"

The path component of the requested URI, such as "/index.html". This notably excludes the - query string which is available as as its own variable + query string which is available as its own variable named QUERY_STRING.
THE_REQUEST
diff --git a/docs/manual/mod/mod_ssl_ct.xml b/docs/manual/mod/mod_ssl_ct.xml index 75f36e781f..9c03077f94 100644 --- a/docs/manual/mod/mod_ssl_ct.xml +++ b/docs/manual/mod/mod_ssl_ct.xml @@ -398,7 +398,7 @@ refreshed

The CTSCTStorage directive sets the name of a - directory where SCTs and SCT lists will will be stored. If directory + directory where SCTs and SCT lists will be stored. If directory is not absolute then it is assumed to be relative to DefaultRuntimeDir.

diff --git a/include/httpd.h b/include/httpd.h index 7f7300d7f0..285b76b821 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -1850,7 +1850,7 @@ AP_DECLARE(char *) ap_make_full_path(apr_pool_t *a, const char *dir, const char AP_FN_ATTR_NONNULL_ALL; /** - * Test if the given path has an an absolute path. + * Test if the given path has an absolute path. * @param p The pool to allocate from * @param dir The directory name * @note The converse is not necessarily true, some OS's (Win32/OS2/Netware) have diff --git a/modules/filters/mod_sed.c b/modules/filters/mod_sed.c index 2f0950ec28..4a7e5d2fea 100644 --- a/modules/filters/mod_sed.c +++ b/modules/filters/mod_sed.c @@ -412,7 +412,7 @@ static apr_status_t sed_request_filter(ap_filter_t *f, * the buckets in bbinp and read the data from buckets and invoke * sed_eval_buffer on the data. libsed will generate its output using * sed_write_output which will add data in ctx->bb. Do it until it have - * atleast one bucket bucket in ctx->bb. At the end of data eos bucket + * atleast one bucket in ctx->bb. At the end of data eos bucket * should be there. * * Once eos bucket is seen, then invoke sed_finalize_eval to clear the diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c index 5e86e40728..043a7af736 100644 --- a/modules/generators/mod_autoindex.c +++ b/modules/generators/mod_autoindex.c @@ -1981,7 +1981,7 @@ static int dsortf(struct ent **e1, struct ent **e2) } } - /* The names may be identical in respects other other than + /* The names may be identical in respects other than * filename case when strnatcmp is used above, so fall back * to strcmp on conflicts so that fn1.01.zzz and fn1.1.zzz * are also sorted in a deterministic order. diff --git a/modules/http2/sandbox/httpd/mod_ssl-alpn/ssl_engine_io.c b/modules/http2/sandbox/httpd/mod_ssl-alpn/ssl_engine_io.c index 168f43f525..791603e29c 100644 --- a/modules/http2/sandbox/httpd/mod_ssl-alpn/ssl_engine_io.c +++ b/modules/http2/sandbox/httpd/mod_ssl-alpn/ssl_engine_io.c @@ -319,7 +319,7 @@ static int char_buffer_read(char_buffer_t *buffer, char *in, int inl) } if (buffer->length > inl) { - /* we have have enough to fill the caller's buffer */ + /* we have enough to fill the caller's buffer */ memmove(in, buffer->value, inl); buffer->value += inl; buffer->length -= inl; diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c index 536ae8a74a..a68281a841 100644 --- a/modules/mappers/mod_negotiation.c +++ b/modules/mappers/mod_negotiation.c @@ -2890,7 +2890,7 @@ static int do_negotiation(request_rec *r, negotiation_state *neg, /* Some HTTP/1.0 clients are known to choke when they get * a 300 (multiple choices) response without a Location - * header. However the 300 code response we are are about + * header. However the 300 code response we are about * to generate will only reach 1.0 clients which support * transparent negotiation, and they should be OK. The * response should never reach older 1.0 clients, even if diff --git a/modules/metadata/mod_ident.c b/modules/metadata/mod_ident.c index 06295ef3ab..87e7c2b32e 100644 --- a/modules/metadata/mod_ident.c +++ b/modules/metadata/mod_ident.c @@ -298,7 +298,7 @@ static const command_rec ident_cmds[] = module AP_MODULE_DECLARE_DATA ident_module; /* - * Optional function for the core to to the actual ident request + * Optional function for the core to the actual ident request */ static const char *ap_ident_lookup(request_rec *r) { diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c index a62670e0bd..db58b601f3 100644 --- a/modules/metadata/mod_setenvif.c +++ b/modules/metadata/mod_setenvif.c @@ -41,7 +41,7 @@ * done. If the value matches the string or regular expression, the * environment variables listed as var ... are set. Each var can * be in one of three formats: var, which sets the named variable - * (the value value "1"); var=value, which sets the variable to + * (the value "1"); var=value, which sets the variable to * the given value; or !var, which unsets the variable is it has * been previously set. * diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c index f835d14507..41c09dcd73 100644 --- a/modules/proxy/mod_proxy_http.c +++ b/modules/proxy/mod_proxy_http.c @@ -786,7 +786,7 @@ static int ap_proxy_http_prefetch(apr_pool_t *p, request_rec *r, /* WE only understand chunked. Other modules might inject * (and therefore, decode) other flavors but we don't know - * that the can and have done so unless they they remove + * that the can and have done so unless they remove * their decoding from the headers_in T-E list. * XXX: Make this extensible, but in doing so, presume the * encoding has been done by the extensions' handler, and diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index 6c346e90f4..9a549eff29 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -338,7 +338,7 @@ static int char_buffer_read(char_buffer_t *buffer, char *in, int inl) } if (buffer->length > inl) { - /* we have have enough to fill the caller's buffer */ + /* we have enough to fill the caller's buffer */ memmove(in, buffer->value, inl); buffer->value += inl; buffer->length -= inl;