Merge branch 'master' of https://github.com/civetweb/civetweb into cipher_list

src/civetweb.c

@@ -9797,12 +9797,14 @@ log_access(const struct mg_connection *conn)
 	            NULL, /* Ignore truncation in access log */
 	            buf,
 	            sizeof(buf),
-	            "%s - %s [%s] \"%s %s HTTP/%s\" %d %" INT64_FMT " %s %s",
+	            "%s - %s [%s] \"%s %s%s%s HTTP/%s\" %d %" INT64_FMT " %s %s",
 	            src_addr,
 	            ri->remote_user == NULL ? "-" : ri->remote_user,
 	            date,
 	            ri->request_method ? ri->request_method : "-",
 	            ri->request_uri ? ri->request_uri : "-",
+	            ri->query_string ? "?" : "",
+	            ri->query_string ? ri->query_string : "",
 	            ri->http_version,
 	            conn->status_code,
 	            conn->num_bytes_sent,