Hello again!
The places of user name and request time are switched in LogLevel 4
(apache combined log without virtual host)
Also, the config regexp excludes 4
Here is a patch.
diff -ur -x svc.c orig-Pound/Pound-2.0b4/config.c Pound-2.0b4/config.c
--- orig-Pound/Pound-2.0b4/config.c 2005-12-07 18:57:59.000000000 +0900
+++ Pound-2.0b4/config.c 2005-12-19 11:40:22.584963104 +0900
(at)(at) -1044,7 +1044,7 (at)(at)
|| regcomp(&RootJail, "^[ \t]*RootJail[ \t]+\"(.+)\"[ \t]*$",
REG_ICASE | REG_NEWLINE | REG_EXTENDED)
|| regcomp(&Daemon, "^[ \t]*Daemon[ \t]+([01])[ \t]*$", REG_ICASE |
REG_NEWLINE | REG_EXTENDED)
|| regcomp(&LogFacility, "^[ \t]*LogFacility[ \t]+([a-z0-9]+)[
\t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
- || regcomp(&LogLevel, "^[ \t]*LogLevel[ \t]+([0-3])[ \t]*$",
REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+ || regcomp(&LogLevel, "^[ \t]*LogLevel[ \t]+([0-4])[ \t]*$",
REG_ICASE | REG_NEWLINE | REG_EXTENDED)
|| regcomp(&Alive, "^[ \t]*Alive[ \t]+([1-9][0-9]*)[ \t]*$",
REG_ICASE | REG_NEWLINE | REG_EXTENDED)
|| regcomp(&SSLEngine, "^[ \t]*SSLEngine[ \t]+\"(.+)\"[ \t]*$",
REG_ICASE | REG_NEWLINE | REG_EXTENDED)
|| regcomp(&ListenHTTP, "^[ \t]*ListenHTTP[ \t]*$", REG_ICASE |
REG_NEWLINE | REG_EXTENDED)
diff -ur -x svc.c orig-Pound/Pound-2.0b4/http.c Pound-2.0b4/http.c
--- orig-Pound/Pound-2.0b4/http.c 2005-12-07 18:57:59.000000000 +0900
+++ Pound-2.0b4/http.c 2005-12-22 10:45:18.518868032 +0900
(at)(at) -1069,7 +1069,7 (at)(at)
break;
case 4:
logmsg(LOG_INFO, "%s - %s [%s] \"%s\" 307 0 \"%s\"
\"%s\"", inet_ntoa(from_host),
- log_time(req_start), u_name[0]? u_name: "-",
request, referer, u_agent);
+ u_name[0]? u_name: "-", log_time(req_start),
request, referer, u_agent);
break;
}
if(!cl_11 || conn_closed || force_10)
(at)(at) -1259,7 +1259,7 (at)(at)
break;
case 4:
logmsg(LOG_INFO, "%s - %s [%s] \"%s\" %c%c%c %s \"%s\"
\"%s\"", inet_ntoa(from_host),
- log_time(req_start), u_name[0]? u_name: "-", request,
response[9], response[10], response[11],
+ u_name[0]? u_name: "-", log_time(req_start), request,
response[9], response[10], response[11],
log_bytes(res_bytes), referer, u_agent);
break;
}
|
