Author: mturk
Date: Mon Oct 31 13:57:44 2011
New Revision: 1195459
URL: http://svn.apache.org/viewvc?rev=1195459&view=rev
Log:
Header callback functions have the same structure offset in both
HTTP_FILTER_PREPROC_HEADERS and HTTP_FILTER_AUTH_COMPLETE_INFO.
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=1195459&r1=1195458&r2=1195459&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Oct 31 13:57:44 2011
@@ -1892,22 +1892,13 @@ DWORD WINAPI HttpFilterProc(PHTTP_FILTER
DWORD szPort = sizeof(Port);
DWORD szTranslate = sizeof(Translate);
- if (iis_info.filter_notify_event == SF_NOTIFY_AUTH_COMPLETE) {
- GetHeader =
- ((PHTTP_FILTER_AUTH_COMPLETE_INFO) pvNotification)->GetHeader;
- SetHeader =
- ((PHTTP_FILTER_AUTH_COMPLETE_INFO) pvNotification)->SetHeader;
- AddHeader =
- ((PHTTP_FILTER_AUTH_COMPLETE_INFO) pvNotification)->AddHeader;
- }
- else {
- GetHeader =
- ((PHTTP_FILTER_PREPROC_HEADERS) pvNotification)->GetHeader;
- SetHeader =
- ((PHTTP_FILTER_PREPROC_HEADERS) pvNotification)->SetHeader;
- AddHeader =
- ((PHTTP_FILTER_PREPROC_HEADERS) pvNotification)->AddHeader;
- }
+ /* This can be either HTTP_FILTER_PREPROC_HEADERS or
+ * HTTP_FILTER_AUTH_COMPLETE_INFO. In either case the
+ * requested functions are at the same structure offset
+ */
+ GetHeader = ((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->GetHeader;
+ SetHeader = ((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->SetHeader;
+ AddHeader = ((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)->AddHeader;
if (JK_IS_DEBUG_LEVEL(logger))
jk_log(logger, JK_LOG_DEBUG, "Filter started");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
