Merge 2.5 changes.

This commit is contained in:
b1v1r
2009-03-05 21:50:55 +00:00
parent a06d8f8ce7
commit fa96c349e5
20 changed files with 3910 additions and 7817 deletions

View File

@@ -240,7 +240,7 @@ void internal_log(request_rec *r, directory_config *dcfg, modsec_rec *msr,
char str1[1024] = "";
char str2[1256] = "";
/* Find the logging FD and look up the logging level in the configuration. */
/* Find the logging FD and determine the logging level from configuration. */
if (dcfg != NULL) {
if ((dcfg->debuglog_fd != NULL)&&(dcfg->debuglog_fd != NOT_SET_P)) {
debuglog_fd = dcfg->debuglog_fd;