From bb083478557b90ce6714047fdbdbc5e236feae57 Mon Sep 17 00:00:00 2001 From: martynas Date: Tue, 22 Jul 2008 11:20:10 +0000 Subject: [PATCH] more negotation -> negotiation; ok sthen@ --- sys/dev/mii/dcphy.c | 4 ++-- sys/dev/pci/if_em.h | 4 ++-- usr.sbin/httpd/htdocs/manual/mod/mod_ssl/ssl_reference.html | 6 +++--- usr.sbin/httpd/src/CHANGES | 4 ++-- usr.sbin/httpd/src/CHANGES.SSL | 2 +- usr.sbin/httpd/src/modules/ssl/ssl_engine_io.c | 2 +- usr.sbin/httpd/src/modules/ssl/ssl_engine_kernel.c | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c index 0cf7e3be0b7..1806cfbdce3 100644 --- a/sys/dev/mii/dcphy.c +++ b/sys/dev/mii/dcphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dcphy.c,v 1.20 2008/07/11 15:00:17 brad Exp $ */ +/* $OpenBSD: dcphy.c,v 1.21 2008/07/22 11:20:10 martynas Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -282,7 +282,7 @@ dcphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) * since real Intel 21143 chips don't show valid link * status until autonegotiation is switched off, and * that only happens in dcphy_status(). Without this, - * successful autonegotation is never recognised on + * successful autonegotiation is never recognised on * these chips. */ if (++sc->mii_ticks <= sc->mii_anegticks) diff --git a/sys/dev/pci/if_em.h b/sys/dev/pci/if_em.h index a8a137ff553..48b70f2c3bc 100644 --- a/sys/dev/pci/if_em.h +++ b/sys/dev/pci/if_em.h @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /* $FreeBSD: if_em.h,v 1.26 2004/09/01 23:22:41 pdeuskar Exp $ */ -/* $OpenBSD: if_em.h,v 1.36 2007/10/21 03:49:54 brad Exp $ */ +/* $OpenBSD: if_em.h,v 1.37 2008/07/22 11:20:10 martynas Exp $ */ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -197,7 +197,7 @@ POSSIBILITY OF SUCH DAMAGE. #define EM_TX_OP_THRESHOLD (sc->num_tx_desc / 32) /* - * This parameter controls whether or not autonegotation is enabled. + * This parameter controls whether or not autonegotiation is enabled. * 0 - Disable autonegotiation * 1 - Enable autonegotiation */ diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_ssl/ssl_reference.html b/usr.sbin/httpd/htdocs/manual/mod/mod_ssl/ssl_reference.html index 1173a6931ae..1441cbb6487 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_ssl/ssl_reference.html +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_ssl/ssl_reference.html @@ -1047,7 +1047,7 @@ consisting of OpenSSL cipher specifications to configure the Cipher Suite the client is permitted to negotiate in the SSL handshake phase. Notice that this directive can be used both in per-server and per-directory context. In per-server context it applies to the standard SSL handshake when a connection -is established. In per-directory context it forces a SSL renegotation with the +is established. In per-directory context it forces a SSL renegotiation with the reconfigured Cipher Suite after the HTTP request was read but before the HTTP response is sent.

@@ -1753,7 +1753,7 @@ This directive sets the Certificate verification level for the Client Authentication. Notice that this directive can be used both in per-server and per-directory context. In per-server context it applies to the client authentication process used in the standard SSL handshake when a connection is -established. In per-directory context it forces a SSL renegotation with the +established. In per-directory context it forces a SSL renegotiation with the reconfigured client verification level after the HTTP request was read but before the HTTP response is sent.

@@ -1837,7 +1837,7 @@ clients don't have a valid certificate. Notice that this directive can be used both in per-server and per-directory context. In per-server context it applies to the client authentication process used in the standard SSL handshake when a connection is established. In per-directory context it forces -a SSL renegotation with the reconfigured client verification depth after the +a SSL renegotiation with the reconfigured client verification depth after the HTTP request was read but before the HTTP response is sent.

The depth actually is the maximum number of intermediate certificate issuers, 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 or 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. */ -- 2.20.1