From: Christophe Jaillet Date: Sat, 11 Jul 2015 05:21:39 +0000 (+0000) Subject: Backport r1690120. X-Git-Tag: 2.4.17~226 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ece12ab4c2727fad41578e71dadaeacceb26103;p=apache Backport r1690120. Doc and comment fix only git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1690349 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index eb34522933..f3619e1e38 100644 --- a/docs/manual/mod/mod_ssl.xml +++ b/docs/manual/mod/mod_ssl.xml @@ -852,7 +852,7 @@ algorithm type.

-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 SSLCertificateKeyFile directive. This practice is highly discouraged. If it is used, diff --git a/modules/aaa/mod_authn_core.c b/modules/aaa/mod_authn_core.c index 1f1163ec08..7af1265587 100644 --- a/modules/aaa/mod_authn_core.c +++ b/modules/aaa/mod_authn_core.c @@ -108,7 +108,7 @@ static authn_status authn_alias_check_password(request_rec *r, const char *user, 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_realm_hash(request_rec *r, const char *user, 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 */ diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c index d70e6965cf..b669c8c8db 100644 --- a/modules/aaa/mod_authz_core.c +++ b/modules/aaa/mod_authz_core.c @@ -196,7 +196,7 @@ static authz_status authz_alias_check_authorization(request_rec *r, 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 */ diff --git a/modules/cache/cache_util.h b/modules/cache/cache_util.h index 5f296bc716..59436c428d 100644 --- a/modules/cache/cache_util.h +++ b/modules/cache/cache_util.h @@ -264,7 +264,7 @@ int cache_check_freshness(cache_handle_t *h, cache_request_rec *cache, * 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 diff --git a/modules/filters/mod_charset_lite.c b/modules/filters/mod_charset_lite.c index e05517b851..d991c12bbd 100644 --- a/modules/filters/mod_charset_lite.c +++ b/modules/filters/mod_charset_lite.c @@ -1026,7 +1026,7 @@ static apr_status_t xlate_in_filter(ap_filter_t *f, apr_bucket_brigade *bb, * 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 " diff --git a/modules/filters/mod_ext_filter.c b/modules/filters/mod_ext_filter.c index 4f97acae07..9f183f69bc 100644 --- a/modules/filters/mod_ext_filter.c +++ b/modules/filters/mod_ext_filter.c @@ -635,7 +635,7 @@ static apr_status_t init_filter_instance(ap_filter_t *f) /* 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) diff --git a/modules/filters/mod_sed.c b/modules/filters/mod_sed.c index dd776c4878..410a5436cd 100644 --- a/modules/filters/mod_sed.c +++ b/modules/filters/mod_sed.c @@ -312,7 +312,7 @@ static apr_status_t sed_response_filter(ap_filter_t *f, * 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. diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index 5642009ccb..d0f9489a87 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -1749,7 +1749,7 @@ SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *ssl, /* * 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. */ diff --git a/server/core.c b/server/core.c index a3681719d0..802d8fdcdb 100644 --- a/server/core.c +++ b/server/core.c @@ -1097,7 +1097,7 @@ AP_DECLARE(apr_off_t) ap_get_limit_req_body(const request_rec *r) /***************************************************************** * * 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. */ diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index ecd76c7cbf..857207273c 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -1202,7 +1202,7 @@ static int CommandLineInterpreter(scr_t screenID, const char *commandLine) 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())