From 0ff83b8b4e91a5ea5b212ef3fdabba6561f800c3 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Wed, 28 Aug 2013 11:50:27 -0400
Subject: [PATCH] Include vhost in page request

---
 parser.c   | 26 ++++++++++++++++++++++++--
 parser.h   |  1 +
 settings.c |  2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/parser.c b/parser.c
index 4a8fe3da10..a32fec3374 100644
--- a/parser.c
+++ b/parser.c
@@ -21,7 +21,7 @@
 
 /*
  * "_XOPEN_SOURCE" is required for the GNU libc to export "strptime(3)"
- * correctly. 
+ * correctly.
  */
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
@@ -182,6 +182,7 @@ init_log_item (GLog * logger)
    log->agent = NULL;
    log->date = NULL;
    log->host = NULL;
+   log->vhost = NULL;
    log->ref = NULL;
    log->req = NULL;
    log->status = NULL;
@@ -200,6 +201,8 @@ free_logger (GLogItem * log)
       free (log->date);
    if (log->host != NULL)
       free (log->host);
+   if (log->vhost != NULL)
+      free (log->vhost);
    if (log->ref != NULL)
       free (log->ref);
    if (log->req != NULL)
@@ -365,7 +368,7 @@ process_host_agents (char *host, char *agent)
       memcpy (tmp, ptr_value, len1);
       tmp[len1] = '|';
       /*
-       * NUL-terminated 
+       * NUL-terminated
        */
       memcpy (tmp + len1 + 1, a, len2 + 1);
    } else
@@ -687,6 +690,12 @@ parse_format (GLogItem * log, const char *fmt, const char *date_format,
              free (tkn);
              break;
              /* everything else skip it */
+          case 'v':
+             tkn = parse_string (&str, p[1]);
+             if (tkn == NULL)
+                tkn = alloc_string("???");
+             log->vhost = tkn;
+	     break;
           default:
              if ((pch = strchr (str, p[1])) != NULL)
                 str += pch - str;
@@ -748,6 +757,19 @@ process_log (GLog * logger, char *line, int test)
       return 0;
    }
 
+   if (log->vhost != NULL) {
+      char *req = log->req;
+      char *vhost = log->vhost;
+      char *new_req;
+
+      int len = strlen(req) + strlen(vhost) + 1;
+      new_req = xmalloc(len);
+      strcpy(new_req, vhost);
+      strcpy(new_req + strlen(vhost), req);
+      log->req = new_req;
+      free(req);
+   }
+
    convert_date (buf, log->date, conf.date_format, "%Y%m%d", DATE_LEN);
    if (buf == NULL)
       return 0;
diff --git a/parser.h b/parser.h
index 36624ed173..be360669f4 100644
--- a/parser.h
+++ b/parser.h
@@ -57,6 +57,7 @@ typedef struct GLogItem_
    char *agent;
    char *date;
    char *host;
+   char *vhost;
    char *ref;
    char *req;
    char *status;
diff --git a/settings.c b/settings.c
index 5166538f56..135dd14bfa 100644
--- a/settings.c
+++ b/settings.c
@@ -42,7 +42,7 @@ static GPreConfLog logs = {
    "%h %^[%d:%^] \"%r\" %s %b \"%R\" \"%u\"",       /* CLF           */
    "%h %^[%d:%^] \"%r\" %s %b",                     /* CLF w/ VHost  */
    "%^:%^ %h %^[%d:%^] \"%r\" %s %b \"%R\" \"%u\"", /* NCSA          */
-   "%^:%^ %h %^[%d:%^] \"%r\" %s %b",               /* NCSA w/ VHost */
+   "%v:%^ %h %^[%d:%^] \"%r\" %s %b",               /* NCSA w/ VHost */
    "%d %^ %h %^ %^ %^ %^ %r %^ %s %b %^ %^ %u %R",  /* W3C           */
    "%d %^ %^ %b %h %^ %^ %r %s %R %u %^"            /* CloudFront    */
 };