Merge tag '1.34.0' into packaging1.34.0-1

Unit 1.34.0 release.

1 files changed, 20 insertions, 19 deletions

diff --git a/src/nxt_router.h b/src/nxt_router.h
index 06c6bb32..e2c5b83b 100644
--- a/src/nxt_router.h
+++ b/src/nxt_router.h
@@ -16,12 +16,13 @@ typedef struct nxt_http_request_s  nxt_http_request_t;
 #include <nxt_application.h>
 
 
-typedef struct nxt_http_action_s        nxt_http_action_t;
-typedef struct nxt_http_routes_s        nxt_http_routes_t;
-typedef struct nxt_http_forward_s       nxt_http_forward_t;
-typedef struct nxt_upstream_s           nxt_upstream_t;
-typedef struct nxt_upstreams_s          nxt_upstreams_t;
-typedef struct nxt_router_access_log_s  nxt_router_access_log_t;
+typedef struct nxt_http_action_s               nxt_http_action_t;
+typedef struct nxt_http_routes_s               nxt_http_routes_t;
+typedef struct nxt_http_forward_s              nxt_http_forward_t;
+typedef struct nxt_upstream_s                  nxt_upstream_t;
+typedef struct nxt_upstreams_s                 nxt_upstreams_t;
+typedef struct nxt_router_access_log_s         nxt_router_access_log_t;
+typedef struct nxt_router_access_log_format_s  nxt_router_access_log_format_t;
 
 
 #define NXT_HTTP_ACTION_ERROR  ((nxt_http_action_t *) -1)
@@ -39,22 +40,22 @@ typedef struct {
 
 
 typedef struct {
-    uint32_t                 count;
-    uint32_t                 threads;
+    uint32_t                        count;
+    uint32_t                        threads;
 
-    nxt_mp_t                 *mem_pool;
-    nxt_tstr_state_t         *tstr_state;
+    nxt_mp_t                        *mem_pool;
+    nxt_tstr_state_t                *tstr_state;
 
-    nxt_router_t             *router;
-    nxt_http_routes_t        *routes;
-    nxt_upstreams_t          *upstreams;
+    nxt_router_t                    *router;
+    nxt_http_routes_t               *routes;
+    nxt_upstreams_t                 *upstreams;
 
-    nxt_lvlhsh_t             mtypes_hash;
-    nxt_lvlhsh_t             apps_hash;
+    nxt_lvlhsh_t                    mtypes_hash;
+    nxt_lvlhsh_t                    apps_hash;
 
-    nxt_router_access_log_t  *access_log;
-    nxt_tstr_t               *log_format;
-    nxt_tstr_cond_t          log_cond;
+    nxt_tstr_cond_t                 log_cond;
+    nxt_router_access_log_t         *access_log;
+    nxt_router_access_log_format_t  *log_format;
 } nxt_router_conf_t;
 
 
@@ -235,7 +236,7 @@ typedef struct {
 struct nxt_router_access_log_s {
     void                   (*handler)(nxt_task_t *task, nxt_http_request_t *r,
                                       nxt_router_access_log_t *access_log,
-                                      nxt_tstr_t *format);
+                                      nxt_router_access_log_format_t *format);
     nxt_fd_t               fd;
     nxt_str_t              path;
     uint32_t               count;