tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Konstantin Kolinko <knst.koli...@gmail.com>
Subject Re: svn commit: r1196077 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Date Tue, 01 Nov 2011 17:48:03 GMT
2011/11/1  <mturk@apache.org>:
> Author: mturk
> Date: Tue Nov  1 16:07:10 2011
> New Revision: 1196077
>
> URL: http://svn.apache.org/viewvc?rev=1196077&view=rev
> Log:
> Axe trailing spaces
>
> Modified:
>    tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
>
> Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
> URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1196077&r1=1196076&r2=1196077&view=diff
>

> --- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
> +++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Nov  1 16:07:10 2011
> @@ -2817,6 +2816,8 @@ static BOOL initialize_extension(void)
>     if (read_registry_init_data()) {
>         if (get_iis_info(&iis_info) != JK_TRUE) {
>             jk_log(logger, JK_LOG_ERROR, "Could not retrieve IIS version from registry");
> +        }
> +        else {
>             if (use_auth_notification_flags)
>                 iis_info.filter_notify_event = SF_NOTIFY_AUTH_COMPLETE;
>             else

You not only axed the whitespace, but also added the above "else" into
initialize_extension(void) method.

So filter_notify_event now defaults to 0 if registry cannot be read.

If that is expected maybe change the following log message in
init_jk(char *serverName)
to print "NONE" for the value of 0 instead of "UNKNOWN".

2669 	jk_log(logger, JK_LOG_DEBUG, "Using notification event %s (0x%08x)",
2670 	(iis_info.filter_notify_event == SF_NOTIFY_AUTH_COMPLETE) ?
2671 	"SF_NOTIFY_AUTH_COMPLETE" :
2672 	((iis_info.filter_notify_event == SF_NOTIFY_PREPROC_HEADERS) ?
2673 	"SF_NOTIFY_PREPROC_HEADERS" : "UNKNOWN"),
2674 	iis_info.filter_notify_event);

Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message