You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2014/05/18 08:46:24 UTC
svn commit: r1595567 - in /httpd/httpd/branches/2.4.x:
include/http_request.h modules/ssl/ssl_engine_kernel.c
modules/ssl/ssl_private.h
Author: jailletc36
Date: Sun May 18 06:46:24 2014
New Revision: 1595567
URL: http://svn.apache.org/r1595567
Log:
Fix typo in comments.
trunk commits:
r1491180
r1563894, r1566428, r1566449
Modified:
httpd/httpd/branches/2.4.x/include/http_request.h
httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c
httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h
Modified: httpd/httpd/branches/2.4.x/include/http_request.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/http_request.h?rev=1595567&r1=1595566&r2=1595567&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/http_request.h (original)
+++ httpd/httpd/branches/2.4.x/include/http_request.h Sun May 18 06:46:24 2014
@@ -541,7 +541,9 @@ AP_DECLARE_HOOK(int,post_perdir_config,(
/**
* 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
*/
Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c?rev=1595567&r1=1595566&r2=1595567&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c Sun May 18 06:46:24 2014
@@ -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, i
}
}
/* 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 *serverna
* 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 =
Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h?rev=1595567&r1=1595566&r2=1595567&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h Sun May 18 06:46:24 2014
@@ -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 */