[patch] Patch to prevent override of logging for unmapped requests

49511.patch (text/plain), 2.43 KB, created by Tim Whittington on 2010-09-21 07:09:19 UTC

(hide)

Description: Patch to prevent override of logging for unmapped requests

Filename:

MIME Type:

Creator: Tim Whittington

Created: 2010-09-21 07:09:19 UTC

Size: 2.43 KB

patch

obsolete

>Index: jk_isapi_plugin.c > >=================================================================== > >--- jk_isapi_plugin.c (revision 921121) > >+++ jk_isapi_plugin.c (working copy) > >@@ -536,6 +536,8 @@ > > struct isapi_log_data_t { > char uri[INTERNET_MAX_URL_LENGTH]; > char query[INTERNET_MAX_URL_LENGTH]; >+ int request_matched; /* Whether this request (within a multi-request connection) >+ was handled and needs the log values adjusted */ > }; > > typedef struct iis_info_t iis_info_t; >@@ -1856,6 +1858,12 @@ > > SetHeader(pfc, WORKER_HEADER_INDEX, NULL); > SetHeader(pfc, TOMCAT_TRANSLATE_HEADER_NAME, NULL); > >+ // Suppress logging of original uri/query when we don't map a URL >+ if (pfc->pFilterContext) { >+ isapi_log_data_t *ld = (isapi_log_data_t *)pfc->pFilterContext; >+ ld->request_matched = JK_FALSE; >+ } >+ > if (!GetHeader(pfc, "url", (LPVOID) uri, (LPDWORD) & sz)) { > jk_log(logger, JK_LOG_ERROR, > "error while getting the url"); >@@ -2055,12 +2063,14 @@ > > memset(ld, 0, sizeof(isapi_log_data_t)); > StringCbCopy(ld->uri, INTERNET_MAX_URL_LENGTH, forwardURI); > StringCbCopy(ld->query, INTERNET_MAX_URL_LENGTH, squery); >+ ld->request_matched = JK_TRUE; > pfc->pFilterContext = ld; > } else { > isapi_log_data_t *ld = (isapi_log_data_t *)pfc->pFilterContext; > memset(ld, 0, sizeof(isapi_log_data_t)); > StringCbCopy(ld->uri, INTERNET_MAX_URL_LENGTH, forwardURI); > StringCbCopy(ld->query, INTERNET_MAX_URL_LENGTH, squery); >+ ld->request_matched = JK_TRUE; > } > } > else { >@@ -2084,9 +2094,11 @@ > > else if (dwNotificationType == SF_NOTIFY_LOG) { > if (pfc->pFilterContext) { > isapi_log_data_t *ld = (isapi_log_data_t *)pfc->pFilterContext; >- HTTP_FILTER_LOG *pl = (HTTP_FILTER_LOG *)pvNotification; >- pl->pszTarget = ld->uri; >- pl->pszParameters = ld->query; >+ if (ld->request_matched) { >+ HTTP_FILTER_LOG *pl = (HTTP_FILTER_LOG *)pvNotification; >+ pl->pszTarget = ld->uri; >+ pl->pszParameters = ld->query; >+ } > } > } > return SF_STATUS_REQ_NEXT_NOTIFICATION; View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]