Mercurial > hg > nginx
changeset 3542:9bf51b3fc1c1
style fix: remove tabs and trailing spaces
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Tue, 01 Jun 2010 15:55:04 +0000 |
| parents | 21452748d165 |
| children | e132566a942e |
| files | conf/uwsgi_params src/http/modules/ngx_http_uwsgi_module.c |
| diffstat | 2 files changed, 607 insertions(+), 607 deletions(-) [+] |
line wrap: on
line diff
--- a/conf/uwsgi_params +++ b/conf/uwsgi_params @@ -5,7 +5,7 @@ uwsgi_param CONTENT_TYPE $content uwsgi_param CONTENT_LENGTH $content_length; uwsgi_param REQUEST_URI $request_uri; -uwsgi_param PATH_INFO $document_uri; +uwsgi_param PATH_INFO $document_uri; uwsgi_param DOCUMENT_ROOT $document_root; uwsgi_param SERVER_PROTOCOL $server_protocol;
--- a/src/http/modules/ngx_http_uwsgi_module.c +++ b/src/http/modules/ngx_http_uwsgi_module.c @@ -48,7 +48,7 @@ typedef struct { ngx_array_t *uwsgi_lengths; ngx_array_t *uwsgi_values; - ngx_str_t uwsgi_string ; + ngx_str_t uwsgi_string ; u_char modifier1; u_char modifier2; @@ -75,32 +75,32 @@ uwsgi_swap16 (uint16_t x) static ngx_int_t ngx_http_uwsgi_eval (ngx_http_request_t * r, - ngx_http_uwsgi_loc_conf_t * uwcf); + ngx_http_uwsgi_loc_conf_t * uwcf); static ngx_int_t ngx_http_uwsgi_create_request (ngx_http_request_t * r); static ngx_int_t ngx_http_uwsgi_reinit_request (ngx_http_request_t * r); static ngx_int_t ngx_http_uwsgi_process_status_line (ngx_http_request_t * r); static ngx_int_t ngx_http_uwsgi_parse_status_line (ngx_http_request_t * r, - ngx_http_uwsgi_ctx_t * - ctx); + ngx_http_uwsgi_ctx_t * + ctx); static ngx_int_t ngx_http_uwsgi_process_header (ngx_http_request_t * r); static ngx_int_t ngx_http_uwsgi_process_header (ngx_http_request_t * r); static void ngx_http_uwsgi_abort_request (ngx_http_request_t * r); static void ngx_http_uwsgi_finalize_request (ngx_http_request_t * r, - ngx_int_t rc); + ngx_int_t rc); static char *ngx_http_uwsgi_modifier1 (ngx_conf_t * cf, ngx_command_t * cmd, - void *conf); + void *conf); static char *ngx_http_uwsgi_modifier2 (ngx_conf_t * cf, ngx_command_t * cmd, - void *conf); + void *conf); static ngx_int_t ngx_http_uwsgi_add_variables (ngx_conf_t * cf); static void *ngx_http_uwsgi_create_loc_conf (ngx_conf_t * cf); static char *ngx_http_uwsgi_merge_loc_conf (ngx_conf_t * cf, - void *parent, void *child); + void *parent, void *child); static char *ngx_http_uwsgi_pass (ngx_conf_t * cf, ngx_command_t * cmd, - void *conf); + void *conf); static ngx_conf_bitmask_t ngx_http_uwsgi_next_upstream_masks[] = { @@ -310,32 +310,32 @@ static ngx_command_t ngx_http_uwsgi_comm static ngx_http_module_t ngx_http_uwsgi_module_ctx = { - ngx_http_uwsgi_add_variables, /* preconfiguration */ - NULL, /* postconfiguration */ + ngx_http_uwsgi_add_variables, /* preconfiguration */ + NULL, /* postconfiguration */ - NULL, /* create main configuration */ - NULL, /* init main configuration */ + NULL, /* create main configuration */ + NULL, /* init main configuration */ - NULL, /* create server configuration */ - NULL, /* merge server configuration */ + NULL, /* create server configuration */ + NULL, /* merge server configuration */ - ngx_http_uwsgi_create_loc_conf, /* create location configuration */ - ngx_http_uwsgi_merge_loc_conf /* merge location configuration */ + ngx_http_uwsgi_create_loc_conf, /* create location configuration */ + ngx_http_uwsgi_merge_loc_conf /* merge location configuration */ }; ngx_module_t ngx_http_uwsgi_module = { NGX_MODULE_V1, - &ngx_http_uwsgi_module_ctx, /* module context */ - ngx_http_uwsgi_commands, /* module directives */ - NGX_HTTP_MODULE, /* module type */ - NULL, /* init master */ - NULL, /* init module */ - NULL, /* init process */ - NULL, /* init thread */ - NULL, /* exit thread */ - NULL, /* exit process */ - NULL, /* exit master */ + &ngx_http_uwsgi_module_ctx, /* module context */ + ngx_http_uwsgi_commands, /* module directives */ + NGX_HTTP_MODULE, /* module type */ + NULL, /* init master */ + NULL, /* init module */ + NULL, /* init process */ + NULL, /* init thread */ + NULL, /* exit thread */ + NULL, /* exit process */ + NULL, /* exit master */ NGX_MODULE_V1_PADDING }; @@ -371,19 +371,19 @@ ngx_http_uwsgi_handler (ngx_http_request ngx_http_uwsgi_loc_conf_t *uwcf; if (r->subrequest_in_memory) { - ngx_log_error (NGX_LOG_ALERT, r->connection->log, 0, - "ngx_http_uwsgi_module does not support " - "subrequest in memory"); - return NGX_HTTP_INTERNAL_SERVER_ERROR; + ngx_log_error (NGX_LOG_ALERT, r->connection->log, 0, + "ngx_http_uwsgi_module does not support " + "subrequest in memory"); + return NGX_HTTP_INTERNAL_SERVER_ERROR; } if (ngx_http_upstream_create (r) != NGX_OK) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; + return NGX_HTTP_INTERNAL_SERVER_ERROR; } f = ngx_pcalloc (r->pool, sizeof (ngx_http_uwsgi_ctx_t)); if (f == NULL) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; + return NGX_HTTP_INTERNAL_SERVER_ERROR; } ngx_http_set_ctx (r, f, ngx_http_uwsgi_module); @@ -391,9 +391,9 @@ ngx_http_uwsgi_handler (ngx_http_request uwcf = ngx_http_get_module_loc_conf (r, ngx_http_uwsgi_module); if (uwcf->uwsgi_lengths) { - if (ngx_http_uwsgi_eval (r, uwcf) != NGX_OK) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; - } + if (ngx_http_uwsgi_eval (r, uwcf) != NGX_OK) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } } u = r->upstream; @@ -415,7 +415,7 @@ ngx_http_uwsgi_handler (ngx_http_request u->pipe = ngx_pcalloc (r->pool, sizeof (ngx_event_pipe_t)); if (u->pipe == NULL) { - return NGX_HTTP_INTERNAL_SERVER_ERROR; + return NGX_HTTP_INTERNAL_SERVER_ERROR; } u->pipe->input_filter = ngx_event_pipe_copy_input_filter; @@ -424,7 +424,7 @@ ngx_http_uwsgi_handler (ngx_http_request rc = ngx_http_read_client_request_body (r, ngx_http_upstream_init); if (rc >= NGX_HTTP_SPECIAL_RESPONSE) { - return rc; + return rc; } return NGX_DONE; @@ -439,44 +439,44 @@ ngx_http_uwsgi_eval (ngx_http_request_t ngx_memzero (&u, sizeof (ngx_url_t)); if (ngx_http_script_run (r, &u.url, uwcf->uwsgi_lengths->elts, 0, - uwcf->uwsgi_values->elts) == NULL) { - return NGX_ERROR; + uwcf->uwsgi_values->elts) == NULL) { + return NGX_ERROR; } u.no_resolve = 1; if (ngx_parse_url (r->pool, &u) != NGX_OK) { - if (u.err) { - ngx_log_error (NGX_LOG_ERR, r->connection->log, 0, - "%s in upstream \"%V\"", u.err, &u.url); - } + if (u.err) { + ngx_log_error (NGX_LOG_ERR, r->connection->log, 0, + "%s in upstream \"%V\"", u.err, &u.url); + } - return NGX_ERROR; + return NGX_ERROR; } if (u.no_port) { - ngx_log_error (NGX_LOG_ERR, r->connection->log, 0, - "no port in upstream \"%V\"", &u.url); - return NGX_ERROR; + ngx_log_error (NGX_LOG_ERR, r->connection->log, 0, + "no port in upstream \"%V\"", &u.url); + return NGX_ERROR; } r->upstream->resolved = ngx_pcalloc (r->pool, - sizeof - (ngx_http_upstream_resolved_t)); + sizeof + (ngx_http_upstream_resolved_t)); if (r->upstream->resolved == NULL) { - return NGX_ERROR; + return NGX_ERROR; } if (u.addrs && u.addrs[0].sockaddr) { - r->upstream->resolved->sockaddr = u.addrs[0].sockaddr; - r->upstream->resolved->socklen = u.addrs[0].socklen; - r->upstream->resolved->naddrs = 1; - r->upstream->resolved->host = u.addrs[0].name; + r->upstream->resolved->sockaddr = u.addrs[0].sockaddr; + r->upstream->resolved->socklen = u.addrs[0].socklen; + r->upstream->resolved->naddrs = 1; + r->upstream->resolved->host = u.addrs[0].name; } else { - r->upstream->resolved->host = u.host; - r->upstream->resolved->port = u.port; + r->upstream->resolved->host = u.host; + r->upstream->resolved->port = u.port; } return NGX_OK; @@ -504,71 +504,71 @@ ngx_http_uwsgi_create_request (ngx_http_ uwcf = ngx_http_get_module_loc_conf (r, ngx_http_uwsgi_module); if (uwcf->params_len) { - ngx_memzero (&le, sizeof (ngx_http_script_engine_t)); + ngx_memzero (&le, sizeof (ngx_http_script_engine_t)); - ngx_http_script_flush_no_cacheable_variables (r, uwcf->flushes); - le.flushed = 1; + ngx_http_script_flush_no_cacheable_variables (r, uwcf->flushes); + le.flushed = 1; - le.ip = uwcf->params_len->elts; - le.request = r; + le.ip = uwcf->params_len->elts; + le.request = r; - while (*(uintptr_t *) le.ip) { + while (*(uintptr_t *) le.ip) { - lcode = *(ngx_http_script_len_code_pt *) le.ip; - key_len = lcode (&le); + lcode = *(ngx_http_script_len_code_pt *) le.ip; + key_len = lcode (&le); - for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode (&le)) { - lcode = *(ngx_http_script_len_code_pt *) le.ip; - } - le.ip += sizeof (uintptr_t); + for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode (&le)) { + lcode = *(ngx_http_script_len_code_pt *) le.ip; + } + le.ip += sizeof (uintptr_t); - uwsgi_pkt_size += 2 + key_len + 2 + val_len; - } + uwsgi_pkt_size += 2 + key_len + 2 + val_len; + } } if (uwcf->upstream.pass_request_headers) { - part = &r->headers_in.headers.part; - header = part->elts; + part = &r->headers_in.headers.part; + header = part->elts; - for (i = 0; /* void */ ; i++) { + for (i = 0; /* void */ ; i++) { - if (i >= part->nelts) { - if (part->next == NULL) { - break; - } + if (i >= part->nelts) { + if (part->next == NULL) { + break; + } - part = part->next; - header = part->elts; - i = 0; - } + part = part->next; + header = part->elts; + i = 0; + } - uwsgi_pkt_size += - 2 + 5 + header[i].key.len + 2 + header[i].value.len; - } + uwsgi_pkt_size += + 2 + 5 + header[i].key.len + 2 + header[i].value.len; + } } if (uwcf->uwsgi_string.data && uwcf->uwsgi_string.len) { - uwsgi_pkt_size += uwcf->uwsgi_string.len ; + uwsgi_pkt_size += uwcf->uwsgi_string.len ; } - /* allow custom uwsgi packet + /* allow custom uwsgi packet if (uwsgi_pkt_size > 0 && uwsgi_pkt_size < 2) { - ngx_log_error (NGX_LOG_ALERT, r->connection->log, 0, - "uwsgi request is too little: %uz", uwsgi_pkt_size); - return NGX_ERROR; + ngx_log_error (NGX_LOG_ALERT, r->connection->log, 0, + "uwsgi request is too little: %uz", uwsgi_pkt_size); + return NGX_ERROR; } */ b = ngx_create_temp_buf (r->pool, uwsgi_pkt_size + 4); if (b == NULL) { - return NGX_ERROR; + return NGX_ERROR; } cl = ngx_alloc_chain_link (r->pool); if (cl == NULL) { - return NGX_ERROR; + return NGX_ERROR; } cl->buf = b; @@ -582,148 +582,148 @@ ngx_http_uwsgi_create_request (ngx_http_ b->last++; if (uwcf->params_len) { - ngx_memzero (&e, sizeof (ngx_http_script_engine_t)); + ngx_memzero (&e, sizeof (ngx_http_script_engine_t)); - e.ip = uwcf->params->elts; - e.pos = b->last; - e.request = r; - e.flushed = 1; + e.ip = uwcf->params->elts; + e.pos = b->last; + e.request = r; + e.flushed = 1; - le.ip = uwcf->params_len->elts; + le.ip = uwcf->params_len->elts; - while (*(uintptr_t *) le.ip) { + while (*(uintptr_t *) le.ip) { - lcode = *(ngx_http_script_len_code_pt *) le.ip; - key_len = (u_char) lcode (&le); + lcode = *(ngx_http_script_len_code_pt *) le.ip; + key_len = (u_char) lcode (&le); - for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode (&le)) { - lcode = *(ngx_http_script_len_code_pt *) le.ip; - } - le.ip += sizeof (uintptr_t); + for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode (&le)) { + lcode = *(ngx_http_script_len_code_pt *) le.ip; + } + le.ip += sizeof (uintptr_t); #ifndef NGX_HAVE_LITTLE_ENDIAN - uwsgi_strlen = uwsgi_swap16 (key_len); + uwsgi_strlen = uwsgi_swap16 (key_len); #else - uwsgi_strlen = key_len; + uwsgi_strlen = key_len; #endif - e.pos = ngx_cpymem (e.pos, &uwsgi_strlen, 2); + e.pos = ngx_cpymem (e.pos, &uwsgi_strlen, 2); - while (*(uintptr_t *) e.ip) { - code = *(ngx_http_script_code_pt *) e.ip; - code ((ngx_http_script_engine_t *) & e); - } + while (*(uintptr_t *) e.ip) { + code = *(ngx_http_script_code_pt *) e.ip; + code ((ngx_http_script_engine_t *) & e); + } - pos = e.pos - val_len; - /* move memory */ - for (i = 0; i < val_len; i += 2) { - e.pos = ngx_cpymem (tmp, pos + (i) + 2, 2); - e.pos = ngx_cpymem (pos + (i) + 2, pos, 2); - e.pos = ngx_cpymem (pos, tmp, 2); - } + pos = e.pos - val_len; + /* move memory */ + for (i = 0; i < val_len; i += 2) { + e.pos = ngx_cpymem (tmp, pos + (i) + 2, 2); + e.pos = ngx_cpymem (pos + (i) + 2, pos, 2); + e.pos = ngx_cpymem (pos, tmp, 2); + } - e.pos = pos; + e.pos = pos; #ifndef NGX_HAVE_LITTLE_ENDIAN - uwsgi_strlen = uwsgi_swap16 (val_len); + uwsgi_strlen = uwsgi_swap16 (val_len); #else - uwsgi_strlen = val_len; + uwsgi_strlen = val_len; #endif - e.pos = ngx_cpymem (e.pos, &uwsgi_strlen, 2); - e.pos += val_len; + e.pos = ngx_cpymem (e.pos, &uwsgi_strlen, 2); + e.pos += val_len; - e.ip += sizeof (uintptr_t); + e.ip += sizeof (uintptr_t); - } + } - b->last = e.pos; + b->last = e.pos; } if (uwcf->upstream.pass_request_headers) { - part = &r->headers_in.headers.part; - header = part->elts; + part = &r->headers_in.headers.part; + header = part->elts; - for (i = 0; /* void */ ; i++) { + for (i = 0; /* void */ ; i++) { - if (i >= part->nelts) { - if (part->next == NULL) { - break; - } + if (i >= part->nelts) { + if (part->next == NULL) { + break; + } - part = part->next; - header = part->elts; - i = 0; - } + part = part->next; + header = part->elts; + i = 0; + } #ifndef NGX_HAVE_LITTLE_ENDIAN - uwsgi_strlen = uwsgi_swap16 (5 + header[i].key.len); + uwsgi_strlen = uwsgi_swap16 (5 + header[i].key.len); #else - uwsgi_strlen = 5 + header[i].key.len; + uwsgi_strlen = 5 + header[i].key.len; #endif - b->last = ngx_cpymem (b->last, &uwsgi_strlen, 2); - b->last = ngx_cpymem (b->last, "HTTP_", 5); - for (n = 0; n < header[i].key.len; n++) { - ch = header[i].key.data[n]; + b->last = ngx_cpymem (b->last, &uwsgi_strlen, 2); + b->last = ngx_cpymem (b->last, "HTTP_", 5); + for (n = 0; n < header[i].key.len; n++) { + ch = header[i].key.data[n]; - if (ch >= 'a' && ch <= 'z') { - ch &= ~0x20; + if (ch >= 'a' && ch <= 'z') { + ch &= ~0x20; - } - else if (ch == '-') { - ch = '_'; - } + } + else if (ch == '-') { + ch = '_'; + } - *b->last++ = ch; - } + *b->last++ = ch; + } #ifndef NGX_HAVE_LITTLE_ENDIAN - uwsgi_strlen = uwsgi_swap16 (header[i].value.len); + uwsgi_strlen = uwsgi_swap16 (header[i].value.len); #else - uwsgi_strlen = header[i].value.len; + uwsgi_strlen = header[i].value.len; #endif - b->last = ngx_cpymem (b->last, &uwsgi_strlen, 2); - b->last = - ngx_copy (b->last, header[i].value.data, header[i].value.len); + b->last = ngx_cpymem (b->last, &uwsgi_strlen, 2); + b->last = + ngx_copy (b->last, header[i].value.data, header[i].value.len); - } + } } if (uwcf->uwsgi_string.data && uwcf->uwsgi_string.len) { - b->last = ngx_copy(b->last, uwcf->uwsgi_string.data, uwcf->uwsgi_string.len); + b->last = ngx_copy(b->last, uwcf->uwsgi_string.data, uwcf->uwsgi_string.len); } if (uwcf->upstream.pass_request_body) { - body = r->upstream->request_bufs; - r->upstream->request_bufs = cl; + body = r->upstream->request_bufs; + r->upstream->request_bufs = cl; - while (body) { - b = ngx_alloc_buf (r->pool); - if (b == NULL) { - return NGX_ERROR; - } + while (body) { + b = ngx_alloc_buf (r->pool); + if (b == NULL) { + return NGX_ERROR; + } - ngx_memcpy (b, body->buf, sizeof (ngx_buf_t)); + ngx_memcpy (b, body->buf, sizeof (ngx_buf_t)); - cl->next = ngx_alloc_chain_link (r->pool); - if (cl->next == NULL) { - return NGX_ERROR; - } + cl->next = ngx_alloc_chain_link (r->pool); + if (cl->next == NULL) { + return NGX_ERROR; + } - cl = cl->next; - cl->buf = b; + cl = cl->next; + cl->buf = b; - body = body->next; - } + body = body->next; + } - b->flush = 1; + b->flush = 1; } else { - r->upstream->request_bufs = cl; + r->upstream->request_bufs = cl; } cl->next = NULL; @@ -741,7 +741,7 @@ ngx_http_uwsgi_reinit_request (ngx_http_ s = ngx_http_get_module_ctx (r, ngx_http_uwsgi_module); if (s == NULL) { - return NGX_OK; + return NGX_OK; } s->status = 0; @@ -756,25 +756,25 @@ ngx_http_uwsgi_reinit_request (ngx_http_ static ngx_int_t ngx_http_uwsgi_parse_status_line (ngx_http_request_t * r, - ngx_http_uwsgi_ctx_t * ctx) + ngx_http_uwsgi_ctx_t * ctx) { u_char ch; u_char *p; ngx_http_upstream_t *u; enum { - sw_start = 0, - sw_H, - sw_HT, - sw_HTT, - sw_HTTP, - sw_first_major_digit, - sw_major_digit, - sw_first_minor_digit, - sw_minor_digit, - sw_status, - sw_space_after_status, - sw_status_text, - sw_almost_done + sw_start = 0, + sw_H, + sw_HT, + sw_HTT, + sw_HTTP, + sw_first_major_digit, + sw_major_digit, + sw_first_minor_digit, + sw_minor_digit, + sw_status, + sw_space_after_status, + sw_status_text, + sw_almost_done } state; u = r->upstream; @@ -782,165 +782,165 @@ ngx_http_uwsgi_parse_status_line (ngx_ht state = r->state; for (p = u->buffer.pos; p < u->buffer.last; p++) { - ch = *p; + ch = *p; - switch (state) { + switch (state) { - /* "HTTP/" */ - case sw_start: - switch (ch) { - case 'H': - state = sw_H; - break; - default: - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } - break; + /* "HTTP/" */ + case sw_start: + switch (ch) { + case 'H': + state = sw_H; + break; + default: + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } + break; - case sw_H: - switch (ch) { - case 'T': - state = sw_HT; - break; - default: - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } - break; + case sw_H: + switch (ch) { + case 'T': + state = sw_HT; + break; + default: + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } + break; - case sw_HT: - switch (ch) { - case 'T': - state = sw_HTT; - break; - default: - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } - break; + case sw_HT: + switch (ch) { + case 'T': + state = sw_HTT; + break; + default: + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } + break; - case sw_HTT: - switch (ch) { - case 'P': - state = sw_HTTP; - break; - default: - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } - break; + case sw_HTT: + switch (ch) { + case 'P': + state = sw_HTTP; + break; + default: + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } + break; - case sw_HTTP: - switch (ch) { - case '/': - state = sw_first_major_digit; - break; - default: - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } - break; + case sw_HTTP: + switch (ch) { + case '/': + state = sw_first_major_digit; + break; + default: + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } + break; - /* the first digit of major HTTP version */ - case sw_first_major_digit: - if (ch < '1' || ch > '9') { - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } + /* the first digit of major HTTP version */ + case sw_first_major_digit: + if (ch < '1' || ch > '9') { + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } - state = sw_major_digit; - break; + state = sw_major_digit; + break; - /* the major HTTP version or dot */ - case sw_major_digit: - if (ch == '.') { - state = sw_first_minor_digit; - break; - } + /* the major HTTP version or dot */ + case sw_major_digit: + if (ch == '.') { + state = sw_first_minor_digit; + break; + } - if (ch < '0' || ch > '9') { - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } + if (ch < '0' || ch > '9') { + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } - break; + break; - /* the first digit of minor HTTP version */ - case sw_first_minor_digit: - if (ch < '0' || ch > '9') { - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } + /* the first digit of minor HTTP version */ + case sw_first_minor_digit: + if (ch < '0' || ch > '9') { + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } - state = sw_minor_digit; - break; + state = sw_minor_digit; + break; - /* the minor HTTP version or the end of the request line */ - case sw_minor_digit: - if (ch == ' ') { - state = sw_status; - break; - } + /* the minor HTTP version or the end of the request line */ + case sw_minor_digit: + if (ch == ' ') { + state = sw_status; + break; + } - if (ch < '0' || ch > '9') { - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } + if (ch < '0' || ch > '9') { + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } - break; + break; - /* HTTP status code */ - case sw_status: - if (ch == ' ') { - break; - } + /* HTTP status code */ + case sw_status: + if (ch == ' ') { + break; + } - if (ch < '0' || ch > '9') { - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } + if (ch < '0' || ch > '9') { + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } - ctx->status = ctx->status * 10 + ch - '0'; + ctx->status = ctx->status * 10 + ch - '0'; - if (++ctx->status_count == 3) { - state = sw_space_after_status; - ctx->status_start = p - 2; - } + if (++ctx->status_count == 3) { + state = sw_space_after_status; + ctx->status_start = p - 2; + } - break; + break; - /* space or end of line */ - case sw_space_after_status: - switch (ch) { - case ' ': - state = sw_status_text; - break; - case '.': /* IIS may send 403.1, 403.2, etc */ - state = sw_status_text; - break; - case CR: - state = sw_almost_done; - break; - case LF: - goto done; - default: - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } - break; + /* space or end of line */ + case sw_space_after_status: + switch (ch) { + case ' ': + state = sw_status_text; + break; + case '.': /* IIS may send 403.1, 403.2, etc */ + state = sw_status_text; + break; + case CR: + state = sw_almost_done; + break; + case LF: + goto done; + default: + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } + break; - /* any text until end of line */ - case sw_status_text: - switch (ch) { - case CR: - state = sw_almost_done; + /* any text until end of line */ + case sw_status_text: + switch (ch) { + case CR: + state = sw_almost_done; - break; - case LF: - goto done; - } - break; + break; + case LF: + goto done; + } + break; - /* end of status line */ - case sw_almost_done: - ctx->status_end = p - 1; - switch (ch) { - case LF: - goto done; - default: - return NGX_HTTP_XCGI_PARSE_NO_HEADER; - } - } + /* end of status line */ + case sw_almost_done: + ctx->status_end = p - 1; + switch (ch) { + case LF: + goto done; + default: + return NGX_HTTP_XCGI_PARSE_NO_HEADER; + } + } } u->buffer.pos = p; @@ -953,7 +953,7 @@ ngx_http_uwsgi_parse_status_line (ngx_ht u->buffer.pos = p + 1; if (ctx->status_end == NULL) { - ctx->status_end = p; + ctx->status_end = p; } r->state = sw_start; @@ -972,49 +972,49 @@ ngx_http_uwsgi_process_status_line (ngx_ ctx = ngx_http_get_module_ctx (r, ngx_http_uwsgi_module); if (ctx == NULL) { - return NGX_ERROR; + return NGX_ERROR; } rc = ngx_http_uwsgi_parse_status_line (r, ctx); if (rc == NGX_AGAIN) { - return rc; + return rc; } u = r->upstream; if (rc == NGX_HTTP_XCGI_PARSE_NO_HEADER) { - ngx_log_error (NGX_LOG_ERR, r->connection->log, 0, - "upstream sent no valid HTTP/1.0 header"); + ngx_log_error (NGX_LOG_ERR, r->connection->log, 0, + "upstream sent no valid HTTP/1.0 header"); - r->http_version = NGX_HTTP_VERSION_9; - u->headers_in.status_n = NGX_HTTP_OK; - u->state->status = NGX_HTTP_OK; + r->http_version = NGX_HTTP_VERSION_9; + u->headers_in.status_n = NGX_HTTP_OK; + u->state->status = NGX_HTTP_OK; - return NGX_OK; + return NGX_OK; } if (u->state) { - u->state->status = ctx->status; + u->state->status = ctx->status; } u->headers_in.status_n = ctx->status; u->headers_in.status_line.len = ctx->status_end - ctx->status_start; u->headers_in.status_line.data = ngx_pnalloc (r->pool, - u->headers_in. - status_line.len); + u->headers_in. + status_line.len); if (u->headers_in.status_line.data == NULL) { - return NGX_ERROR; + return NGX_ERROR; } ngx_memcpy (u->headers_in.status_line.data, ctx->status_start, - u->headers_in.status_line.len); + u->headers_in.status_line.len); ngx_log_debug2 (NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http uwsgi status %ui \"%V\"", - u->headers_in.status_n, &u->headers_in.status_line); + "http uwsgi status %ui \"%V\"", + u->headers_in.status_n, &u->headers_in.status_line); u->process_header = ngx_http_uwsgi_process_header; @@ -1034,116 +1034,116 @@ ngx_http_uwsgi_process_header (ngx_http_ for (;;) { - rc = ngx_http_parse_header_line (r, &r->upstream->buffer, 1); + rc = ngx_http_parse_header_line (r, &r->upstream->buffer, 1); - if (rc == NGX_OK) { + if (rc == NGX_OK) { - /* a header line has been parsed successfully */ + /* a header line has been parsed successfully */ - h = ngx_list_push (&r->upstream->headers_in.headers); - if (h == NULL) { - return NGX_ERROR; - } + h = ngx_list_push (&r->upstream->headers_in.headers); + if (h == NULL) { + return NGX_ERROR; + } - h->hash = r->header_hash; + h->hash = r->header_hash; - h->key.len = r->header_name_end - r->header_name_start; - h->value.len = r->header_end - r->header_start; + h->key.len = r->header_name_end - r->header_name_start; + h->value.len = r->header_end - r->header_start; - h->key.data = ngx_pnalloc (r->pool, - h->key.len + 1 + h->value.len + 1 + - h->key.len); - if (h->key.data == NULL) { - return NGX_ERROR; - } + h->key.data = ngx_pnalloc (r->pool, + h->key.len + 1 + h->value.len + 1 + + h->key.len); + if (h->key.data == NULL) { + return NGX_ERROR; + } - h->value.data = h->key.data + h->key.len + 1; - h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1; + h->value.data = h->key.data + h->key.len + 1; + h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1; - ngx_cpystrn (h->key.data, r->header_name_start, h->key.len + 1); - ngx_cpystrn (h->value.data, r->header_start, h->value.len + 1); + ngx_cpystrn (h->key.data, r->header_name_start, h->key.len + 1); + ngx_cpystrn (h->value.data, r->header_start, h->value.len + 1); - if (h->key.len == r->lowcase_index) { - ngx_memcpy (h->lowcase_key, r->lowcase_header, h->key.len); + if (h->key.len == r->lowcase_index) { + ngx_memcpy (h->lowcase_key, r->lowcase_header, h->key.len); - } - else { - ngx_strlow (h->lowcase_key, h->key.data, h->key.len); - } + } + else { + ngx_strlow (h->lowcase_key, h->key.data, h->key.len); + } - hh = ngx_hash_find (&umcf->headers_in_hash, h->hash, - h->lowcase_key, h->key.len); + hh = ngx_hash_find (&umcf->headers_in_hash, h->hash, + h->lowcase_key, h->key.len); - if (hh && hh->handler (r, h, hh->offset) != NGX_OK) { - return NGX_ERROR; - } + if (hh && hh->handler (r, h, hh->offset) != NGX_OK) { + return NGX_ERROR; + } - ngx_log_debug2 (NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http uwsgi header: \"%V: %V\"", - &h->key, &h->value); + ngx_log_debug2 (NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http uwsgi header: \"%V: %V\"", + &h->key, &h->value); - continue; - } + continue; + } - if (rc == NGX_HTTP_PARSE_HEADER_DONE) { + if (rc == NGX_HTTP_PARSE_HEADER_DONE) { - /* a whole header has been parsed successfully */ + /* a whole header has been parsed successfully */ - ngx_log_debug0 (NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http uwsgi header done"); + ngx_log_debug0 (NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http uwsgi header done"); - /* - * if no "Server" and "Date" in header line, - * then add the special empty headers - */ + /* + * if no "Server" and "Date" in header line, + * then add the special empty headers + */ - if (r->upstream->headers_in.server == NULL) { - h = ngx_list_push (&r->upstream->headers_in.headers); - if (h == NULL) { - return NGX_ERROR; - } + if (r->upstream->headers_in.server == NULL) { + h = ngx_list_push (&r->upstream->headers_in.headers); + if (h == NULL) { + return NGX_ERROR; + } - h->hash = - ngx_hash (ngx_hash - (ngx_hash - (ngx_hash (ngx_hash ('s', 'e'), 'r'), - 'v'), 'e'), 'r'); + h->hash = + ngx_hash (ngx_hash + (ngx_hash + (ngx_hash (ngx_hash ('s', 'e'), 'r'), + 'v'), 'e'), 'r'); - h->key.len = sizeof ("Server") - 1; - h->key.data = (u_char *) "Server"; - h->value.len = 0; - h->value.data = NULL; - h->lowcase_key = (u_char *) "server"; - } + h->key.len = sizeof ("Server") - 1; + h->key.data = (u_char *) "Server"; + h->value.len = 0; + h->value.data = NULL; + h->lowcase_key = (u_char *) "server"; + } - if (r->upstream->headers_in.date == NULL) { - h = ngx_list_push (&r->upstream->headers_in.headers); - if (h == NULL) { - return NGX_ERROR; - } + if (r->upstream->headers_in.date == NULL) { + h = ngx_list_push (&r->upstream->headers_in.headers); + if (h == NULL) { + return NGX_ERROR; + } - h->hash = ngx_hash (ngx_hash (ngx_hash ('d', 'a'), 't'), 'e'); + h->hash = ngx_hash (ngx_hash (ngx_hash ('d', 'a'), 't'), 'e'); - h->key.len = sizeof ("Date") - 1; - h->key.data = (u_char *) "Date"; - h->value.len = 0; - h->value.data = NULL; - h->lowcase_key = (u_char *) "date"; - } + h->key.len = sizeof ("Date") - 1; + h->key.data = (u_char *) "Date"; + h->value.len = 0; + h->value.data = NULL; + h->lowcase_key = (u_char *) "date"; + } - return NGX_OK; - } + return NGX_OK; + } - if (rc == NGX_AGAIN) { - return NGX_AGAIN; - } + if (rc == NGX_AGAIN) { + return NGX_AGAIN; + } - /* there was error while a header line parsing */ + /* there was error while a header line parsing */ - ngx_log_error (NGX_LOG_ERR, r->connection->log, 0, - "upstream sent invalid header"); + ngx_log_error (NGX_LOG_ERR, r->connection->log, 0, + "upstream sent invalid header"); - return NGX_HTTP_UPSTREAM_INVALID_HEADER; + return NGX_HTTP_UPSTREAM_INVALID_HEADER; } } @@ -1152,7 +1152,7 @@ static void ngx_http_uwsgi_abort_request (ngx_http_request_t * r) { ngx_log_debug0 (NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "abort http uwsgi request"); + "abort http uwsgi request"); return; } @@ -1162,7 +1162,7 @@ static void ngx_http_uwsgi_finalize_request (ngx_http_request_t * r, ngx_int_t rc) { ngx_log_debug0 (NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "finalize http uwsgi request"); + "finalize http uwsgi request"); return; } @@ -1174,13 +1174,13 @@ ngx_http_uwsgi_add_variables (ngx_conf_t ngx_http_variable_t *var, *v; for (v = ngx_http_uwsgi_vars; v->name.len; v++) { - var = ngx_http_add_variable (cf, &v->name, v->flags); - if (var == NULL) { - return NGX_ERROR; - } + var = ngx_http_add_variable (cf, &v->name, v->flags); + if (var == NULL) { + return NGX_ERROR; + } - var->get_handler = v->get_handler; - var->data = v->data; + var->get_handler = v->get_handler; + var->data = v->data; } return NGX_OK; @@ -1194,7 +1194,7 @@ ngx_http_uwsgi_create_loc_conf (ngx_conf conf = ngx_pcalloc (cf->pool, sizeof (ngx_http_uwsgi_loc_conf_t)); if (conf == NULL) { - return NULL; + return NULL; } conf->upstream.store = NGX_CONF_UNSET; @@ -1244,162 +1244,162 @@ ngx_http_uwsgi_merge_loc_conf (ngx_conf_ ngx_http_script_copy_code_t *copy; if (conf->upstream.store != 0) { - ngx_conf_merge_value (conf->upstream.store, prev->upstream.store, 0); + ngx_conf_merge_value (conf->upstream.store, prev->upstream.store, 0); - if (conf->upstream.store_lengths == NULL) { - conf->upstream.store_lengths = prev->upstream.store_lengths; - conf->upstream.store_values = prev->upstream.store_values; - } + if (conf->upstream.store_lengths == NULL) { + conf->upstream.store_lengths = prev->upstream.store_lengths; + conf->upstream.store_values = prev->upstream.store_values; + } } ngx_conf_merge_uint_value (conf->upstream.store_access, - prev->upstream.store_access, 0600); + prev->upstream.store_access, 0600); ngx_conf_merge_value (conf->upstream.buffering, - prev->upstream.buffering, 1); + prev->upstream.buffering, 1); ngx_conf_merge_value (conf->upstream.ignore_client_abort, - prev->upstream.ignore_client_abort, 0); + prev->upstream.ignore_client_abort, 0); ngx_conf_merge_msec_value (conf->upstream.connect_timeout, - prev->upstream.connect_timeout, 60000); + prev->upstream.connect_timeout, 60000); ngx_conf_merge_msec_value (conf->upstream.send_timeout, - prev->upstream.send_timeout, 60000); + prev->upstream.send_timeout, 60000); ngx_conf_merge_msec_value (conf->upstream.read_timeout, - prev->upstream.read_timeout, 60000); + prev->upstream.read_timeout, 60000); ngx_conf_merge_size_value (conf->upstream.send_lowat, - prev->upstream.send_lowat, 0); + prev->upstream.send_lowat, 0); ngx_conf_merge_size_value (conf->upstream.buffer_size, - prev->upstream.buffer_size, - (size_t) ngx_pagesize); + prev->upstream.buffer_size, + (size_t) ngx_pagesize); ngx_conf_merge_bufs_value (conf->upstream.bufs, prev->upstream.bufs, - 8, ngx_pagesize); + 8, ngx_pagesize); if (conf->upstream.bufs.num < 2) { - ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, - "there must be at least 2 \"uwsgi_buffers\""); - return NGX_CONF_ERROR; + ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, + "there must be at least 2 \"uwsgi_buffers\""); + return NGX_CONF_ERROR; } size = conf->upstream.buffer_size; if (size < conf->upstream.bufs.size) { - size = conf->upstream.bufs.size; + size = conf->upstream.bufs.size; } ngx_conf_merge_size_value (conf->upstream.busy_buffers_size_conf, - prev->upstream.busy_buffers_size_conf, - NGX_CONF_UNSET_SIZE); + prev->upstream.busy_buffers_size_conf, + NGX_CONF_UNSET_SIZE); if (conf->upstream.busy_buffers_size_conf == NGX_CONF_UNSET_SIZE) { - conf->upstream.busy_buffers_size = 2 * size; + conf->upstream.busy_buffers_size = 2 * size; } else { - conf->upstream.busy_buffers_size = - conf->upstream.busy_buffers_size_conf; + conf->upstream.busy_buffers_size = + conf->upstream.busy_buffers_size_conf; } if (conf->upstream.busy_buffers_size < size) { - ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, - "\"uwsgi_busy_buffers_size\" must be equal or bigger than " - "maximum of the value of \"uwsgi_buffer_size\" and " - "one of the \"uwsgi_buffers\""); + ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, + "\"uwsgi_busy_buffers_size\" must be equal or bigger than " + "maximum of the value of \"uwsgi_buffer_size\" and " + "one of the \"uwsgi_buffers\""); - return NGX_CONF_ERROR; + return NGX_CONF_ERROR; } if (conf->upstream.busy_buffers_size - > (conf->upstream.bufs.num - 1) * conf->upstream.bufs.size) { - ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, - "\"uwsgi_busy_buffers_size\" must be less than " - "the size of all \"uwsgi_buffers\" minus one buffer"); + > (conf->upstream.bufs.num - 1) * conf->upstream.bufs.size) { + ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, + "\"uwsgi_busy_buffers_size\" must be less than " + "the size of all \"uwsgi_buffers\" minus one buffer"); - return NGX_CONF_ERROR; + return NGX_CONF_ERROR; } ngx_conf_merge_size_value (conf->upstream.temp_file_write_size_conf, - prev->upstream.temp_file_write_size_conf, - NGX_CONF_UNSET_SIZE); + prev->upstream.temp_file_write_size_conf, + NGX_CONF_UNSET_SIZE); if (conf->upstream.temp_file_write_size_conf == NGX_CONF_UNSET_SIZE) { - conf->upstream.temp_file_write_size = 2 * size; + conf->upstream.temp_file_write_size = 2 * size; } else { - conf->upstream.temp_file_write_size = - conf->upstream.temp_file_write_size_conf; + conf->upstream.temp_file_write_size = + conf->upstream.temp_file_write_size_conf; } if (conf->upstream.temp_file_write_size < size) { - ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, - "\"uwsgi_temp_file_write_size\" must be equal or bigger than " - "maximum of the value of \"uwsgi_buffer_size\" and " - "one of the \"uwsgi_buffers\""); + ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, + "\"uwsgi_temp_file_write_size\" must be equal or bigger than " + "maximum of the value of \"uwsgi_buffer_size\" and " + "one of the \"uwsgi_buffers\""); - return NGX_CONF_ERROR; + return NGX_CONF_ERROR; } ngx_conf_merge_size_value (conf->upstream.max_temp_file_size_conf, - prev->upstream.max_temp_file_size_conf, - NGX_CONF_UNSET_SIZE); + prev->upstream.max_temp_file_size_conf, + NGX_CONF_UNSET_SIZE); if (conf->upstream.max_temp_file_size_conf == NGX_CONF_UNSET_SIZE) { - conf->upstream.max_temp_file_size = 1024 * 1024 * 1024; + conf->upstream.max_temp_file_size = 1024 * 1024 * 1024; } else { - conf->upstream.max_temp_file_size = - conf->upstream.max_temp_file_size_conf; + conf->upstream.max_temp_file_size = + conf->upstream.max_temp_file_size_conf; } if (conf->upstream.max_temp_file_size != 0 - && conf->upstream.max_temp_file_size < size) { - ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, - "\"uwsgi_max_temp_file_size\" must be equal to zero to disable " - "the temporary files usage or must be equal or bigger than " - "maximum of the value of \"uwsgi_buffer_size\" and " - "one of the \"uwsgi_buffers\""); + && conf->upstream.max_temp_file_size < size) { + ngx_conf_log_error (NGX_LOG_EMERG, cf, 0, + "\"uwsgi_max_temp_file_size\" must be equal to zero to disable " + "the temporary files usage or must be equal or bigger than " + "maximum of the value of \"uwsgi_buffer_size\" and " + "one of the \"uwsgi_buffers\""); - return NGX_CONF_ERROR; + return NGX_CONF_ERROR; } ngx_conf_merge_bitmask_value (conf->upstream.ignore_headers, - prev->upstream.ignore_headers, - NGX_CONF_BITMASK_SET); + prev->upstream.ignore_headers, + NGX_CONF_BITMASK_SET); ngx_conf_merge_bitmask_value (conf->upstream.next_upstream, - prev->upstream.next_upstream, - (NGX_CONF_BITMASK_SET - | NGX_HTTP_UPSTREAM_FT_ERROR - | NGX_HTTP_UPSTREAM_FT_TIMEOUT)); + prev->upstream.next_upstream, + (NGX_CONF_BITMASK_SET + | NGX_HTTP_UPSTREAM_FT_ERROR + | NGX_HTTP_UPSTREAM_FT_TIMEOUT)); if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) { - conf->upstream.next_upstream = NGX_CONF_BITMASK_SET - | NGX_HTTP_UPSTREAM_FT_OFF; + conf->upstream.next_upstream = NGX_CONF_BITMASK_SET + | NGX_HTTP_UPSTREAM_FT_OFF; } if (ngx_conf_merge_path_value (cf, &conf->upstream.temp_path, - prev->upstream.temp_path, - &ngx_http_uwsgi_temp_path) != NGX_OK) { - return NGX_CONF_ERROR; + prev->upstream.temp_path, + &ngx_http_uwsgi_temp_path) != NGX_OK) { + return NGX_CONF_ERROR; } ngx_conf_merge_value (conf->upstream.pass_request_headers, - prev->upstream.pass_request_headers, 1); + prev->upstream.pass_request_headers, 1); ngx_conf_merge_value (conf->upstream.pass_request_body, - prev->upstream.pass_request_body, 1); + prev->upstream.pass_request_body, 1); ngx_conf_merge_value (conf->upstream.intercept_errors, - prev->upstream.intercept_errors, 0); + prev->upstream.intercept_errors, 0); ngx_conf_merge_str_value(conf->uwsgi_string, prev->uwsgi_string, ""); @@ -1408,154 +1408,154 @@ ngx_http_uwsgi_merge_loc_conf (ngx_conf_ hash.name = "uwsgi_hide_headers_hash"; if (ngx_http_upstream_hide_headers_hash (cf, &conf->upstream, - &prev->upstream, - ngx_http_uwsgi_hide_headers, - &hash) != NGX_OK) { - return NGX_CONF_ERROR; + &prev->upstream, + ngx_http_uwsgi_hide_headers, + &hash) != NGX_OK) { + return NGX_CONF_ERROR; } if (conf->upstream.upstream == NULL) { - conf->upstream.upstream = prev->upstream.upstream; + conf->upstream.upstream = prev->upstream.upstream; } if (conf->uwsgi_lengths == NULL) { - conf->uwsgi_lengths = prev->uwsgi_lengths; - conf->uwsgi_values = prev->uwsgi_values; + conf->uwsgi_lengths = prev->uwsgi_lengths; + conf->uwsgi_values = prev->uwsgi_values; } if (conf->modifier1 == 0) { - conf->modifier1 = prev->modifier1; + conf->modifier1 = prev->modifier1; } if (conf->modifier2 == 0) { - conf->modifier2 = prev->modifier2; + conf->modifier2 = prev->modifier2; } if (conf->params_source == NULL) { - conf->flushes = prev->flushes; - conf->params_len = prev->params_len; - conf->params = prev->params; - conf->params_source = prev->params_source; + conf->flushes = prev->flushes; + conf->params_len = prev->params_len; + conf->params = prev->params; + conf->params_source = prev->params_source; - if (conf->params_source == NULL) { - return NGX_CONF_OK; - } + if (conf->params_source == NULL) { + return NGX_CONF_OK; + } } conf->params_len = ngx_array_create (cf->pool, 64, 1); if (conf->params_len == NULL) { - return NGX_CONF_ERROR; + return NGX_CONF_ERROR; } conf->params = ngx_array_create (cf->pool, 512, 1); if (conf->params == NULL) { - return NGX_CONF_ERROR; + return NGX_CONF_ERROR; } src = conf->params_source->elts; for (i = 0; i < conf->params_source->nelts; i++) { - if (ngx_http_script_variables_count (&src[i].value) == 0) { - copy = ngx_array_push_n (conf->params_len, - sizeof (ngx_http_script_copy_code_t)); - if (copy == NULL) { - return NGX_CONF_ERROR; - } + if (ngx_http_script_variables_count (&src[i].value) == 0) { + copy = ngx_array_push_n (conf->params_len, + sizeof (ngx_http_script_copy_code_t)); + if (copy == NULL) { + return NGX_CONF_ERROR; + } - copy->code = (ngx_http_script_code_pt) - ngx_http_script_copy_len_code; - copy->len = src[i].key.len; + copy->code = (ngx_http_script_code_pt) + ngx_http_script_copy_len_code; + copy->len = src[i].key.len; - copy = ngx_array_push_n (conf->params_len, - sizeof (ngx_http_script_copy_code_t)); - if (copy == NULL) { - return NGX_CONF_ERROR; - } + copy = ngx_array_push_n (conf->params_len, + sizeof (ngx_http_script_copy_code_t)); + if (copy == NULL) { + return NGX_CONF_ERROR; + } - copy->code = (ngx_http_script_code_pt) - ngx_http_script_copy_len_code; - copy->len = src[i].value.len; + copy->code = (ngx_http_script_code_pt) + ngx_http_script_copy_len_code; + copy->len = src[i].value.len; - size = (sizeof (ngx_http_script_copy_code_t) - + src[i].key.len + src[i].value.len - + sizeof (uintptr_t) - 1) & ~(sizeof (uintptr_t) - 1); + size = (sizeof (ngx_http_script_copy_code_t) + + src[i].key.len + src[i].value.len + + sizeof (uintptr_t) - 1) & ~(sizeof (uintptr_t) - 1); - copy = ngx_array_push_n (conf->params, size); - if (copy == NULL) { - return NGX_CONF_ERROR; - } + copy = ngx_array_push_n (conf->params, size); + if (copy == NULL) { + return NGX_CONF_ERROR; + } - copy->code = ngx_http_script_copy_code; - copy->len = src[i].key.len + src[i].value.len; + copy->code = ngx_http_script_copy_code; + copy->len = src[i].key.len + src[i].value.len; - p = (u_char *) copy + sizeof (ngx_http_script_copy_code_t); + p = (u_char *) copy + sizeof (ngx_http_script_copy_code_t); - p = ngx_cpymem (p, src[i].key.data, src[i].key.len); - ngx_memcpy (p, src[i].value.data, src[i].value.len); + p = ngx_cpymem (p, src[i].key.data, src[i].key.len); + ngx_memcpy (p, src[i].value.data, src[i].value.len); - } - else { - copy = ngx_array_push_n (conf->params_len, - sizeof (ngx_http_script_copy_code_t)); - if (copy == NULL) { - return NGX_CONF_ERROR; - } + } + else { + copy = ngx_array_push_n (conf->params_len, + sizeof (ngx_http_script_copy_code_t)); + if (copy == NULL) { + return NGX_CONF_ERROR; + } - copy->code = (ngx_http_script_code_pt) - ngx_http_script_copy_len_code; - copy->len = src[i].key.len; + copy->code = (ngx_http_script_code_pt) + ngx_http_script_copy_len_code; + copy->len = src[i].key.len; - size = (sizeof (ngx_http_script_copy_code_t) - + src[i].key.len + sizeof (uintptr_t) - 1) - & ~(sizeof (uintptr_t) - 1); + size = (sizeof (ngx_http_script_copy_code_t) + + src[i].key.len + sizeof (uintptr_t) - 1) + & ~(sizeof (uintptr_t) - 1); - copy = ngx_array_push_n (conf->params, size); - if (copy == NULL) { - return NGX_CONF_ERROR; - } + copy = ngx_array_push_n (conf->params, size); + if (copy == NULL) { + return NGX_CONF_ERROR; + } - copy->code = ngx_http_script_copy_code; - copy->len = src[i].key.len; + copy->code = ngx_http_script_copy_code; + copy->len = src[i].key.len; - p = (u_char *) copy + sizeof (ngx_http_script_copy_code_t); - ngx_memcpy (p, src[i].key.data, src[i].key.len); + p = (u_char *) copy + sizeof (ngx_http_script_copy_code_t); + ngx_memcpy (p, src[i].key.data, src[i].key.len); - ngx_memzero (&sc, sizeof (ngx_http_script_compile_t)); + ngx_memzero (&sc, sizeof (ngx_http_script_compile_t)); - sc.cf = cf; - sc.source = &src[i].value; - sc.flushes = &conf->flushes; - sc.lengths = &conf->params_len; - sc.values = &conf->params; + sc.cf = cf; + sc.source = &src[i].value; + sc.flushes = &conf->flushes; + sc.lengths = &conf->params_len; + sc.values = &conf->params; - if (ngx_http_script_compile (&sc) != NGX_OK) { - return NGX_CONF_ERROR; - } - } + if (ngx_http_script_compile (&sc) != NGX_OK) { + return NGX_CONF_ERROR; + } + } - code = ngx_array_push_n (conf->params_len, sizeof (uintptr_t)); - if (code == NULL) { - return NGX_CONF_ERROR; - } + code = ngx_array_push_n (conf->params_len, sizeof (uintptr_t)); + if (code == NULL) { + return NGX_CONF_ERROR; + } - *code = (uintptr_t) NULL; + *code = (uintptr_t) NULL; - code = ngx_array_push_n (conf->params, sizeof (uintptr_t)); - if (code == NULL) { - return NGX_CONF_ERROR; - } + code = ngx_array_push_n (conf->params, sizeof (uintptr_t)); + if (code == NULL) { + return NGX_CONF_ERROR; + } - *code = (uintptr_t) NULL; + *code = (uintptr_t) NULL; } code = ngx_array_push_n (conf->params_len, sizeof (uintptr_t)); if (code == NULL) { - return NGX_CONF_ERROR; + return NGX_CONF_ERROR; } *code = (uintptr_t) NULL; @@ -1576,7 +1576,7 @@ ngx_http_uwsgi_pass (ngx_conf_t * cf, ng ngx_http_script_compile_t sc; if (uwcf->upstream.upstream || uwcf->uwsgi_lengths) { - return "is duplicate"; + return "is duplicate"; } clcf = ngx_http_conf_get_module_loc_conf (cf, ngx_http_core_module); @@ -1590,21 +1590,21 @@ ngx_http_uwsgi_pass (ngx_conf_t * cf, ng if (n) { - ngx_memzero (&sc, sizeof (ngx_http_script_compile_t)); + ngx_memzero (&sc, sizeof (ngx_http_script_compile_t)); - sc.cf = cf; - sc.source = url; - sc.lengths = &uwcf->uwsgi_lengths; - sc.values = &uwcf->uwsgi_values; - sc.variables = n; - sc.complete_lengths = 1; - sc.complete_values = 1; + sc.cf = cf; + sc.source = url; + sc.lengths = &uwcf->uwsgi_lengths; + sc.values = &uwcf->uwsgi_values; + sc.variables = n; + sc.complete_lengths = 1; + sc.complete_values = 1; - if (ngx_http_script_compile (&sc) != NGX_OK) { - return NGX_CONF_ERROR; - } + if (ngx_http_script_compile (&sc) != NGX_OK) { + return NGX_CONF_ERROR; + } - return NGX_CONF_OK; + return NGX_CONF_OK; } ngx_memzero (&u, sizeof (ngx_url_t)); @@ -1614,11 +1614,11 @@ ngx_http_uwsgi_pass (ngx_conf_t * cf, ng uwcf->upstream.upstream = ngx_http_upstream_add (cf, &u, 0); if (uwcf->upstream.upstream == NULL) { - return NGX_CONF_ERROR; + return NGX_CONF_ERROR; } if (clcf->name.data[clcf->name.len - 1] == '/') { - clcf->auto_redirect = 1; + clcf->auto_redirect = 1; } return NGX_CONF_OK;