diff options
Diffstat (limited to 'src/http')
| -rw-r--r-- | src/http/ngx_http.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 13 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.h | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_event.c | 4 |
4 files changed, 9 insertions, 12 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index ffa94cff3..2544436fa 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -500,7 +500,7 @@ static char *ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, char *conf) /* prepare for the next cycle */ - in_port[p].addrs.elts += in_port[p].addrs.size; + (char *) in_port[p].addrs.elts += in_port[p].addrs.size; in_port[p].addrs.nelts--; in_addr = (ngx_http_in_addr_t *) in_port[p].addrs.elts; diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 2b82c2992..9b9d20958 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -267,7 +267,6 @@ void ngx_http_handler(ngx_http_request_t *r) { int rc, i; ngx_http_handler_pt *h; - ngx_http_module_t *module; ngx_http_core_loc_conf_t *lcf, **lcfp; ngx_http_core_srv_conf_t *scf; @@ -349,7 +348,7 @@ ngx_log_debug(r->connection->log, "trans: %s" _ lcfp[i]->name.data); int ngx_http_core_translate_handler(ngx_http_request_t *r) { - int i, rc, len, port_len, f_offset, l_offset; + int len, port_len, f_offset, l_offset; char *buf, *location, *last; ngx_err_t err; ngx_table_elt_t *h; @@ -623,7 +622,7 @@ static int ngx_http_core_init(ngx_pool_t *pool) static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, char *dummy) { - int i, j; + int m; char *rv; ngx_http_module_t *module; ngx_conf_t pcf; @@ -650,12 +649,12 @@ static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, char *dummy) ngx_pcalloc(cf->pool, sizeof(void *) * ngx_http_max_module), NGX_CONF_ERROR); - for (i = 0; ngx_modules[i]; i++) { - if (ngx_modules[i]->type != NGX_HTTP_MODULE_TYPE) { + for (m = 0; ngx_modules[m]; m++) { + if (ngx_modules[m]->type != NGX_HTTP_MODULE_TYPE) { continue; } - module = (ngx_http_module_t *) ngx_modules[i]->ctx; + module = (ngx_http_module_t *) ngx_modules[m]->ctx; if (module->create_srv_conf) { ngx_test_null(ctx->srv_conf[module->index], @@ -995,8 +994,8 @@ static char *ngx_set_listen(ngx_conf_t *cf, ngx_command_t *cmd, char *conf) { ngx_http_core_srv_conf_t *scf = (ngx_http_core_srv_conf_t *) conf; - uint p; char *addr; + u_int p; ngx_str_t *args; ngx_http_listen_t *ls; diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h index c6c86f23a..cfe0d91a5 100644 --- a/src/http/ngx_http_core_module.h +++ b/src/http/ngx_http_core_module.h @@ -73,7 +73,7 @@ typedef struct { #define ngx_http_types_hash_key(key, ext) \ { \ - uint n; \ + u_int n; \ for (key = 0, n = 0; n < ext.len; n++) { \ key += ext.data[n]; \ } \ diff --git a/src/http/ngx_http_event.c b/src/http/ngx_http_event.c index 1b9110fe1..f14dd96ff 100644 --- a/src/http/ngx_http_event.c +++ b/src/http/ngx_http_event.c @@ -695,8 +695,7 @@ static ssize_t ngx_http_read_request_header(ngx_http_request_t *r) void ngx_http_finalize_request(ngx_http_request_t *r, int error) { - int rc, event; - ngx_msec_t timeout; + int rc; ngx_event_t *rev, *wev; rc = error; @@ -794,7 +793,6 @@ void ngx_http_set_write_handler(ngx_http_request_t *r) static void ngx_http_writer(ngx_event_t *wev) { int rc; - ngx_msec_t timeout; ngx_event_t *rev; ngx_connection_t *c; ngx_http_request_t *r; |