The unified diff between revisions [718cfb3b..] and [1b553632..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'src/structs.h'

#
#
# patch "src/structs.h"
#  from [1c519698275584cec1e79bf895b33969e865fa09]
#    to [09fd7df0ee0cc66a8be6be822cf34b2203aac563]
#
============================================================
--- src/structs.h	1c519698275584cec1e79bf895b33969e865fa09
+++ src/structs.h	09fd7df0ee0cc66a8be6be822cf34b2203aac563
@@ -481,7 +481,6 @@ struct _SquidConfig {
     char *as_whois_server;
     struct {
 	char *log;
-	char *access;
 	char *store;
 	char *swap;
 #if USE_USERAGENT_LOG
@@ -493,6 +492,8 @@ struct _SquidConfig {
 #if WIP_FWD_LOG
 	char *forward;
 #endif
+	logformat *logformats;
+	customlog *accesslogs;
 	int rotateNumber;
     } Log;
     char *adminEmail;
@@ -645,6 +646,7 @@ struct _SquidConfig {
 	acl_access *AlwaysDirect;
 	acl_access *ASlists;
 	acl_access *noCache;
+	acl_access *log;
 #if SQUID_SNMP
 	acl_access *snmp;
 #endif
@@ -1087,6 +1089,8 @@ struct _AccessLogEntry {
 	const char *method_str;
     } private;
     HierarchyLogEntry hier;
+    HttpReply *reply;
+    request_t *request;
 };

 struct _clientHttpRequest {
@@ -2250,10 +2254,34 @@ struct _Logfile {
     size_t bufsz;
     ssize_t offset;
     struct {
-	unsigned int fatal:1;
+	unsigned int fatal;
+	unsigned int syslog;
     } flags;
+    int syslog_priority;
 };

+struct _logformat {
+    char *name;
+    logformat_token *format;
+    logformat *next;
+};
+
+struct _customlog {
+    char *filename;
+    acl_list *aclList;
+    logformat *logFormat;
+    Logfile *logfile;
+    customlog *next;
+    enum {
+	CLF_UNKNOWN,
+	CLF_AUTO,
+	CLF_CUSTOM,
+	CLF_SQUID,
+	CLF_COMMON,
+	CLF_NONE
+    } type;
+};
+
 struct cache_dir_option {
     const char *name;
     void (*parse) (SwapDir * sd, const char *option, const char *value, int reconfiguring);