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:21:40 UTC
svn commit: r1690349 - in /httpd/httpd/branches/2.4.x: docs/manual/mod/
modules/aaa/ modules/cache/ modules/filters/ modules/ssl/ server/
server/mpm/netware/
Author: jailletc36
Date: Sat Jul 11 05:21:39 2015
New Revision: 1690349
URL: http://svn.apache.org/r1690349
Log:
Backport r1690120.
Doc and comment fix only
Modified:
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml
httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_core.c
httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c
httpd/httpd/branches/2.4.x/modules/cache/cache_util.h
httpd/httpd/branches/2.4.x/modules/filters/mod_charset_lite.c
httpd/httpd/branches/2.4.x/modules/filters/mod_ext_filter.c
httpd/httpd/branches/2.4.x/modules/filters/mod_sed.c
httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c
httpd/httpd/branches/2.4.x/server/core.c
httpd/httpd/branches/2.4.x/server/mpm/netware/mpm_netware.c
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml?rev=1690349&r1=1690348&r2=1690349&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml Sat Jul 11 05:21:39 2015
@@ -852,7 +852,7 @@ algorithm type.
</p>
<p>
-Finally the the end-entity certificate's private key can also be
+Finally the end-entity certificate's private key can also be
added to the certificate file instead of using a separate
<directive module="mod_ssl">SSLCertificateKeyFile</directive>
directive. This practice is highly discouraged. If it is used,
Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_core.c?rev=1690349&r1=1690348&r2=1690349&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_core.c (original)
+++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_core.c Sat Jul 11 05:21:39 2015
@@ -108,7 +108,7 @@ static authn_status authn_alias_check_pa
const char *password)
{
/* Look up the provider alias in the alias list */
- /* Get the the dir_config and call ap_Merge_per_dir_configs() */
+ /* Get the dir_config and call ap_Merge_per_dir_configs() */
/* Call the real provider->check_password() function */
/* return the result of the above function call */
@@ -140,7 +140,7 @@ static authn_status authn_alias_get_real
const char *realm, char **rethash)
{
/* Look up the provider alias in the alias list */
- /* Get the the dir_config and call ap_Merge_per_dir_configs() */
+ /* Get the dir_config and call ap_Merge_per_dir_configs() */
/* Call the real provider->get_realm_hash() function */
/* return the result of the above function call */
Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c?rev=1690349&r1=1690348&r2=1690349&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c Sat Jul 11 05:21:39 2015
@@ -196,7 +196,7 @@ static authz_status authz_alias_check_au
authz_status ret = AUTHZ_DENIED;
/* Look up the provider alias in the alias list.
- * Get the the dir_config and call ap_Merge_per_dir_configs()
+ * Get the dir_config and call ap_Merge_per_dir_configs()
* Call the real provider->check_authorization() function
* return the result of the above function call
*/
Modified: httpd/httpd/branches/2.4.x/modules/cache/cache_util.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/cache_util.h?rev=1690349&r1=1690348&r2=1690349&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/cache_util.h (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/cache_util.h Sat Jul 11 05:21:39 2015
@@ -264,7 +264,7 @@ int cache_check_freshness(cache_handle_t
* Try obtain a cache wide lock on the given cache key.
*
* If we return APR_SUCCESS, we obtained the lock, and we are clear to
- * proceed to the backend. If we return APR_EEXISTS, the the lock is
+ * proceed to the backend. If we return APR_EEXISTS, then the lock is
* already locked, someone else has gone to refresh the backend data
* already, so we must return stale data with a warning in the mean
* time. If we return anything else, then something has gone pear
Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_charset_lite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_charset_lite.c?rev=1690349&r1=1690348&r2=1690349&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_charset_lite.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_charset_lite.c Sat Jul 11 05:21:39 2015
@@ -1026,7 +1026,7 @@ static apr_status_t xlate_in_filter(ap_f
* Content-Length can't be unset here because that would break
* being able to read the request body.
* Processing of chunked request bodies is not impacted by this
- * filter since the the length was not declared anyway.
+ * filter since the length was not declared anyway.
*/
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, f->r,
"Request body length may change, resulting in "
Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_ext_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_ext_filter.c?rev=1690349&r1=1690348&r2=1690349&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_ext_filter.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_ext_filter.c Sat Jul 11 05:21:39 2015
@@ -635,7 +635,7 @@ static apr_status_t init_filter_instance
/* drain_available_output():
*
* if any data is available from the filter, read it and append it
- * to the the bucket brigade
+ * to the bucket brigade
*/
static apr_status_t drain_available_output(ap_filter_t *f,
apr_bucket_brigade *bb)
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=1690349&r1=1690348&r2=1690349&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:21:39 2015
@@ -312,7 +312,7 @@ static apr_status_t sed_response_filter(
* evaluation is allocated on request's pool so it will be cleared once
* request is over.
*
- * If flush bucket is found then append the the flush bucket to ctx->bb
+ * If flush bucket is found then append the flush bucket to ctx->bb
* and pass it to next filter. There may be some data which will still be
* in sed's internal buffer which can't be flushed until new line
* character is arrived.
Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c?rev=1690349&r1=1690348&r2=1690349&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c Sat Jul 11 05:21:39 2015
@@ -1749,7 +1749,7 @@ SSL_SESSION *ssl_callback_GetSessionCach
/*
* This callback function is executed by OpenSSL whenever a
- * SSL_SESSION is removed from the the internal OpenSSL cache.
+ * SSL_SESSION is removed from the internal OpenSSL cache.
* We use this to remove the SSL_SESSION in the inter-process
* disk-cache, too.
*/
Modified: httpd/httpd/branches/2.4.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?rev=1690349&r1=1690348&r2=1690349&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core.c (original)
+++ httpd/httpd/branches/2.4.x/server/core.c Sat Jul 11 05:21:39 2015
@@ -1097,7 +1097,7 @@ AP_DECLARE(apr_off_t) ap_get_limit_req_b
/*****************************************************************
*
* Commands... this module handles almost all of the NCSA httpd.conf
- * commands, but most of the old srm.conf is in the the modules.
+ * commands, but most of the old srm.conf is in the modules.
*/
Modified: httpd/httpd/branches/2.4.x/server/mpm/netware/mpm_netware.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/netware/mpm_netware.c?rev=1690349&r1=1690348&r2=1690349&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/netware/mpm_netware.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/netware/mpm_netware.c Sat Jul 11 05:21:39 2015
@@ -1202,7 +1202,7 @@ static int CommandLineInterpreter(scr_t
ActivateScreen (getscreenhandle());
/* If an instance id was not given but the nlm is loaded in
- protected space, then the the command belongs to the
+ protected space, then the command belongs to the
OS address space instance to pass it on. */
pID = strstr (szcommandLine, "-p");
if ((pID == NULL) && nlmisloadedprotected())