github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up.

Browse Source
This commit is contained in:
ivanr 2008-09-10 11:34:16 +00:00
parent ec49ce05c7
commit 2f7ff8f7ab
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apache2/apache2_util.c
View File

@ -237,7 +237,9 @@ char *get_env_var(request_rec *r, char *name) {
} }
/** /**
* Internal log helper function. Use msr_log instead. * Internal log helper function. Use msr_log instead. This function will
* correctly handle both the messages that have a newline at the end, and
* those that don't.
*/ */
void internal_log(request_rec *r, directory_config *dcfg, modsec_rec *msr, void internal_log(request_rec *r, directory_config *dcfg, modsec_rec *msr,
int level, const char *text, va_list ap) int level, const char *text, va_list ap)
@ -254,7 +256,10 @@ void internal_log(request_rec *r, directory_config *dcfg, modsec_rec *msr,
if ((dcfg->debuglog_fd != NULL)&&(dcfg->debuglog_fd != NOT_SET_P)) { if ((dcfg->debuglog_fd != NULL)&&(dcfg->debuglog_fd != NOT_SET_P)) {
debuglog_fd = dcfg->debuglog_fd; debuglog_fd = dcfg->debuglog_fd;
} }
if (dcfg->debuglog_level != NOT_SET) filter_debug_level = dcfg->debuglog_level;
if (dcfg->debuglog_level != NOT_SET) {
filter_debug_level = dcfg->debuglog_level;
}
} }
/* Return immediately if we don't have where to write /* Return immediately if we don't have where to write
@ -265,7 +270,7 @@ void internal_log(request_rec *r, directory_config *dcfg, modsec_rec *msr,
/* Construct the message (leaving a byte left for a newline if needed). */ /* Construct the message (leaving a byte left for a newline if needed). */
apr_vsnprintf(str1, sizeof(str1), text, ap); apr_vsnprintf(str1, sizeof(str1), text, ap);
str2len = apr_snprintf(str2, sizeof(str2)-1, str2len = apr_snprintf(str2, sizeof(str2) - 1,
"[%s] [%s/sid#%pp][rid#%pp][%s][%d] %s", "[%s] [%s/sid#%pp][rid#%pp][%s][%d] %s",
current_logtime(msr->mp), ap_get_server_name(r), (r->server), current_logtime(msr->mp), ap_get_server_name(r), (r->server),
r, ((r->uri == NULL) ? "" : log_escape_nq(msr->mp, r->uri)), r, ((r->uri == NULL) ? "" : log_escape_nq(msr->mp, r->uri)),