www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

fix a few spelling errors

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1563894 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeff Trawick
2014-02-03 13:50:14 +00:00
parent 7efba7926f
commit 66b8feb600
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ssl/ssl_engine_kernel.c
View File

@@ -176,8 +176,8 @@ int ssl_hook_ReadReq(request_rec *r)
* cause us to end up in a different virtual host as the one that * cause us to end up in a different virtual host as the one that
* was used for the handshake causing different SSL parameters to * was used for the handshake causing different SSL parameters to
* be applied as SSLProtocol, SSLCACertificateFile/Path and * be applied as SSLProtocol, SSLCACertificateFile/Path and
* SSLCADNRequestFile/Path cannot be renegotioated (SSLCA* due * SSLCADNRequestFile/Path cannot be renegotiated (SSLCA* due
* to current limitiations in Openssl, see * to current limitiations in OpenSSL, see
* http://mail-archives.apache.org/mod_mbox/httpd-dev/200806.mbox/%3C48592955.2090303@velox.ch%3E * http://mail-archives.apache.org/mod_mbox/httpd-dev/200806.mbox/%3C48592955.2090303@velox.ch%3E
* and * and
* http://mail-archives.apache.org/mod_mbox/httpd-dev/201312.mbox/%3CCAKQ1sVNpOrdiBm-UPw1hEdSN7YQXRRjeaT-MCWbW_7mN%3DuFiOw%40mail.gmail.com%3E * http://mail-archives.apache.org/mod_mbox/httpd-dev/201312.mbox/%3CCAKQ1sVNpOrdiBm-UPw1hEdSN7YQXRRjeaT-MCWbW_7mN%3DuFiOw%40mail.gmail.com%3E
@@ -207,7 +207,7 @@ int ssl_hook_ReadReq(request_rec *r)
/* /*
* We are using a name based configuration here, but no hostname was * 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 * 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 setup either in the
* server config we used for handshaking or in our current server. * server config we used for handshaking or in our current server.
* This should avoid insecure configuration by accident. * This should avoid insecure configuration by accident.
*/ */
@@ -1904,7 +1904,7 @@ void ssl_callback_Info(const SSL *ssl, int where, int rc)
} }
} }
/* If the first handshake is complete, change state to reject any /* 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) { else if ((where & SSL_CB_HANDSHAKE_DONE) && scr->reneg_state == RENEG_INIT) {
scr->reneg_state = RENEG_REJECT; scr->reneg_state = RENEG_REJECT;
} }
@@ -2033,7 +2033,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 * vhost we have just switched to. Again, we have to make sure
* that we're not overwriting a session id context which was * that we're not overwriting a session id context which was
* possibly set in ssl_hook_Access(), before triggering * possibly set in ssl_hook_Access(), before triggering
* a renegotation. * a renegotiation.
*/ */
if (SSL_num_renegotiations(ssl) == 0) { if (SSL_num_renegotiations(ssl) == 0) {
unsigned char *sid_ctx = unsigned char *sid_ctx =

2
modules/ssl/ssl_private.h
View File

@@ -425,7 +425,7 @@ typedef struct {
RENEG_INIT = 0, /* Before initial handshake */ RENEG_INIT = 0, /* Before initial handshake */
RENEG_REJECT, /* After initial handshake; any client-initiated RENEG_REJECT, /* After initial handshake; any client-initiated
* renegotiation should be rejected */ * 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) */ * place (as dictated by configuration) */
RENEG_ABORT /* Renegotiation initiated by client, abort the RENEG_ABORT /* Renegotiation initiated by client, abort the
* connection */ * connection */