Fix typo in comments.

trunk commits:
	r1491180
	r1563894, r1566428, r1566449

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1595567 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_request.h b/include/http_request.h
index 1884fbef22bff0eb8bde0482b20e55c635f246b3..e7b0a3a7f87fccda18220c3da3ad78f211d3768a 100644 (file)
--- a/include/http_request.h
+++ b/include/http_request.h
@@ -541,7 +541,9 @@ AP_DECLARE_HOOK(int,post_perdir_config,(request_rec *r))
 /**
  * This hook allows modules to handle/emulate the apr_stat() calls
  * needed for directory walk.
+ * @param finfo where to put the stat data
  * @param r The current request
+ * @param wanted APR_FINFO_* flags to pass to apr_stat()
  * @return apr_status_t or AP_DECLINED (let later modules decide)
  * @ingroup hooks
  */

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 3c649a069df7929c539249c17ed6a0e91d581192..9c18ca7061e690cb56f2db836f15cbf1421b9d2c 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -175,8 +175,8 @@ int ssl_hook_ReadReq(request_rec *r)
              * cause us to end up in a different virtual host as the one that
              * was used for the handshake causing different SSL parameters to
              * be applied as SSLProtocol, SSLCACertificateFile/Path and
-             * SSLCADNRequestFile/Path cannot be renegotioated (SSLCA* due
-             * to current limitiations in Openssl, see
+             * SSLCADNRequestFile/Path cannot be renegotiated (SSLCA* due
+             * to current limitations in OpenSSL, see
              * http://mail-archives.apache.org/mod_mbox/httpd-dev/200806.mbox/%3C48592955.2090303@velox.ch%3E
              * and
              * http://mail-archives.apache.org/mod_mbox/httpd-dev/201312.mbox/%3CCAKQ1sVNpOrdiBm-UPw1hEdSN7YQXRRjeaT-MCWbW_7mN%3DuFiOw%40mail.gmail.com%3E
@@ -206,7 +206,7 @@ int ssl_hook_ReadReq(request_rec *r)
             /*
              * We are using a name based configuration here, but no hostname was
              * provided via SNI. Don't allow that if are requested to do strict
-             * checking. Check wether this strict checking was setup either in the
+             * checking. Check whether this strict checking was set up either in the
              * server config we used for handshaking or in our current server.
              * This should avoid insecure configuration by accident.
              */
@@ -1902,7 +1902,7 @@ void ssl_callback_Info(const SSL *ssl, int where, int rc)
         }
     }
     /* If the first handshake is complete, change state to reject any
-     * subsequent client-initated renegotiation. */
+     * subsequent client-initiated renegotiation. */
     else if ((where & SSL_CB_HANDSHAKE_DONE) && scr->reneg_state == RENEG_INIT) {
         scr->reneg_state = RENEG_REJECT;
     }
@@ -2045,7 +2045,7 @@ static int ssl_find_vhost(void *servername, conn_rec *c, server_rec *s)
          * vhost we have just switched to. Again, we have to make sure
          * that we're not overwriting a session id context which was
          * possibly set in ssl_hook_Access(), before triggering
-         * a renegotation.
+         * a renegotiation.
          */
         if (SSL_num_renegotiations(ssl) == 0) {
             unsigned char *sid_ctx =

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index f4ea10babe020562cd9d0c8c897d152ca2a2e28a..f7a193bfa17edfd6b191eefec1063cd4a597f480 100644 (file)
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -430,7 +430,7 @@ typedef struct {
         RENEG_INIT = 0, /* Before initial handshake */
         RENEG_REJECT, /* After initial handshake; any client-initiated
                        * renegotiation should be rejected */
-        RENEG_ALLOW, /* A server-initated renegotiation is taking
+        RENEG_ALLOW, /* A server-initiated renegotiation is taking
                       * place (as dictated by configuration) */
         RENEG_ABORT /* Renegotiation initiated by client, abort the
                      * connection */