Commit fffe8064 authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

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
parent 266ba11f

docs/manual/mod/mod_ssl.xml

+1 −1
Original line number Diff line number Diff line
@@ -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,

modules/aaa/mod_authn_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */

modules/aaa/mod_authz_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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

     */

modules/cache/cache_util.h

+1 −1
Original line number Diff line number Diff line
@@ -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

modules/filters/mod_charset_lite.c

+1 −1
Original line number Diff line number Diff line
@@ -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 "