diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.c | 2 | ||||
| -rw-r--r-- | src/core/ngx_alloc.c | 1 | ||||
| -rw-r--r-- | src/core/ngx_connection.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_listen.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_modules.c | 2 |
5 files changed, 7 insertions, 2 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 71e014942..7f13a7469 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -67,9 +67,11 @@ int main(int argc, char *const *argv) #endif +#if 0 if (ngx_os_init(&ngx_log) == NGX_ERROR) { exit(1); } +#endif ngx_init_array(ngx_listening_sockets, ngx_pool, 10, sizeof(ngx_listen_t), 1); diff --git a/src/core/ngx_alloc.c b/src/core/ngx_alloc.c index 26c7458a1..f2608f77d 100644 --- a/src/core/ngx_alloc.c +++ b/src/core/ngx_alloc.c @@ -73,6 +73,7 @@ void ngx_destroy_pool(ngx_pool_t *pool) break; } } + pool = NULL; } void *ngx_palloc(ngx_pool_t *pool, size_t size) diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index b5c8c8852..544101b44 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -26,7 +26,7 @@ struct ngx_connection_s { off_t sent; - int (*handler)(ngx_connection_t *c); + void (*handler)(ngx_connection_t *c); void *ctx; ngx_server_t *servers; diff --git a/src/core/ngx_listen.h b/src/core/ngx_listen.h index ea614ef42..1824ef17c 100644 --- a/src/core/ngx_listen.h +++ b/src/core/ngx_listen.h @@ -22,7 +22,7 @@ typedef struct { int protocol; int flags; /* Winsock2 flags */ - int (*handler)(ngx_connection_t *c); /* handler of accepted + void (*handler)(ngx_connection_t *c); /* handler of accepted connection */ void *ctx; /* ngx_http_conf_ctx_t, for example */ void *servers; /* array of ngx_http_in_addr_t, for example */ diff --git a/src/core/ngx_modules.c b/src/core/ngx_modules.c index 165d52731..a6b56c586 100644 --- a/src/core/ngx_modules.c +++ b/src/core/ngx_modules.c @@ -29,7 +29,9 @@ ngx_module_t *ngx_modules[] = { /* &ngx_http_ssi_filter_module, */ &ngx_http_index_module, +/* &ngx_http_proxy_module, +*/ NULL }; |