You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Mike Rumph <mi...@oracle.com> on 2014/02/03 16:55:34 UTC
Re: svn commit: r1563894 - in /httpd/httpd/trunk/modules/ssl: ssl_engine_kernel.c
ssl_private.h
Hello Jeff,
s/limitiations/limitations/
Thanks,
Mike Rumph
On 2/3/2014 5:50 AM, trawick@apache.org wrote:
> Author: trawick
> Date: Mon Feb 3 13:50:14 2014
> New Revision: 1563894
>
> URL: http://svn.apache.org/r1563894
> Log:
> fix a few spelling errors
>
> Modified:
> httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
> httpd/httpd/trunk/modules/ssl/ssl_private.h
>
> Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?rev=1563894&r1=1563893&r2=1563894&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c (original)
> +++ httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c Mon Feb 3 13:50:14 2014
> @@ -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
> * 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 limitiations 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
> @@ -207,7 +207,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 setup either in the
> * server config we used for handshaking or in our current server.
> * This should avoid insecure configuration by accident.
> */
> @@ -1904,7 +1904,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;
> }
> @@ -2033,7 +2033,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/trunk/modules/ssl/ssl_private.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=1563894&r1=1563893&r2=1563894&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/ssl/ssl_private.h (original)
> +++ httpd/httpd/trunk/modules/ssl/ssl_private.h Mon Feb 3 13:50:14 2014
> @@ -425,7 +425,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 */
>
>
>
>
Re: svn commit: r1563894 - in /httpd/httpd/trunk/modules/ssl: ssl_engine_kernel.c
ssl_private.h
Posted by Christophe JAILLET <ch...@wanadoo.fr>.
Le 03/02/2014 17:08, Mike Rumph a écrit :
> I think the following change is also valid:
>
> s/setup/set up/ when used as a verb.
>
> On 2/3/2014 7:55 AM, Mike Rumph wrote:
>> Hello Jeff,
>>
>> s/limitiations/limitations/
>>
>> Thanks,
>>
>> Mike Rumph
>>
r1566428.
CJ
Re: svn commit: r1563894 - in /httpd/httpd/trunk/modules/ssl: ssl_engine_kernel.c
ssl_private.h
Posted by Mike Rumph <mi...@oracle.com>.
I think the following change is also valid:
s/setup/set up/ when used as a verb.
On 2/3/2014 7:55 AM, Mike Rumph wrote:
> Hello Jeff,
>
> s/limitiations/limitations/
>
> Thanks,
>
> Mike Rumph
>
> On 2/3/2014 5:50 AM, trawick@apache.org wrote:
>> Author: trawick
>> Date: Mon Feb 3 13:50:14 2014
>> New Revision: 1563894
>>
>> URL: http://svn.apache.org/r1563894
>> Log:
>> fix a few spelling errors
>>
>> Modified:
>> httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
>> httpd/httpd/trunk/modules/ssl/ssl_private.h
>>
>> Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
>> URL:
>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?rev=1563894&r1=1563893&r2=1563894&view=diff
>> ==============================================================================
>>
>> --- httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c (original)
>> +++ httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c Mon Feb 3
>> 13:50:14 2014
>> @@ -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
>> * 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 limitiations 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
>> @@ -207,7 +207,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
>> setup either in the
>> * server config we used for handshaking or in our
>> current server.
>> * This should avoid insecure configuration by accident.
>> */
>> @@ -1904,7 +1904,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;
>> }
>> @@ -2033,7 +2033,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/trunk/modules/ssl/ssl_private.h
>> URL:
>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=1563894&r1=1563893&r2=1563894&view=diff
>> ==============================================================================
>>
>> --- httpd/httpd/trunk/modules/ssl/ssl_private.h (original)
>> +++ httpd/httpd/trunk/modules/ssl/ssl_private.h Mon Feb 3 13:50:14 2014
>> @@ -425,7 +425,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 */
>>
>>
>>
>>
>
>