nginx-0.1.24-RELEASE import
*) Feature: the ngx_http_ssi_filter_module supports the QUERY_STRING
and DOCUMENT_URI variables.
*) Bugfix: the ngx_http_autoindex_module may some times return the 404
response for existent directory, if this directory was used in
"alias" directive.
*) Bugfix: the ngx_http_ssi_filter_module ran incorrectly for large
responses.
*) Bugfix: the lack of the "Referer" header line was always accounted
as valid referrer.
diff --git a/src/event/modules/ngx_aio_module.c b/src/event/modules/ngx_aio_module.c
index bdd31cf..37a3a44 100644
--- a/src/event/modules/ngx_aio_module.c
+++ b/src/event/modules/ngx_aio_module.c
@@ -14,12 +14,12 @@
#endif
-static int ngx_aio_init(ngx_cycle_t *cycle);
+static ngx_int_t ngx_aio_init(ngx_cycle_t *cycle);
static void ngx_aio_done(ngx_cycle_t *cycle);
-static int ngx_aio_add_event(ngx_event_t *ev, int event, u_int flags);
-static int ngx_aio_del_event(ngx_event_t *ev, int event, u_int flags);
-static int ngx_aio_del_connection(ngx_connection_t *c, u_int flags);
-static int ngx_aio_process_events(ngx_cycle_t *cycle);
+static ngx_int_t ngx_aio_add_event(ngx_event_t *ev, int event, u_int flags);
+static ngx_int_t ngx_aio_del_event(ngx_event_t *ev, int event, u_int flags);
+static ngx_int_t ngx_aio_del_connection(ngx_connection_t *c, u_int flags);
+static ngx_int_t ngx_aio_process_events(ngx_cycle_t *cycle);
ngx_os_io_t ngx_os_aio = {
@@ -66,7 +66,8 @@
#if (NGX_HAVE_KQUEUE)
-static int ngx_aio_init(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_aio_init(ngx_cycle_t *cycle)
{
if (ngx_kqueue_module_ctx.actions.init(cycle) == NGX_ERROR) {
return NGX_ERROR;
@@ -82,27 +83,31 @@
}
-static void ngx_aio_done(ngx_cycle_t *cycle)
+static void
+ngx_aio_done(ngx_cycle_t *cycle)
{
ngx_kqueue_module_ctx.actions.done(cycle);
}
-/* The event adding and deleting are needed for the listening sockets */
+/* the event adding and deleting are needed for the listening sockets */
-static int ngx_aio_add_event(ngx_event_t *ev, int event, u_int flags)
+static ngx_int_t
+ngx_aio_add_event(ngx_event_t *ev, int event, u_int flags)
{
return ngx_kqueue_module_ctx.actions.add(ev, event, flags);
}
-static int ngx_aio_del_event(ngx_event_t *ev, int event, u_int flags)
+static ngx_int_t
+ngx_aio_del_event(ngx_event_t *ev, int event, u_int flags)
{
return ngx_kqueue_module_ctx.actions.del(ev, event, flags);
}
-static int ngx_aio_del_connection(ngx_connection_t *c, u_int flags)
+static ngx_int_t
+ngx_aio_del_connection(ngx_connection_t *c, u_int flags)
{
int rc;
@@ -147,7 +152,8 @@
}
-static int ngx_aio_process_events(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_aio_process_events(ngx_cycle_t *cycle)
{
return ngx_kqueue_module_ctx.actions.process_events(cycle);
}
diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index a9c60c4..2d94ba4 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -31,12 +31,12 @@
} ngx_devpoll_conf_t;
-static int ngx_devpoll_init(ngx_cycle_t *cycle);
+static ngx_int_t ngx_devpoll_init(ngx_cycle_t *cycle);
static void ngx_devpoll_done(ngx_cycle_t *cycle);
-static int ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags);
-static int ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags);
-static int ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags);
-static int ngx_devpoll_process_events(ngx_cycle_t *cycle);
+static ngx_int_t ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags);
+static ngx_int_t ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags);
+static ngx_int_t ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags);
+static ngx_int_t ngx_devpoll_process_events(ngx_cycle_t *cycle);
static void *ngx_devpoll_create_conf(ngx_cycle_t *cycle);
static char *ngx_devpoll_init_conf(ngx_cycle_t *cycle, void *conf);
@@ -52,21 +52,21 @@
static ngx_command_t ngx_devpoll_commands[] = {
- {ngx_string("devpoll_changes"),
- NGX_EVENT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_devpoll_conf_t, changes),
- NULL},
+ { ngx_string("devpoll_changes"),
+ NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ 0,
+ offsetof(ngx_devpoll_conf_t, changes),
+ NULL },
- {ngx_string("devpoll_events"),
- NGX_EVENT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_devpoll_conf_t, events),
- NULL},
+ { ngx_string("devpoll_events"),
+ NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ 0,
+ offsetof(ngx_devpoll_conf_t, events),
+ NULL },
- ngx_null_command
+ ngx_null_command
};
@@ -100,7 +100,8 @@
};
-static int ngx_devpoll_init(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_devpoll_init(ngx_cycle_t *cycle)
{
size_t n;
ngx_devpoll_conf_t *dpcf;
@@ -173,7 +174,8 @@
}
-static void ngx_devpoll_done(ngx_cycle_t *cycle)
+static void
+ngx_devpoll_done(ngx_cycle_t *cycle)
{
if (close(dp) == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
@@ -195,7 +197,8 @@
}
-static int ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags)
+static ngx_int_t
+ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags)
{
#if (NGX_DEBUG)
ngx_connection_t *c;
@@ -217,7 +220,8 @@
}
-static int ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
+static ngx_int_t
+ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
{
ngx_event_t *e;
ngx_connection_t *c;
@@ -260,7 +264,8 @@
}
-static int ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags)
+static ngx_int_t
+ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags)
{
size_t n;
ngx_connection_t *c;
@@ -308,7 +313,8 @@
}
-int ngx_devpoll_process_events(ngx_cycle_t *cycle)
+ngx_int_t
+ngx_devpoll_process_events(ngx_cycle_t *cycle)
{
int events, revents;
ngx_int_t i;
@@ -569,7 +575,8 @@
}
-static void *ngx_devpoll_create_conf(ngx_cycle_t *cycle)
+static void *
+ngx_devpoll_create_conf(ngx_cycle_t *cycle)
{
ngx_devpoll_conf_t *dpcf;
@@ -583,7 +590,8 @@
}
-static char *ngx_devpoll_init_conf(ngx_cycle_t *cycle, void *conf)
+static char *
+ngx_devpoll_init_conf(ngx_cycle_t *cycle, void *conf)
{
ngx_devpoll_conf_t *dpcf = conf;
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index af27818..f2c973f 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -70,13 +70,13 @@
} ngx_epoll_conf_t;
-static int ngx_epoll_init(ngx_cycle_t *cycle);
+static ngx_int_t ngx_epoll_init(ngx_cycle_t *cycle);
static void ngx_epoll_done(ngx_cycle_t *cycle);
-static int ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags);
-static int ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags);
-static int ngx_epoll_add_connection(ngx_connection_t *c);
-static int ngx_epoll_del_connection(ngx_connection_t *c, u_int flags);
-static int ngx_epoll_process_events(ngx_cycle_t *cycle);
+static ngx_int_t ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags);
+static ngx_int_t ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags);
+static ngx_int_t ngx_epoll_add_connection(ngx_connection_t *c);
+static ngx_int_t ngx_epoll_del_connection(ngx_connection_t *c, u_int flags);
+static ngx_int_t ngx_epoll_process_events(ngx_cycle_t *cycle);
static void *ngx_epoll_create_conf(ngx_cycle_t *cycle);
static char *ngx_epoll_init_conf(ngx_cycle_t *cycle, void *conf);
@@ -90,14 +90,14 @@
static ngx_command_t ngx_epoll_commands[] = {
- {ngx_string("epoll_events"),
- NGX_EVENT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_epoll_conf_t, events),
- NULL},
+ { ngx_string("epoll_events"),
+ NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ 0,
+ offsetof(ngx_epoll_conf_t, events),
+ NULL },
- ngx_null_command
+ ngx_null_command
};
@@ -130,7 +130,8 @@
};
-static int ngx_epoll_init(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_epoll_init(ngx_cycle_t *cycle)
{
size_t n;
ngx_event_conf_t *ecf;
@@ -180,7 +181,8 @@
}
-static void ngx_epoll_done(ngx_cycle_t *cycle)
+static void
+ngx_epoll_done(ngx_cycle_t *cycle)
{
if (close(ep) == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
@@ -196,7 +198,8 @@
}
-static int ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags)
+static ngx_int_t
+ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags)
{
int op;
uint32_t events, prev;
@@ -253,7 +256,8 @@
}
-static int ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags)
+static ngx_int_t
+ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags)
{
int op;
uint32_t prev;
@@ -310,7 +314,8 @@
}
-static int ngx_epoll_add_connection(ngx_connection_t *c)
+static ngx_int_t
+ngx_epoll_add_connection(ngx_connection_t *c)
{
struct epoll_event ee;
@@ -333,7 +338,8 @@
}
-static int ngx_epoll_del_connection(ngx_connection_t *c, u_int flags)
+static ngx_int_t
+ngx_epoll_del_connection(ngx_connection_t *c, u_int flags)
{
int op;
struct epoll_event ee;
@@ -370,7 +376,8 @@
}
-int ngx_epoll_process_events(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_epoll_process_events(ngx_cycle_t *cycle)
{
int events;
size_t n;
@@ -651,7 +658,8 @@
}
-static void *ngx_epoll_create_conf(ngx_cycle_t *cycle)
+static void *
+ngx_epoll_create_conf(ngx_cycle_t *cycle)
{
ngx_epoll_conf_t *epcf;
@@ -664,7 +672,8 @@
}
-static char *ngx_epoll_init_conf(ngx_cycle_t *cycle, void *conf)
+static char *
+ngx_epoll_init_conf(ngx_cycle_t *cycle, void *conf)
{
ngx_epoll_conf_t *epcf = conf;
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 49770fd..b4555d9 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -24,7 +24,7 @@
static ngx_int_t ngx_kqueue_process_changes(ngx_cycle_t *cycle, ngx_uint_t try);
static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle);
static ngx_inline void ngx_kqueue_dump_event(ngx_log_t *log,
- struct kevent *kev);
+ struct kevent *kev);
static void *ngx_kqueue_create_conf(ngx_cycle_t *cycle);
static char *ngx_kqueue_init_conf(ngx_cycle_t *cycle, void *conf);
@@ -55,21 +55,21 @@
static ngx_command_t ngx_kqueue_commands[] = {
- {ngx_string("kqueue_changes"),
- NGX_EVENT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_kqueue_conf_t, changes),
- NULL},
+ { ngx_string("kqueue_changes"),
+ NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ 0,
+ offsetof(ngx_kqueue_conf_t, changes),
+ NULL },
- {ngx_string("kqueue_events"),
- NGX_EVENT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_kqueue_conf_t, events),
- NULL},
+ { ngx_string("kqueue_events"),
+ NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ 0,
+ offsetof(ngx_kqueue_conf_t, events),
+ NULL },
- ngx_null_command
+ ngx_null_command
};
@@ -104,7 +104,8 @@
-static ngx_int_t ngx_kqueue_init(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_kqueue_init(ngx_cycle_t *cycle)
{
struct timespec ts;
ngx_kqueue_conf_t *kcf;
@@ -203,7 +204,8 @@
}
-static void ngx_kqueue_done(ngx_cycle_t *cycle)
+static void
+ngx_kqueue_done(ngx_cycle_t *cycle)
{
if (close(ngx_kqueue) == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
@@ -231,7 +233,8 @@
}
-static ngx_int_t ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags)
+static ngx_int_t
+ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags)
{
ngx_int_t rc;
ngx_event_t *e;
@@ -295,7 +298,8 @@
}
-static ngx_int_t ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags)
+static ngx_int_t
+ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags)
{
ngx_int_t rc;
ngx_event_t *e;
@@ -358,7 +362,8 @@
}
-static ngx_int_t ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
+static ngx_int_t
+ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
{
struct kevent *kev;
struct timespec ts;
@@ -425,7 +430,8 @@
}
-static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_kqueue_process_events(ngx_cycle_t *cycle)
{
int events, n;
ngx_int_t i, instance;
@@ -715,7 +721,8 @@
}
-static ngx_int_t ngx_kqueue_process_changes(ngx_cycle_t *cycle, ngx_uint_t try)
+static ngx_int_t
+ngx_kqueue_process_changes(ngx_cycle_t *cycle, ngx_uint_t try)
{
int n;
ngx_int_t rc;
@@ -772,7 +779,8 @@
}
-static ngx_inline void ngx_kqueue_dump_event(ngx_log_t *log, struct kevent *kev)
+static ngx_inline void
+ngx_kqueue_dump_event(ngx_log_t *log, struct kevent *kev)
{
ngx_log_debug6(NGX_LOG_DEBUG_EVENT, log, 0,
(kev->ident > 0x8000000 && kev->ident != (unsigned) -1) ?
@@ -784,7 +792,8 @@
}
-static void *ngx_kqueue_create_conf(ngx_cycle_t *cycle)
+static void *
+ngx_kqueue_create_conf(ngx_cycle_t *cycle)
{
ngx_kqueue_conf_t *kcf;
@@ -798,7 +807,8 @@
}
-static char *ngx_kqueue_init_conf(ngx_cycle_t *cycle, void *conf)
+static char *
+ngx_kqueue_init_conf(ngx_cycle_t *cycle, void *conf)
{
ngx_kqueue_conf_t *kcf = conf;
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index 12726b5..6ea3af4 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -60,7 +60,8 @@
-static ngx_int_t ngx_poll_init(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_poll_init(ngx_cycle_t *cycle)
{
struct pollfd *list;
@@ -106,7 +107,8 @@
}
-static void ngx_poll_done(ngx_cycle_t *cycle)
+static void
+ngx_poll_done(ngx_cycle_t *cycle)
{
ngx_free(event_list);
#if 0
@@ -120,7 +122,8 @@
}
-static ngx_int_t ngx_poll_add_event(ngx_event_t *ev, int event, u_int flags)
+static ngx_int_t
+ngx_poll_add_event(ngx_event_t *ev, int event, u_int flags)
{
ngx_event_t *e;
ngx_connection_t *c;
@@ -173,7 +176,8 @@
}
-static ngx_int_t ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags)
+static ngx_int_t
+ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags)
{
ngx_uint_t i;
ngx_cycle_t **cycle;
@@ -260,7 +264,8 @@
}
-static ngx_int_t ngx_poll_process_events(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_poll_process_events(ngx_cycle_t *cycle)
{
int ready, revents;
ngx_int_t i, nready;
@@ -590,7 +595,8 @@
}
-static char *ngx_poll_init_conf(ngx_cycle_t *cycle, void *conf)
+static char *
+ngx_poll_init_conf(ngx_cycle_t *cycle, void *conf)
{
ngx_event_conf_t *ecf;
diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c
index f1df549..07b8bd9 100644
--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -48,7 +48,7 @@
static void *ngx_rtsig_create_conf(ngx_cycle_t *cycle);
static char *ngx_rtsig_init_conf(ngx_cycle_t *cycle, void *conf);
static char *ngx_check_ngx_overflow_threshold_bounds(ngx_conf_t *cf,
- void *post, void *data);
+ void *post, void *data);
static sigset_t set;
@@ -65,35 +65,35 @@
static ngx_command_t ngx_rtsig_commands[] = {
- {ngx_string("rtsig_signo"),
- NGX_EVENT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_rtsig_conf_t, signo),
- NULL},
+ { ngx_string("rtsig_signo"),
+ NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ 0,
+ offsetof(ngx_rtsig_conf_t, signo),
+ NULL },
- {ngx_string("rtsig_overflow_events"),
- NGX_EVENT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_rtsig_conf_t, overflow_events),
- NULL},
+ { ngx_string("rtsig_overflow_events"),
+ NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ 0,
+ offsetof(ngx_rtsig_conf_t, overflow_events),
+ NULL },
- {ngx_string("rtsig_overflow_test"),
- NGX_EVENT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_rtsig_conf_t, overflow_test),
- NULL},
+ { ngx_string("rtsig_overflow_test"),
+ NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ 0,
+ offsetof(ngx_rtsig_conf_t, overflow_test),
+ NULL },
- {ngx_string("rtsig_overflow_threshold"),
- NGX_EVENT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_rtsig_conf_t, overflow_threshold),
- &ngx_overflow_threshold_bounds},
+ { ngx_string("rtsig_overflow_threshold"),
+ NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ 0,
+ offsetof(ngx_rtsig_conf_t, overflow_threshold),
+ &ngx_overflow_threshold_bounds },
- ngx_null_command
+ ngx_null_command
};
@@ -121,13 +121,14 @@
NGX_MODULE,
&ngx_rtsig_module_ctx, /* module context */
ngx_rtsig_commands, /* module directives */
- NGX_EVENT_MODULE, /* module type */
- NULL, /* init module */
- NULL /* init process */
+ NGX_EVENT_MODULE, /* module type */
+ NULL, /* init module */
+ NULL /* init process */
};
-static ngx_int_t ngx_rtsig_init(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_rtsig_init(ngx_cycle_t *cycle)
{
ngx_rtsig_conf_t *rtscf;
@@ -164,7 +165,8 @@
}
-static void ngx_rtsig_done(ngx_cycle_t *cycle)
+static void
+ngx_rtsig_done(ngx_cycle_t *cycle)
{
ngx_free(overflow_list);
@@ -172,7 +174,8 @@
}
-static ngx_int_t ngx_rtsig_add_connection(ngx_connection_t *c)
+static ngx_int_t
+ngx_rtsig_add_connection(ngx_connection_t *c)
{
int signo;
ngx_rtsig_conf_t *rtscf;
@@ -232,7 +235,8 @@
}
-static ngx_int_t ngx_rtsig_del_connection(ngx_connection_t *c, u_int flags)
+static ngx_int_t
+ngx_rtsig_del_connection(ngx_connection_t *c, u_int flags)
{
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
"rtsig del connection: fd:%d", c->fd);
@@ -266,7 +270,8 @@
}
-ngx_int_t ngx_rtsig_process_events(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_rtsig_process_events(ngx_cycle_t *cycle)
{
int signo;
ngx_int_t instance, i;
@@ -562,7 +567,8 @@
/* TODO: old cylces */
-static ngx_int_t ngx_rtsig_process_overflow(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_rtsig_process_overflow(ngx_cycle_t *cycle)
{
int name[2], rtsig_max, rtsig_nr, events, ready;
size_t len;
@@ -766,7 +772,8 @@
}
-static void *ngx_rtsig_create_conf(ngx_cycle_t *cycle)
+static void *
+ngx_rtsig_create_conf(ngx_cycle_t *cycle)
{
ngx_rtsig_conf_t *rtscf;
@@ -782,7 +789,8 @@
}
-static char *ngx_rtsig_init_conf(ngx_cycle_t *cycle, void *conf)
+static char *
+ngx_rtsig_init_conf(ngx_cycle_t *cycle, void *conf)
{
ngx_rtsig_conf_t *rtscf = conf;
@@ -797,7 +805,8 @@
}
-static char *ngx_check_ngx_overflow_threshold_bounds(ngx_conf_t *cf,
+static char *
+ngx_check_ngx_overflow_threshold_bounds(ngx_conf_t *cf,
void *post, void *data)
{
if (ngx_linux_rtsig_max) {
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 38efca0..5a002c0 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -715,7 +715,7 @@
ecf->name = (void *) NGX_CONF_UNSET;
#if (NGX_DEBUG)
- ngx_init_array(ecf->debug_connection, cycle->pool, 5, sizeof(in_addr_t),
+ ngx_init_array(ecf->debug_connection, cycle->pool, 4, sizeof(in_addr_t),
NGX_CONF_ERROR);
#endif
