more negotation -> negotiation; ok sthen@

4 files changed, 7 insertions, 7 deletions

diff --git a/usr.sbin/httpd/src/CHANGES b/usr.sbin/httpd/src/CHANGES
index eafac5fd093..40f41673c67 100644
--- a/usr.sbin/httpd/src/CHANGES
+++ b/usr.sbin/httpd/src/CHANGES
@@ -165,7 +165,7 @@ Changes with Apache 1.3.28
      getsockname() failures to log the client IP address and to
      change the log level to debug.  [Jeff Trawick]
 
-  *) Correction to mod_negotation for Win32, OS2, Netware etc, where
+  *) Correction to mod_negotiation for Win32, OS2, Netware etc, where
      case insensitive requests such as the HEADER or README search
      from autoindex would fail to match HEADER.html (because the
      system internally looked for the case-sensitive header.* pattern.)
@@ -720,7 +720,7 @@ Changes with Apache 1.3.23
      Apache to the main server error log, until the child can
      open it's own error logs.  [William Rowe]
 
-  *) Revert mod_negotation's handling of path_info and query_args
+  *) Revert mod_negotiation's handling of path_info and query_args
      to the 1.3.20 behavior.  PR: 8628, 8582, 8538  [William Rowe]
 
   *) Modify buff.h and buff.c to enable modules to intercept the
diff --git a/usr.sbin/httpd/src/CHANGES.SSL b/usr.sbin/httpd/src/CHANGES.SSL
index bffb5f8e6d9..5581857f709 100644
--- a/usr.sbin/httpd/src/CHANGES.SSL
+++ b/usr.sbin/httpd/src/CHANGES.SSL
@@ -1778,7 +1778,7 @@
       SSLVerifyDepth and/or SSLCipherSuite directives in <Directory> or
       <Location> containers or even .htaccess files. When Apache reaches those
       directories, those directives reconfigure the SSL parameters and the SSL
-      renegotation is automatically enforced by mod_ssl. The only drawback is
+      renegotiation is automatically enforced by mod_ssl. The only drawback is
       that although an optimization is done to reduce unnecessary
       renegotiations (when the parameters were not actually changed), you
       usually increase the overhead for a request because a SSL renegotiation
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_io.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_io.c
index 958bdaf3d05..3d6fcc467ab 100644
--- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_io.c
+++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_io.c
@@ -329,7 +329,7 @@ static int ssl_io_hook_read(BUFF *fb, char *buf, int len)
         /*
          * Simulate an EINTR in case OpenSSL wants to read more.
          * (This is usually the case when the client forces an SSL
-         * renegotation which is handled implicitly by OpenSSL.)
+         * renegotiation which is handled implicitly by OpenSSL.)
          */
         if (rc < 0 && SSL_get_error(ssl, rc) == SSL_ERROR_WANT_READ)
             errno = EINTR;
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_kernel.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_kernel.c
index fdc07837b13..15a1e124418 100644
--- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_kernel.c
+++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_kernel.c
@@ -845,7 +845,7 @@ int ssl_hook_Access(request_rec *r)
      * Additionally the following optimization is possible here: When the
      * currently active verify type is "none" but a client certificate is
      * already known/present, it's enough to manually force a client
-     * verification but at least skip the I/O-intensive renegotation
+     * verification but at least skip the I/O-intensive renegotiation
      * handshake.
      */
     if (dc->nVerifyClient != SSL_CVERIFY_UNSET) {
@@ -951,7 +951,7 @@ int ssl_hook_Access(request_rec *r)
      */
     if (renegotiate) {
         /*
-         * Now we force the SSL renegotation by sending the Hello Request
+         * Now we force the SSL renegotiation by sending the Hello Request
          * message to the client. Here we have to do a workaround: Actually
          * OpenSSL returns immediately after sending the Hello Request (the
          * intent AFAIK is because the SSL/TLS protocol says it's not a must
@@ -1944,7 +1944,7 @@ void ssl_callback_LogTracingState(const SSL *ssl, int where, int rc)
     }
 
     /*
-     * Because SSL renegotations can happen at any time (not only after
+     * Because SSL renegotiations can happen at any time (not only after
      * SSL_accept()), the best way to log the current connection details is
      * right after a finished handshake.
      */