You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2015/07/11 07:33:46 UTC
svn commit: r1690350 - in /httpd/httpd/branches/2.4.x:
docs/manual/developer/ docs/manual/mod/ include/ modules/filters/
modules/generators/ modules/mappers/ modules/metadata/ modules/proxy/
modules/ssl/
Author: jailletc36
Date: Sat Jul 11 05:33:45 2015
New Revision: 1690350
URL: http://svn.apache.org/r1690350
Log:
Backport r1690137.
Doc and comment fix only
Modified:
httpd/httpd/branches/2.4.x/docs/manual/developer/thread_safety.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_auth_form.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml
httpd/httpd/branches/2.4.x/include/httpd.h
httpd/httpd/branches/2.4.x/modules/filters/mod_sed.c
httpd/httpd/branches/2.4.x/modules/generators/mod_autoindex.c
httpd/httpd/branches/2.4.x/modules/mappers/mod_negotiation.c
httpd/httpd/branches/2.4.x/modules/metadata/mod_ident.c
httpd/httpd/branches/2.4.x/modules/metadata/mod_setenvif.c
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c
httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_io.c
Modified: httpd/httpd/branches/2.4.x/docs/manual/developer/thread_safety.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/developer/thread_safety.xml?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/developer/thread_safety.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/developer/thread_safety.xml Sat Jul 11 05:33:45 2015
@@ -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 <code>strtok_r()</code> where you pass in an
+ of the function called <code>strtok_r()</code> where you pass in an
extra argument which contains an allocated <code>char *</code> which the
function will use instead of its own static storage for maintaining
the tokenizing state. If you are using <a href="http://apr.apache.org/"
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_auth_form.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_auth_form.xml?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_auth_form.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_auth_form.xml Sat Jul 11 05:33:45 2015
@@ -487,7 +487,7 @@ lower level modules</description>
<usage>
<p>The <directive module="mod_auth_form">AuthFormMethod</directive> 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.</p>
+ mimetype of the request to submit should login be successful.</p>
<p>By populating the form with fields described by
<directive module="mod_auth_form">AuthFormMethod</directive>,
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml Sat Jul 11 05:33:45 2015
@@ -1183,7 +1183,7 @@ ProxyPass "/mirror/foo" "http://backend.
like <code>JSESSIONID</code> or <code>PHPSESSIONID</code>,
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.<br />
Available in Apache HTTP Server 2.4.4 and later.
</td></tr>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml Sat Jul 11 05:33:45 2015
@@ -629,7 +629,7 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3"
<dd>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 <code>QUERY_STRING</code>.</dd>
<dt><code>THE_REQUEST</code></dt>
Modified: httpd/httpd/branches/2.4.x/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/httpd.h?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/httpd.h (original)
+++ httpd/httpd/branches/2.4.x/include/httpd.h Sat Jul 11 05:33:45 2015
@@ -1769,7 +1769,7 @@ AP_DECLARE(char *) ap_make_dirstr_parent
AP_DECLARE(char *) ap_make_full_path(apr_pool_t *a, const char *dir, const char *f);
/**
- * 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
Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_sed.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_sed.c?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_sed.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_sed.c Sat Jul 11 05:33:45 2015
@@ -424,7 +424,7 @@ static apr_status_t sed_request_filter(a
* 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
Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_autoindex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_autoindex.c?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_autoindex.c (original)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_autoindex.c Sat Jul 11 05:33:45 2015
@@ -1981,7 +1981,7 @@ static int dsortf(struct ent **e1, struc
}
}
- /* 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.
Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_negotiation.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_negotiation.c?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_negotiation.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_negotiation.c Sat Jul 11 05:33:45 2015
@@ -2890,7 +2890,7 @@ static int do_negotiation(request_rec *r
/* 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
Modified: httpd/httpd/branches/2.4.x/modules/metadata/mod_ident.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/metadata/mod_ident.c?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/metadata/mod_ident.c (original)
+++ httpd/httpd/branches/2.4.x/modules/metadata/mod_ident.c Sat Jul 11 05:33:45 2015
@@ -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)
{
Modified: httpd/httpd/branches/2.4.x/modules/metadata/mod_setenvif.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/metadata/mod_setenvif.c?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/metadata/mod_setenvif.c (original)
+++ httpd/httpd/branches/2.4.x/modules/metadata/mod_setenvif.c Sat Jul 11 05:33:45 2015
@@ -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.
*
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c Sat Jul 11 05:33:45 2015
@@ -759,7 +759,7 @@ int ap_proxy_http_request(apr_pool_t *p,
/* 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
Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_io.c?rev=1690350&r1=1690349&r2=1690350&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_io.c Sat Jul 11 05:33:45 2015
@@ -317,7 +317,7 @@ static int char_buffer_read(char_buffer_
}
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;