diff options
Diffstat (limited to 'src/mod_accesslog.c')
| -rw-r--r-- | src/mod_accesslog.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/mod_accesslog.c b/src/mod_accesslog.c index 420037e..8fa92ca 100644 --- a/src/mod_accesslog.c +++ b/src/mod_accesslog.c @@ -165,7 +165,8 @@ static void accesslog_append_escaped(buffer *dest, buffer *str) { buffer_prepare_append(dest, str->used - 1); for (ptr = start = str->ptr, end = str->ptr + str->used - 1; ptr < end; ptr++) { - if (*ptr >= ' ' && *ptr <= '~') { + char const c = *ptr; + if (c >= ' ' && c <= '~' && c != '"' && c != '\\') { /* nothing to change, add later as one block */ } else { /* copy previous part */ @@ -174,7 +175,7 @@ static void accesslog_append_escaped(buffer *dest, buffer *str) { } start = ptr + 1; - switch (*ptr) { + switch (c) { case '"': BUFFER_APPEND_STRING_CONST(dest, "\\\""); break; @@ -199,9 +200,9 @@ static void accesslog_append_escaped(buffer *dest, buffer *str) { default: { /* non printable char => \xHH */ char hh[5] = {'\\','x',0,0,0}; - char h = *ptr / 16; + char h = c / 16; hh[2] = (h > 9) ? (h - 10 + 'A') : (h + '0'); - h = *ptr % 16; + h = c % 16; hh[3] = (h > 9) ? (h - 10 + 'A') : (h + '0'); buffer_append_string_len(dest, &hh[0], 4); } @@ -858,7 +859,13 @@ REQUESTDONE_FUNC(log_access_write) { break; case FORMAT_SERVER_PORT: { - char *colon = strrchr(((server_socket*)(con->srv_socket))->srv_token->ptr, ':'); + const char *colon; + buffer *srvtoken = ((server_socket*)(con->srv_socket))->srv_token; + if (srvtoken->ptr[0] == '[') { + colon = strstr(srvtoken->ptr, "]:"); + } else { + colon = strchr(srvtoken->ptr, ':'); + } if (colon) { buffer_append_string(b, colon+1); } else { |