nginx: src/http/modules/ngx_http_uwsgi

annotate src/http/modules/ngx_http_uwsgi_module.c @ 5451:e68af4e3396f

Upstream: skip empty cache headers. Notably this fixes HTTP_IF_MODIFIED_SINCE which was always sent with cache enabled in fastcgi/scgi/uwsgi after 43ccaf8e8728.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Fri, 29 Nov 2013 17:23:38 +0400
parents	43ccaf8e8728
children	c82b2e020b9f

rev	line source
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2 /*
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	3 * Copyright (C) Unbit S.a.s. 2009-2010
3544 6048c77cfbb2 fix copyrights Igor Sysoev <igor@sysoev.ru> parents: 3543 diff changeset	4 * Copyright (C) 2008 Manlio Perillo (manlio.perillo@gmail.com)
6048c77cfbb2 fix copyrights Igor Sysoev <igor@sysoev.ru> parents: 3543 diff changeset	5 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4401 diff changeset	6 * Copyright (C) Nginx, Inc.
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7 */
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10 #include <ngx_config.h>
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11 #include <ngx_core.h>
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12 #include <ngx_http.h>
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	13
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	14
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	15 typedef struct {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	16 ngx_http_upstream_conf_t upstream;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	17
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	18 ngx_array_t *flushes;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	19 ngx_array_t *params_len;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	20 ngx_array_t *params;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	21 ngx_array_t *params_source;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	22
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	23 ngx_hash_t headers_hash;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	24 ngx_uint_t header_params;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	25
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	26 ngx_array_t *uwsgi_lengths;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	27 ngx_array_t *uwsgi_values;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	28
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	29 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	30 ngx_http_complex_value_t cache_key;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	31 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	32
3550 9f715c9e5b82 style fix Igor Sysoev <igor@sysoev.ru> parents: 3549 diff changeset	33 ngx_str_t uwsgi_string;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	34
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	35 ngx_uint_t modifier1;
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	36 ngx_uint_t modifier2;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	37 } ngx_http_uwsgi_loc_conf_t;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	38
3556 b9415935d95d style fix Igor Sysoev <igor@sysoev.ru> parents: 3555 diff changeset	39
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	40 static ngx_int_t ngx_http_uwsgi_eval(ngx_http_request_t *r,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	41 ngx_http_uwsgi_loc_conf_t *uwcf);
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	42 static ngx_int_t ngx_http_uwsgi_create_request(ngx_http_request_t *r);
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	43 static ngx_int_t ngx_http_uwsgi_reinit_request(ngx_http_request_t *r);
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	44 static ngx_int_t ngx_http_uwsgi_process_status_line(ngx_http_request_t *r);
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	45 static ngx_int_t ngx_http_uwsgi_process_header(ngx_http_request_t *r);
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	46 static void ngx_http_uwsgi_abort_request(ngx_http_request_t *r);
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	47 static void ngx_http_uwsgi_finalize_request(ngx_http_request_t *r,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	48 ngx_int_t rc);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	49
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	50 static void ngx_http_uwsgi_create_loc_conf(ngx_conf_t cf);
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	51 static char ngx_http_uwsgi_merge_loc_conf(ngx_conf_t cf, void *parent,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	52 void *child);
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	53 static ngx_int_t ngx_http_uwsgi_merge_params(ngx_conf_t *cf,
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	54 ngx_http_uwsgi_loc_conf_t conf, ngx_http_uwsgi_loc_conf_t prev);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	55
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	56 static char ngx_http_uwsgi_pass(ngx_conf_t cf, ngx_command_t *cmd,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	57 void *conf);
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	58 static char ngx_http_uwsgi_store(ngx_conf_t cf, ngx_command_t *cmd,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	59 void *conf);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	60
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	61 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	62 static ngx_int_t ngx_http_uwsgi_create_key(ngx_http_request_t *r);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	63 static char ngx_http_uwsgi_cache(ngx_conf_t cf, ngx_command_t *cmd,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	64 void *conf);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	65 static char ngx_http_uwsgi_cache_key(ngx_conf_t cf, ngx_command_t *cmd,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	66 void *conf);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	67 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	68
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	69
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	70 static ngx_conf_num_bounds_t ngx_http_uwsgi_modifier_bounds = {
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	71 ngx_conf_check_num_bounds, 0, 255
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	72 };
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	73
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	74
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	75 static ngx_conf_bitmask_t ngx_http_uwsgi_next_upstream_masks[] = {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	76 { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	77 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT },
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	78 { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	79 { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 },
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	80 { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
5231 05c53652e7b4 Upstream: http_403 support in proxy_next_upstream (and friends). Maxim Dounin <mdounin@mdounin.ru> parents: 5080 diff changeset	81 { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 },
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	82 { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	83 { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING },
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	84 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	85 { ngx_null_string, 0 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	86 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	87
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	88
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	89 ngx_module_t ngx_http_uwsgi_module;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	90
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	91
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	92 static ngx_command_t ngx_http_uwsgi_commands[] = {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	93
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	94 { ngx_string("uwsgi_pass"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	95 NGX_HTTP_LOC_CONF\|NGX_HTTP_LIF_CONF\|NGX_CONF_TAKE1,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	96 ngx_http_uwsgi_pass,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	97 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	98 0,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	99 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	100
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	101 { ngx_string("uwsgi_modifier1"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	102 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	103 ngx_conf_set_num_slot,
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	104 NGX_HTTP_LOC_CONF_OFFSET,
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	105 offsetof(ngx_http_uwsgi_loc_conf_t, modifier1),
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	106 &ngx_http_uwsgi_modifier_bounds },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	107
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	108 { ngx_string("uwsgi_modifier2"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	109 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	110 ngx_conf_set_num_slot,
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	111 NGX_HTTP_LOC_CONF_OFFSET,
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	112 offsetof(ngx_http_uwsgi_loc_conf_t, modifier2),
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	113 &ngx_http_uwsgi_modifier_bounds },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	114
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	115 { ngx_string("uwsgi_store"),
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	116 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	117 ngx_http_uwsgi_store,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	118 NGX_HTTP_LOC_CONF_OFFSET,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	119 0,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	120 NULL },
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	121
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	122 { ngx_string("uwsgi_store_access"),
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	123 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE123,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	124 ngx_conf_set_access_slot,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	125 NGX_HTTP_LOC_CONF_OFFSET,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	126 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.store_access),
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	127 NULL },
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	128
4157 9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	129 { ngx_string("uwsgi_buffering"),
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	130 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	131 ngx_conf_set_flag_slot,
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	132 NGX_HTTP_LOC_CONF_OFFSET,
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	133 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.buffering),
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	134 NULL },
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	135
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	136 { ngx_string("uwsgi_ignore_client_abort"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	137 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	138 ngx_conf_set_flag_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	139 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	140 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.ignore_client_abort),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	141 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	142
3567 9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	143 { ngx_string("uwsgi_bind"),
9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	144 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	145 ngx_http_upstream_bind_set_slot,
9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	146 NGX_HTTP_LOC_CONF_OFFSET,
9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	147 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.local),
9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	148 NULL },
9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	149
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	150 { ngx_string("uwsgi_connect_timeout"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	151 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	152 ngx_conf_set_msec_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	153 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	154 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.connect_timeout),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	155 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	156
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	157 { ngx_string("uwsgi_send_timeout"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	158 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	159 ngx_conf_set_msec_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	160 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	161 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.send_timeout),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	162 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	163
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	164 { ngx_string("uwsgi_buffer_size"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	165 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	166 ngx_conf_set_size_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	167 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	168 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.buffer_size),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	169 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	170
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	171 { ngx_string("uwsgi_pass_request_headers"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	172 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	173 ngx_conf_set_flag_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	174 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	175 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.pass_request_headers),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	176 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	177
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	178 { ngx_string("uwsgi_pass_request_body"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	179 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	180 ngx_conf_set_flag_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	181 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	182 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.pass_request_body),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	183 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	184
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	185 { ngx_string("uwsgi_intercept_errors"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	186 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	187 ngx_conf_set_flag_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	188 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	189 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.intercept_errors),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	190 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	191
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	192 { ngx_string("uwsgi_read_timeout"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	193 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	194 ngx_conf_set_msec_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	195 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	196 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.read_timeout),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	197 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	198
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	199 { ngx_string("uwsgi_buffers"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	200 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE2,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	201 ngx_conf_set_bufs_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	202 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	203 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.bufs),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	204 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	205
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	206 { ngx_string("uwsgi_busy_buffers_size"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	207 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	208 ngx_conf_set_size_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	209 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	210 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.busy_buffers_size_conf),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	211 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	212
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	213 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	214
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	215 { ngx_string("uwsgi_cache"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3699 diff changeset	216 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	217 ngx_http_uwsgi_cache,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	218 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	219 0,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	220 NULL },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	221
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	222 { ngx_string("uwsgi_cache_key"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3699 diff changeset	223 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	224 ngx_http_uwsgi_cache_key,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	225 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	226 0,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	227 NULL },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	228
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	229 { ngx_string("uwsgi_cache_path"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	230 NGX_HTTP_MAIN_CONF\|NGX_CONF_2MORE,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	231 ngx_http_file_cache_set_slot,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	232 0,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	233 0,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	234 &ngx_http_uwsgi_module },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	235
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	236 { ngx_string("uwsgi_cache_bypass"),
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	237 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	238 ngx_http_set_predicate_slot,
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	239 NGX_HTTP_LOC_CONF_OFFSET,
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	240 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_bypass),
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	241 NULL },
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	242
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	243 { ngx_string("uwsgi_no_cache"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	244 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
3692 045ea40cbfe8 use ngx_http_test_predicates(), ngx_http_set_predicate_slot() Igor Sysoev <igor@sysoev.ru> parents: 3670 diff changeset	245 ngx_http_set_predicate_slot,
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	246 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	247 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.no_cache),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	248 NULL },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	249
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	250 { ngx_string("uwsgi_cache_valid"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	251 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	252 ngx_http_file_cache_valid_set_slot,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	253 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	254 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_valid),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	255 NULL },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	256
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	257 { ngx_string("uwsgi_cache_min_uses"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	258 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	259 ngx_conf_set_num_slot,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	260 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	261 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_min_uses),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	262 NULL },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	263
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	264 { ngx_string("uwsgi_cache_use_stale"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	265 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	266 ngx_conf_set_bitmask_slot,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	267 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	268 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_use_stale),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	269 &ngx_http_uwsgi_next_upstream_masks },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	270
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	271 { ngx_string("uwsgi_cache_methods"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	272 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	273 ngx_conf_set_bitmask_slot,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	274 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	275 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_methods),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	276 &ngx_http_upstream_cache_method_mask },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	277
4386 92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	278 { ngx_string("uwsgi_cache_lock"),
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	279 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	280 ngx_conf_set_flag_slot,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	281 NGX_HTTP_LOC_CONF_OFFSET,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	282 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_lock),
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	283 NULL },
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	284
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	285 { ngx_string("uwsgi_cache_lock_timeout"),
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	286 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	287 ngx_conf_set_msec_slot,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	288 NGX_HTTP_LOC_CONF_OFFSET,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	289 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_lock_timeout),
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	290 NULL },
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	291
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	292 { ngx_string("uwsgi_cache_revalidate"),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	293 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	294 ngx_conf_set_flag_slot,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	295 NGX_HTTP_LOC_CONF_OFFSET,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	296 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_revalidate),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	297 NULL },
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	298
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	299 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	300
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	301 { ngx_string("uwsgi_temp_path"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	302 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1234,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	303 ngx_conf_set_path_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	304 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	305 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.temp_path),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	306 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	307
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	308 { ngx_string("uwsgi_max_temp_file_size"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	309 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	310 ngx_conf_set_size_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	311 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	312 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.max_temp_file_size_conf),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	313 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	314
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	315 { ngx_string("uwsgi_temp_file_write_size"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	316 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	317 ngx_conf_set_size_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	318 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	319 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.temp_file_write_size_conf),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	320 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	321
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	322 { ngx_string("uwsgi_next_upstream"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	323 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	324 ngx_conf_set_bitmask_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	325 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	326 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.next_upstream),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	327 &ngx_http_uwsgi_next_upstream_masks },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	328
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	329 { ngx_string("uwsgi_param"),
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	330 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE23,
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	331 ngx_http_upstream_param_set_slot,
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	332 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	333 offsetof(ngx_http_uwsgi_loc_conf_t, params_source),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	334 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	335
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	336 { ngx_string("uwsgi_string"),
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	337 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	338 ngx_conf_set_str_slot,
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	339 NGX_HTTP_LOC_CONF_OFFSET,
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	340 offsetof(ngx_http_uwsgi_loc_conf_t, uwsgi_string),
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	341 NULL },
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	342
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	343 { ngx_string("uwsgi_pass_header"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3699 diff changeset	344 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	345 ngx_conf_set_str_array_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	346 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	347 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.pass_headers),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	348 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	349
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	350 { ngx_string("uwsgi_hide_header"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3699 diff changeset	351 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	352 ngx_conf_set_str_array_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	353 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	354 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.hide_headers),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	355 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	356
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	357 { ngx_string("uwsgi_ignore_headers"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	358 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	359 ngx_conf_set_bitmask_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	360 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	361 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.ignore_headers),
3667 12bd9e26fadb use shared ngx_http_upstream_ignore_headers_masks[] Igor Sysoev <igor@sysoev.ru> parents: 3630 diff changeset	362 &ngx_http_upstream_ignore_headers_masks },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	363
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	364 ngx_null_command
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	365 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	366
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	367
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	368 static ngx_http_module_t ngx_http_uwsgi_module_ctx = {
3553 b4a60663f6c0 delete unused ngx_http_uwsgi_add_variables() Igor Sysoev <igor@sysoev.ru> parents: 3552 diff changeset	369 NULL, /* preconfiguration */
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	370 NULL, /* postconfiguration */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	371
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	372 NULL, /* create main configuration */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	373 NULL, /* init main configuration */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	374
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	375 NULL, /* create server configuration */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	376 NULL, /* merge server configuration */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	377
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	378 ngx_http_uwsgi_create_loc_conf, /* create location configuration */
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	379 ngx_http_uwsgi_merge_loc_conf /* merge location configuration */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	380 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	381
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	382
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	383 ngx_module_t ngx_http_uwsgi_module = {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	384 NGX_MODULE_V1,
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	385 &ngx_http_uwsgi_module_ctx, /* module context */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	386 ngx_http_uwsgi_commands, /* module directives */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	387 NGX_HTTP_MODULE, /* module type */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	388 NULL, /* init master */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	389 NULL, /* init module */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	390 NULL, /* init process */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	391 NULL, /* init thread */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	392 NULL, /* exit thread */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	393 NULL, /* exit process */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	394 NULL, /* exit master */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	395 NGX_MODULE_V1_PADDING
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	396 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	397
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	398
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	399 static ngx_str_t ngx_http_uwsgi_hide_headers[] = {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	400 ngx_string("X-Accel-Expires"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	401 ngx_string("X-Accel-Redirect"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	402 ngx_string("X-Accel-Limit-Rate"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	403 ngx_string("X-Accel-Buffering"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	404 ngx_string("X-Accel-Charset"),
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	405 ngx_null_string
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	406 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	407
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	408
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	409 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	410
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	411 static ngx_keyval_t ngx_http_uwsgi_cache_headers[] = {
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	412 { ngx_string("HTTP_IF_MODIFIED_SINCE"),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	413 ngx_string("$upstream_cache_last_modified") },
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	414 { ngx_string("HTTP_IF_UNMODIFIED_SINCE"), ngx_string("") },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	415 { ngx_string("HTTP_IF_NONE_MATCH"), ngx_string("") },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	416 { ngx_string("HTTP_IF_MATCH"), ngx_string("") },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	417 { ngx_string("HTTP_RANGE"), ngx_string("") },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	418 { ngx_string("HTTP_IF_RANGE"), ngx_string("") },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	419 { ngx_null_string, ngx_null_string }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	420 };
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	421
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	422 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	423
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	424
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	425 static ngx_path_init_t ngx_http_uwsgi_temp_path = {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	426 ngx_string(NGX_HTTP_UWSGI_TEMP_PATH), { 1, 2, 0 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	427 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	428
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	429
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	430 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	431 ngx_http_uwsgi_handler(ngx_http_request_t *r)
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	432 {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	433 ngx_int_t rc;
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	434 ngx_http_status_t *status;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	435 ngx_http_upstream_t *u;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	436 ngx_http_uwsgi_loc_conf_t *uwcf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	437
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	438 if (ngx_http_upstream_create(r) != NGX_OK) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	439 return NGX_HTTP_INTERNAL_SERVER_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	440 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	441
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	442 status = ngx_pcalloc(r->pool, sizeof(ngx_http_status_t));
a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	443 if (status == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	444 return NGX_HTTP_INTERNAL_SERVER_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	445 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	446
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	447 ngx_http_set_ctx(r, status, ngx_http_uwsgi_module);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	448
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	449 uwcf = ngx_http_get_module_loc_conf(r, ngx_http_uwsgi_module);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	450
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	451 if (uwcf->uwsgi_lengths) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	452 if (ngx_http_uwsgi_eval(r, uwcf) != NGX_OK) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	453 return NGX_HTTP_INTERNAL_SERVER_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	454 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	455 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	456
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	457 u = r->upstream;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	458
3545 11c4f3a1e439 use ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3544 diff changeset	459 ngx_str_set(&u->schema, "uwsgi://");
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	460 u->output.tag = (ngx_buf_tag_t) &ngx_http_uwsgi_module;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	461
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	462 u->conf = &uwcf->upstream;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	463
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	464 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	465 u->create_key = ngx_http_uwsgi_create_key;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	466 #endif
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	467 u->create_request = ngx_http_uwsgi_create_request;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	468 u->reinit_request = ngx_http_uwsgi_reinit_request;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	469 u->process_header = ngx_http_uwsgi_process_status_line;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	470 u->abort_request = ngx_http_uwsgi_abort_request;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	471 u->finalize_request = ngx_http_uwsgi_finalize_request;
4615 adcd60233817 Added r->state reset on fastcgi/scgi/uwsgi request start. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	472 r->state = 0;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	473
4157 9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	474 u->buffering = uwcf->upstream.buffering;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	475
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	476 u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	477 if (u->pipe == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	478 return NGX_HTTP_INTERNAL_SERVER_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	479 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	480
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	481 u->pipe->input_filter = ngx_event_pipe_copy_input_filter;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	482 u->pipe->input_ctx = r;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	483
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	484 rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	485
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	486 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	487 return rc;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	488 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	489
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	490 return NGX_DONE;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	491 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	492
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	493
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	494 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	495 ngx_http_uwsgi_eval(ngx_http_request_t r, ngx_http_uwsgi_loc_conf_t uwcf)
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	496 {
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	497 ngx_url_t url;
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	498 ngx_http_upstream_t *u;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	499
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	500 ngx_memzero(&url, sizeof(ngx_url_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	501
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	502 if (ngx_http_script_run(r, &url.url, uwcf->uwsgi_lengths->elts, 0,
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	503 uwcf->uwsgi_values->elts)
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	504 == NULL)
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	505 {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	506 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	507 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	508
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	509 url.no_resolve = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	510
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	511 if (ngx_parse_url(r->pool, &url) != NGX_OK) {
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	512 if (url.err) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	513 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	514 "%s in upstream \"%V\"", url.err, &url.url);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	515 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	516
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	517 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	518 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	519
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	520 u = r->upstream;
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	521
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	522 u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t));
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	523 if (u->resolved == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	524 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	525 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	526
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	527 if (url.addrs && url.addrs[0].sockaddr) {
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	528 u->resolved->sockaddr = url.addrs[0].sockaddr;
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	529 u->resolved->socklen = url.addrs[0].socklen;
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	530 u->resolved->naddrs = 1;
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	531 u->resolved->host = url.addrs[0].name;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	532
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	533 } else {
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	534 u->resolved->host = url.host;
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	535 u->resolved->port = url.port;
3879 502a6b0acf3f fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass Igor Sysoev <igor@sysoev.ru> parents: 3731 diff changeset	536 u->resolved->no_port = url.no_port;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	537 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	538
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	539 return NGX_OK;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	540 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	541
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	542
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	543 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	544
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	545 static ngx_int_t
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	546 ngx_http_uwsgi_create_key(ngx_http_request_t *r)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	547 {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	548 ngx_str_t *key;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	549 ngx_http_uwsgi_loc_conf_t *uwcf;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	550
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	551 key = ngx_array_push(&r->cache->keys);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	552 if (key == NULL) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	553 return NGX_ERROR;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	554 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	555
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	556 uwcf = ngx_http_get_module_loc_conf(r, ngx_http_uwsgi_module);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	557
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	558 if (ngx_http_complex_value(r, &uwcf->cache_key, key) != NGX_OK) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	559 return NGX_ERROR;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	560 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	561
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	562 return NGX_OK;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	563 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	564
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	565 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	566
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	567
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	568 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	569 ngx_http_uwsgi_create_request(ngx_http_request_t *r)
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	570 {
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	571 u_char ch, *lowcase_key;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	572 size_t key_len, val_len, len, allocated;
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	573 ngx_uint_t i, n, hash, skip_empty, header_params;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	574 ngx_buf_t *b;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	575 ngx_chain_t cl, body;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	576 ngx_list_part_t *part;
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	577 ngx_table_elt_t header, *ignored;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	578 ngx_http_script_code_pt code;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	579 ngx_http_script_engine_t e, le;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	580 ngx_http_uwsgi_loc_conf_t *uwcf;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	581 ngx_http_script_len_code_pt lcode;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	582
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	583 len = 0;
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	584 header_params = 0;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	585 ignored = NULL;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	586
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	587 uwcf = ngx_http_get_module_loc_conf(r, ngx_http_uwsgi_module);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	588
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	589 if (uwcf->params_len) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	590 ngx_memzero(&le, sizeof(ngx_http_script_engine_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	591
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	592 ngx_http_script_flush_no_cacheable_variables(r, uwcf->flushes);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	593 le.flushed = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	594
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	595 le.ip = uwcf->params_len->elts;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	596 le.request = r;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	597
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	598 while ((uintptr_t ) le.ip) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	599
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	600 lcode = (ngx_http_script_len_code_pt ) le.ip;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	601 key_len = lcode(&le);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	602
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	603 lcode = (ngx_http_script_len_code_pt ) le.ip;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	604 skip_empty = lcode(&le);
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	605
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	606 for (val_len = 0; (uintptr_t ) le.ip; val_len += lcode (&le)) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	607 lcode = (ngx_http_script_len_code_pt ) le.ip;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	608 }
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	609 le.ip += sizeof(uintptr_t);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	610
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	611 if (skip_empty && val_len == 0) {
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	612 continue;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	613 }
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	614
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	615 len += 2 + key_len + 2 + val_len;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	616 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	617 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	618
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	619 if (uwcf->upstream.pass_request_headers) {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	620
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	621 allocated = 0;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	622 lowcase_key = NULL;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	623
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	624 if (uwcf->header_params) {
4015 e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	625 n = 0;
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	626 part = &r->headers_in.headers.part;
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	627
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	628 while (part) {
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	629 n += part->nelts;
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	630 part = part->next;
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	631 }
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	632
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	633 ignored = ngx_palloc(r->pool, n * sizeof(void *));
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	634 if (ignored == NULL) {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	635 return NGX_ERROR;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	636 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	637 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	638
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	639 part = &r->headers_in.headers.part;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	640 header = part->elts;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	641
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	642 for (i = 0; /* void */ ; i++) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	643
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	644 if (i >= part->nelts) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	645 if (part->next == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	646 break;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	647 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	648
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	649 part = part->next;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	650 header = part->elts;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	651 i = 0;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	652 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	653
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	654 if (uwcf->header_params) {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	655 if (allocated < header[i].key.len) {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	656 allocated = header[i].key.len + 16;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	657 lowcase_key = ngx_pnalloc(r->pool, allocated);
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	658 if (lowcase_key == NULL) {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	659 return NGX_ERROR;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	660 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	661 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	662
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	663 hash = 0;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	664
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	665 for (n = 0; n < header[i].key.len; n++) {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	666 ch = header[i].key.data[n];
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	667
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	668 if (ch >= 'A' && ch <= 'Z') {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	669 ch \|= 0x20;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	670
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	671 } else if (ch == '-') {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	672 ch = '_';
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	673 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	674
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	675 hash = ngx_hash(hash, ch);
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	676 lowcase_key[n] = ch;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	677 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	678
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	679 if (ngx_hash_find(&uwcf->headers_hash, hash, lowcase_key, n)) {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	680 ignored[header_params++] = &header[i];
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	681 continue;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	682 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	683 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	684
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	685 len += 2 + sizeof("HTTP_") - 1 + header[i].key.len
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	686 + 2 + header[i].value.len;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	687 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	688 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	689
3555 bc734cf061b0 improve uwsgi_string processing Igor Sysoev <igor@sysoev.ru> parents: 3554 diff changeset	690 len += uwcf->uwsgi_string.len;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	691
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	692 #if 0
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	693 /* allow custom uwsgi packet */
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	694 if (len > 0 && len < 2) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	695 ngx_log_error (NGX_LOG_ALERT, r->connection->log, 0,
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	696 "uwsgi request is too little: %uz", len);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	697 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	698 }
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	699 #endif
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	700
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	701 b = ngx_create_temp_buf(r->pool, len + 4);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	702 if (b == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	703 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	704 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	705
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	706 cl = ngx_alloc_chain_link(r->pool);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	707 if (cl == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	708 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	709 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	710
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	711 cl->buf = b;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	712
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	713 *b->last++ = (u_char) uwcf->modifier1;
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	714 *b->last++ = (u_char) (len & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	715 *b->last++ = (u_char) ((len >> 8) & 0xff);
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	716 *b->last++ = (u_char) uwcf->modifier2;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	717
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	718 if (uwcf->params_len) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	719 ngx_memzero(&e, sizeof(ngx_http_script_engine_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	720
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	721 e.ip = uwcf->params->elts;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	722 e.pos = b->last;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	723 e.request = r;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	724 e.flushed = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	725
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	726 le.ip = uwcf->params_len->elts;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	727
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	728 while ((uintptr_t ) le.ip) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	729
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	730 lcode = (ngx_http_script_len_code_pt ) le.ip;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	731 key_len = (u_char) lcode (&le);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	732
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	733 lcode = (ngx_http_script_len_code_pt ) le.ip;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	734 skip_empty = lcode(&le);
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	735
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	736 for (val_len = 0; (uintptr_t ) le.ip; val_len += lcode(&le)) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	737 lcode = (ngx_http_script_len_code_pt ) le.ip;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	738 }
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	739 le.ip += sizeof(uintptr_t);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	740
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	741 if (skip_empty && val_len == 0) {
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	742 e.skip = 1;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	743
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	744 while ((uintptr_t ) e.ip) {
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	745 code = (ngx_http_script_code_pt ) e.ip;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	746 code((ngx_http_script_engine_t *) &e);
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	747 }
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	748 e.ip += sizeof(uintptr_t);
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	749
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	750 e.skip = 0;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	751
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	752 continue;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	753 }
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	754
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	755 *e.pos++ = (u_char) (key_len & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	756 *e.pos++ = (u_char) ((key_len >> 8) & 0xff);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	757
3547 c2da61796410 remove useless copy: key name should be just copied before value length Igor Sysoev <igor@sysoev.ru> parents: 3546 diff changeset	758 code = (ngx_http_script_code_pt ) e.ip;
c2da61796410 remove useless copy: key name should be just copied before value length Igor Sysoev <igor@sysoev.ru> parents: 3546 diff changeset	759 code((ngx_http_script_engine_t *) & e);
c2da61796410 remove useless copy: key name should be just copied before value length Igor Sysoev <igor@sysoev.ru> parents: 3546 diff changeset	760
c2da61796410 remove useless copy: key name should be just copied before value length Igor Sysoev <igor@sysoev.ru> parents: 3546 diff changeset	761 *e.pos++ = (u_char) (val_len & 0xff);
c2da61796410 remove useless copy: key name should be just copied before value length Igor Sysoev <igor@sysoev.ru> parents: 3546 diff changeset	762 *e.pos++ = (u_char) ((val_len >> 8) & 0xff);
c2da61796410 remove useless copy: key name should be just copied before value length Igor Sysoev <igor@sysoev.ru> parents: 3546 diff changeset	763
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	764 while ((uintptr_t ) e.ip) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	765 code = (ngx_http_script_code_pt ) e.ip;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	766 code((ngx_http_script_engine_t *) & e);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	767 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	768
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	769 e.ip += sizeof(uintptr_t);
3564 3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	770
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	771 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	772 "uwsgi param: \"%s: %s\"",
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	773 key_len, e.pos - (key_len + 2 + val_len),
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	774 val_len, e.pos - val_len);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	775 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	776
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	777 b->last = e.pos;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	778 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	779
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	780 if (uwcf->upstream.pass_request_headers) {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	781
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	782 part = &r->headers_in.headers.part;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	783 header = part->elts;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	784
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	785 for (i = 0; /* void */ ; i++) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	786
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	787 if (i >= part->nelts) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	788 if (part->next == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	789 break;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	790 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	791
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	792 part = part->next;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	793 header = part->elts;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	794 i = 0;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	795 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	796
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	797 for (n = 0; n < header_params; n++) {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	798 if (&header[i] == ignored[n]) {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	799 goto next;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	800 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	801 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	802
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	803 key_len = sizeof("HTTP_") - 1 + header[i].key.len;
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	804 *b->last++ = (u_char) (key_len & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	805 *b->last++ = (u_char) ((key_len >> 8) & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	806
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	807 b->last = ngx_cpymem(b->last, "HTTP_", sizeof("HTTP_") - 1);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	808 for (n = 0; n < header[i].key.len; n++) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	809 ch = header[i].key.data[n];
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	810
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	811 if (ch >= 'a' && ch <= 'z') {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	812 ch &= ~0x20;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	813
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	814 } else if (ch == '-') {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	815 ch = '_';
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	816 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	817
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	818 *b->last++ = ch;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	819 }
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	820
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	821 val_len = header[i].value.len;
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	822 *b->last++ = (u_char) (val_len & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	823 *b->last++ = (u_char) ((val_len >> 8) & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	824 b->last = ngx_copy(b->last, header[i].value.data, val_len);
3564 3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	825
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	826 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	827 "uwsgi param: \"%s: %s\"",
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	828 key_len, b->last - (key_len + 2 + val_len),
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	829 val_len, b->last - val_len);
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	830 next:
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	831
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	832 continue;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	833 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	834 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	835
3555 bc734cf061b0 improve uwsgi_string processing Igor Sysoev <igor@sysoev.ru> parents: 3554 diff changeset	836 b->last = ngx_copy(b->last, uwcf->uwsgi_string.data,
bc734cf061b0 improve uwsgi_string processing Igor Sysoev <igor@sysoev.ru> parents: 3554 diff changeset	837 uwcf->uwsgi_string.len);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	838
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	839 if (uwcf->upstream.pass_request_body) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	840 body = r->upstream->request_bufs;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	841 r->upstream->request_bufs = cl;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	842
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	843 while (body) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	844 b = ngx_alloc_buf(r->pool);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	845 if (b == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	846 return NGX_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	847 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	848
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	849 ngx_memcpy(b, body->buf, sizeof(ngx_buf_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	850
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	851 cl->next = ngx_alloc_chain_link(r->pool);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	852 if (cl->next == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	853 return NGX_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	854 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	855
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	856 cl = cl->next;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	857 cl->buf = b;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	858
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	859 body = body->next;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	860 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	861
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	862 } else {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	863 r->upstream->request_bufs = cl;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	864 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	865
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	866 cl->next = NULL;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	867
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	868 return NGX_OK;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	869 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	870
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	871
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	872 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	873 ngx_http_uwsgi_reinit_request(ngx_http_request_t *r)
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	874 {
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	875 ngx_http_status_t *status;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	876
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	877 status = ngx_http_get_module_ctx(r, ngx_http_uwsgi_module);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	878
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	879 if (status == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	880 return NGX_OK;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	881 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	882
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	883 status->code = 0;
a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	884 status->count = 0;
a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	885 status->start = NULL;
a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	886 status->end = NULL;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	887
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	888 r->upstream->process_header = ngx_http_uwsgi_process_status_line;
4615 adcd60233817 Added r->state reset on fastcgi/scgi/uwsgi request start. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	889 r->state = 0;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	890
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	891 return NGX_OK;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	892 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	893
3623 633ef29c9881 style fix Igor Sysoev <igor@sysoev.ru> parents: 3611 diff changeset	894
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	895 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	896 ngx_http_uwsgi_process_status_line(ngx_http_request_t *r)
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	897 {
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	898 size_t len;
3623 633ef29c9881 style fix Igor Sysoev <igor@sysoev.ru> parents: 3611 diff changeset	899 ngx_int_t rc;
3630 b5819529738a style fix Igor Sysoev <igor@sysoev.ru> parents: 3629 diff changeset	900 ngx_http_status_t *status;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	901 ngx_http_upstream_t *u;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	902
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	903 status = ngx_http_get_module_ctx(r, ngx_http_uwsgi_module);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	904
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	905 if (status == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	906 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	907 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	908
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	909 u = r->upstream;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	910
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	911 rc = ngx_http_parse_status_line(r, &u->buffer, status);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	912
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	913 if (rc == NGX_AGAIN) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	914 return rc;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	915 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	916
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	917 if (rc == NGX_ERROR) {
3624 3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	918 u->process_header = ngx_http_uwsgi_process_header;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	919 return ngx_http_uwsgi_process_header(r);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	920 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	921
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	922 if (u->state) {
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	923 u->state->status = status->code;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	924 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	925
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	926 u->headers_in.status_n = status->code;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	927
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	928 len = status->end - status->start;
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	929 u->headers_in.status_line.len = len;
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	930
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	931 u->headers_in.status_line.data = ngx_pnalloc(r->pool, len);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	932 if (u->headers_in.status_line.data == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	933 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	934 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	935
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	936 ngx_memcpy(u->headers_in.status_line.data, status->start, len);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	937
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	938 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	939 "http uwsgi status %ui \"%V\"",
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	940 u->headers_in.status_n, &u->headers_in.status_line);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	941
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	942 u->process_header = ngx_http_uwsgi_process_header;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	943
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	944 return ngx_http_uwsgi_process_header(r);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	945 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	946
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	947
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	948 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	949 ngx_http_uwsgi_process_header(ngx_http_request_t *r)
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	950 {
3624 3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	951 ngx_str_t *status_line;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	952 ngx_int_t rc, status;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	953 ngx_table_elt_t *h;
3624 3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	954 ngx_http_upstream_t *u;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	955 ngx_http_upstream_header_t *hh;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	956 ngx_http_upstream_main_conf_t *umcf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	957
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	958 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	959
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	960 for ( ;; ) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	961
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	962 rc = ngx_http_parse_header_line(r, &r->upstream->buffer, 1);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	963
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	964 if (rc == NGX_OK) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	965
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	966 /* a header line has been parsed successfully */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	967
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	968 h = ngx_list_push(&r->upstream->headers_in.headers);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	969 if (h == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	970 return NGX_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	971 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	972
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	973 h->hash = r->header_hash;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	974
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	975 h->key.len = r->header_name_end - r->header_name_start;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	976 h->value.len = r->header_end - r->header_start;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	977
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	978 h->key.data = ngx_pnalloc(r->pool,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	979 h->key.len + 1 + h->value.len + 1
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	980 + h->key.len);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	981 if (h->key.data == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	982 return NGX_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	983 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	984
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	985 h->value.data = h->key.data + h->key.len + 1;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	986 h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	987
4529 1ebec1d15a25 Fixed incorrect ngx_cpystrn() usage in ngx_http__process_header(). Maxim Dounin <mdounin@mdounin.ru>* parents: 4527 diff changeset	988 ngx_memcpy(h->key.data, r->header_name_start, h->key.len);
1ebec1d15a25 Fixed incorrect ngx_cpystrn() usage in ngx_http__process_header(). Maxim Dounin <mdounin@mdounin.ru>* parents: 4527 diff changeset	989 h->key.data[h->key.len] = '\0';
1ebec1d15a25 Fixed incorrect ngx_cpystrn() usage in ngx_http__process_header(). Maxim Dounin <mdounin@mdounin.ru>* parents: 4527 diff changeset	990 ngx_memcpy(h->value.data, r->header_start, h->value.len);
1ebec1d15a25 Fixed incorrect ngx_cpystrn() usage in ngx_http__process_header(). Maxim Dounin <mdounin@mdounin.ru>* parents: 4527 diff changeset	991 h->value.data[h->value.len] = '\0';
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	992
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	993 if (h->key.len == r->lowcase_index) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	994 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	995
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	996 } else {
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	997 ngx_strlow(h->lowcase_key, h->key.data, h->key.len);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	998 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	999
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1000 hh = ngx_hash_find(&umcf->headers_in_hash, h->hash,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1001 h->lowcase_key, h->key.len);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1002
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1003 if (hh && hh->handler(r, h, hh->offset) != NGX_OK) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1004 return NGX_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1005 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1006
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1007 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1008 "http uwsgi header: \"%V: %V\"", &h->key, &h->value);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1009
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1010 continue;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1011 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1012
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1013 if (rc == NGX_HTTP_PARSE_HEADER_DONE) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1014
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1015 /* a whole header has been parsed successfully */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1016
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1017 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1018 "http uwsgi header done");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1019
4527 9c3a2fc3c460 Uwsgi: merged r->http_version fixes from scgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 4522 diff changeset	1020 u = r->upstream;
9c3a2fc3c460 Uwsgi: merged r->http_version fixes from scgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 4522 diff changeset	1021
9c3a2fc3c460 Uwsgi: merged r->http_version fixes from scgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 4522 diff changeset	1022 if (u->headers_in.status_n) {
5078 10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1023 goto done;
3624 3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1024 }
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1025
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1026 if (u->headers_in.status) {
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1027 status_line = &u->headers_in.status->value;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1028
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1029 status = ngx_atoi(status_line->data, 3);
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1030 if (status == NGX_ERROR) {
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1031 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1032 "upstream sent invalid status \"%V\"",
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1033 status_line);
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1034 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1035 }
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1036
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1037 u->headers_in.status_n = status;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1038 u->headers_in.status_line = *status_line;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1039
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1040 } else if (u->headers_in.location) {
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1041 u->headers_in.status_n = 302;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1042 ngx_str_set(&u->headers_in.status_line,
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1043 "302 Moved Temporarily");
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1044
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1045 } else {
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1046 u->headers_in.status_n = 200;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1047 ngx_str_set(&u->headers_in.status_line, "200 OK");
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1048 }
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1049
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1050 if (u->state) {
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1051 u->state->status = u->headers_in.status_n;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1052 }
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1053
5078 10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1054 done:
10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1055
10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1056 if (u->headers_in.status_n == NGX_HTTP_SWITCHING_PROTOCOLS
5080 8da37c1b22a4 Trailing whitespace fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5078 diff changeset	1057 && r->headers_in.upgrade)
5078 10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1058 {
10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1059 u->upgrade = 1;
10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1060 }
10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1061
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1062 return NGX_OK;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1063 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1064
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1065 if (rc == NGX_AGAIN) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1066 return NGX_AGAIN;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1067 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1068
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1069 /* there was error while a header line parsing */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1070
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1071 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1072 "upstream sent invalid header");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1073
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1074 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1075 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1076 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1077
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1078
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1079 static void
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1080 ngx_http_uwsgi_abort_request(ngx_http_request_t *r)
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1081 {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1082 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1083 "abort http uwsgi request");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1084
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1085 return;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1086 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1087
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1088
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1089 static void
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1090 ngx_http_uwsgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1091 {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1092 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1093 "finalize http uwsgi request");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1094
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1095 return;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1096 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1097
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1098
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1099 static void *
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1100 ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1101 {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1102 ngx_http_uwsgi_loc_conf_t *conf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1103
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1104 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_uwsgi_loc_conf_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1105 if (conf == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1106 return NULL;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1107 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1108
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1109 conf->modifier1 = NGX_CONF_UNSET_UINT;
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1110 conf->modifier2 = NGX_CONF_UNSET_UINT;
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1111
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1112 conf->upstream.store = NGX_CONF_UNSET;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1113 conf->upstream.store_access = NGX_CONF_UNSET_UINT;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1114 conf->upstream.buffering = NGX_CONF_UNSET;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1115 conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1116
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4947 diff changeset	1117 conf->upstream.local = NGX_CONF_UNSET_PTR;
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4947 diff changeset	1118
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1119 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1120 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1121 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1122
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1123 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1124 conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1125
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1126 conf->upstream.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1127 conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1128 conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1129
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1130 conf->upstream.pass_request_headers = NGX_CONF_UNSET;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1131 conf->upstream.pass_request_body = NGX_CONF_UNSET;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1132
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1133 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1134 conf->upstream.cache = NGX_CONF_UNSET_PTR;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1135 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	1136 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR;
3693 e3bcc2f4c418 fix scgi_no_cache and uwsgi_no_cache initialization Igor Sysoev <igor@sysoev.ru> parents: 3692 diff changeset	1137 conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1138 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
4386 92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1139 conf->upstream.cache_lock = NGX_CONF_UNSET;
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1140 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	1141 conf->upstream.cache_revalidate = NGX_CONF_UNSET;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1142 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1143
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1144 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1145 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1146
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1147 conf->upstream.intercept_errors = NGX_CONF_UNSET;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1148
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1149 /* "uwsgi_cyclic_temp_file" is disabled */
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1150 conf->upstream.cyclic_temp_file = 0;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1151
4157 9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	1152 conf->upstream.change_buffering = 1;
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	1153
3976 215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	1154 ngx_str_set(&conf->upstream.module, "uwsgi");
215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	1155
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1156 return conf;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1157 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1158
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1159
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1160 static char *
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1161 ngx_http_uwsgi_merge_loc_conf(ngx_conf_t cf, void parent, void *child)
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1162 {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1163 ngx_http_uwsgi_loc_conf_t *prev = parent;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1164 ngx_http_uwsgi_loc_conf_t *conf = child;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1165
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1166 size_t size;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1167 ngx_hash_init_t hash;
3731 72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	1168 ngx_http_core_loc_conf_t *clcf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1169
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1170 if (conf->upstream.store != 0) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1171 ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1172
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1173 if (conf->upstream.store_lengths == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1174 conf->upstream.store_lengths = prev->upstream.store_lengths;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1175 conf->upstream.store_values = prev->upstream.store_values;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1176 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1177 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1178
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1179 ngx_conf_merge_uint_value(conf->upstream.store_access,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1180 prev->upstream.store_access, 0600);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1181
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1182 ngx_conf_merge_value(conf->upstream.buffering,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1183 prev->upstream.buffering, 1);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1184
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1185 ngx_conf_merge_value(conf->upstream.ignore_client_abort,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1186 prev->upstream.ignore_client_abort, 0);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1187
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4947 diff changeset	1188 ngx_conf_merge_ptr_value(conf->upstream.local,
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4947 diff changeset	1189 prev->upstream.local, NULL);
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4947 diff changeset	1190
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1191 ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1192 prev->upstream.connect_timeout, 60000);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1193
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1194 ngx_conf_merge_msec_value(conf->upstream.send_timeout,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1195 prev->upstream.send_timeout, 60000);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1196
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1197 ngx_conf_merge_msec_value(conf->upstream.read_timeout,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1198 prev->upstream.read_timeout, 60000);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1199
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1200 ngx_conf_merge_size_value(conf->upstream.send_lowat,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1201 prev->upstream.send_lowat, 0);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1202
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1203 ngx_conf_merge_size_value(conf->upstream.buffer_size,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1204 prev->upstream.buffer_size,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1205 (size_t) ngx_pagesize);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1206
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1207
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1208 ngx_conf_merge_bufs_value(conf->upstream.bufs, prev->upstream.bufs,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1209 8, ngx_pagesize);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1210
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1211 if (conf->upstream.bufs.num < 2) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1212 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1213 "there must be at least 2 \"uwsgi_buffers\"");
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1214 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1215 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1216
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1217
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1218 size = conf->upstream.buffer_size;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1219 if (size < conf->upstream.bufs.size) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1220 size = conf->upstream.bufs.size;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1221 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1222
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1223
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1224 ngx_conf_merge_size_value(conf->upstream.busy_buffers_size_conf,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1225 prev->upstream.busy_buffers_size_conf,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1226 NGX_CONF_UNSET_SIZE);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1227
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1228 if (conf->upstream.busy_buffers_size_conf == NGX_CONF_UNSET_SIZE) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1229 conf->upstream.busy_buffers_size = 2 * size;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1230 } else {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1231 conf->upstream.busy_buffers_size =
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1232 conf->upstream.busy_buffers_size_conf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1233 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1234
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1235 if (conf->upstream.busy_buffers_size < size) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1236 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	1237 "\"uwsgi_busy_buffers_size\" must be equal to or greater "
834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	1238 "than the maximum of the value of \"uwsgi_buffer_size\" and "
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1239 "one of the \"uwsgi_buffers\"");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1240
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1241 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1242 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1243
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1244 if (conf->upstream.busy_buffers_size
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1245 > (conf->upstream.bufs.num - 1) * conf->upstream.bufs.size)
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1246 {
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1247 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1248 "\"uwsgi_busy_buffers_size\" must be less than "
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1249 "the size of all \"uwsgi_buffers\" minus one buffer");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1250
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1251 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1252 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1253
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1254
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1255 ngx_conf_merge_size_value(conf->upstream.temp_file_write_size_conf,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1256 prev->upstream.temp_file_write_size_conf,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1257 NGX_CONF_UNSET_SIZE);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1258
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1259 if (conf->upstream.temp_file_write_size_conf == NGX_CONF_UNSET_SIZE) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1260 conf->upstream.temp_file_write_size = 2 * size;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1261 } else {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1262 conf->upstream.temp_file_write_size =
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1263 conf->upstream.temp_file_write_size_conf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1264 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1265
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1266 if (conf->upstream.temp_file_write_size < size) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1267 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	1268 "\"uwsgi_temp_file_write_size\" must be equal to or greater than "
834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	1269 "the maximum of the value of \"uwsgi_buffer_size\" and "
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1270 "one of the \"uwsgi_buffers\"");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1271
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1272 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1273 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1274
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1275
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1276 ngx_conf_merge_size_value(conf->upstream.max_temp_file_size_conf,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1277 prev->upstream.max_temp_file_size_conf,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1278 NGX_CONF_UNSET_SIZE);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1279
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1280 if (conf->upstream.max_temp_file_size_conf == NGX_CONF_UNSET_SIZE) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1281 conf->upstream.max_temp_file_size = 1024 * 1024 * 1024;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1282 } else {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1283 conf->upstream.max_temp_file_size =
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1284 conf->upstream.max_temp_file_size_conf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1285 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1286
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1287 if (conf->upstream.max_temp_file_size != 0
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1288 && conf->upstream.max_temp_file_size < size) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1289 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1290 "\"uwsgi_max_temp_file_size\" must be equal to zero to disable "
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	1291 "temporary files usage or must be equal to or greater than "
834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4529 diff changeset	1292 "the maximum of the value of \"uwsgi_buffer_size\" and "
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1293 "one of the \"uwsgi_buffers\"");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1294
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1295 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1296 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1297
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1298
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1299 ngx_conf_merge_bitmask_value(conf->upstream.ignore_headers,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1300 prev->upstream.ignore_headers,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1301 NGX_CONF_BITMASK_SET);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1302
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1303
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1304 ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1305 prev->upstream.next_upstream,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1306 (NGX_CONF_BITMASK_SET
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1307 \|NGX_HTTP_UPSTREAM_FT_ERROR
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1308 \|NGX_HTTP_UPSTREAM_FT_TIMEOUT));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1309
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1310 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1311 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1312 \|NGX_HTTP_UPSTREAM_FT_OFF;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1313 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1314
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1315 if (ngx_conf_merge_path_value(cf, &conf->upstream.temp_path,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1316 prev->upstream.temp_path,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1317 &ngx_http_uwsgi_temp_path)
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1318 != NGX_OK)
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1319 {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1320 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1321 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1322
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1323 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1324
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1325 ngx_conf_merge_ptr_value(conf->upstream.cache,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1326 prev->upstream.cache, NULL);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1327
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1328 if (conf->upstream.cache && conf->upstream.cache->data == NULL) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1329 ngx_shm_zone_t *shm_zone;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1330
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1331 shm_zone = conf->upstream.cache;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1332
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1333 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1334 "\"uwsgi_cache\" zone \"%V\" is unknown",
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1335 &shm_zone->shm.name);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1336
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1337 return NGX_CONF_ERROR;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1338 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1339
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1340 ngx_conf_merge_uint_value(conf->upstream.cache_min_uses,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1341 prev->upstream.cache_min_uses, 1);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1342
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1343 ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1344 prev->upstream.cache_use_stale,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1345 (NGX_CONF_BITMASK_SET
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1346 \|NGX_HTTP_UPSTREAM_FT_OFF));
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1347
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1348 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1349 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1350 \|NGX_HTTP_UPSTREAM_FT_OFF;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1351 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1352
4401 d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4386 diff changeset	1353 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_ERROR) {
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4386 diff changeset	1354 conf->upstream.cache_use_stale \|= NGX_HTTP_UPSTREAM_FT_NOLIVE;
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4386 diff changeset	1355 }
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4386 diff changeset	1356
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1357 if (conf->upstream.cache_methods == 0) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1358 conf->upstream.cache_methods = prev->upstream.cache_methods;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1359 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1360
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1361 conf->upstream.cache_methods \|= NGX_HTTP_GET\|NGX_HTTP_HEAD;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1362
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	1363 ngx_conf_merge_ptr_value(conf->upstream.cache_bypass,
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	1364 prev->upstream.cache_bypass, NULL);
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	1365
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1366 ngx_conf_merge_ptr_value(conf->upstream.no_cache,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1367 prev->upstream.no_cache, NULL);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1368
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1369 ngx_conf_merge_ptr_value(conf->upstream.cache_valid,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1370 prev->upstream.cache_valid, NULL);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1371
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1372 if (conf->cache_key.value.data == NULL) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1373 conf->cache_key = prev->cache_key;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1374 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1375
4386 92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1376 ngx_conf_merge_value(conf->upstream.cache_lock,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1377 prev->upstream.cache_lock, 0);
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1378
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1379 ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1380 prev->upstream.cache_lock_timeout, 5000);
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1381
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	1382 ngx_conf_merge_value(conf->upstream.cache_revalidate,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	1383 prev->upstream.cache_revalidate, 0);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	1384
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1385 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1386
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1387 ngx_conf_merge_value(conf->upstream.pass_request_headers,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1388 prev->upstream.pass_request_headers, 1);
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1389 ngx_conf_merge_value(conf->upstream.pass_request_body,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1390 prev->upstream.pass_request_body, 1);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1391
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1392 ngx_conf_merge_value(conf->upstream.intercept_errors,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1393 prev->upstream.intercept_errors, 0);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1394
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1395 ngx_conf_merge_str_value(conf->uwsgi_string, prev->uwsgi_string, "");
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1396
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1397 hash.max_size = 512;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1398 hash.bucket_size = ngx_align(64, ngx_cacheline_size);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1399 hash.name = "uwsgi_hide_headers_hash";
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1400
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1401 if (ngx_http_upstream_hide_headers_hash(cf, &conf->upstream,
3670 2728c4e4a9ae do not use a cache headers set to hide Igor Sysoev <igor@sysoev.ru> parents: 3667 diff changeset	1402 &prev->upstream, ngx_http_uwsgi_hide_headers, &hash)
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1403 != NGX_OK)
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1404 {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1405 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1406 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1407
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1408 if (conf->upstream.upstream == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1409 conf->upstream.upstream = prev->upstream.upstream;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1410 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1411
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1412 if (conf->uwsgi_lengths == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1413 conf->uwsgi_lengths = prev->uwsgi_lengths;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1414 conf->uwsgi_values = prev->uwsgi_values;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1415 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1416
3731 72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	1417 if (conf->upstream.upstream \|\| conf->uwsgi_lengths) {
72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	1418 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	1419 if (clcf->handler == NULL && clcf->lmt_excpt) {
72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	1420 clcf->handler = ngx_http_uwsgi_handler;
72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	1421 }
72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	1422 }
72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	1423
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1424 ngx_conf_merge_uint_value(conf->modifier1, prev->modifier1, 0);
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1425 ngx_conf_merge_uint_value(conf->modifier2, prev->modifier2, 0);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1426
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1427 if (ngx_http_uwsgi_merge_params(cf, conf, prev) != NGX_OK) {
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1428 return NGX_CONF_ERROR;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1429 }
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1430
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1431 return NGX_CONF_OK;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1432 }
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1433
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1434
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1435 static ngx_int_t
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1436 ngx_http_uwsgi_merge_params(ngx_conf_t cf, ngx_http_uwsgi_loc_conf_t conf,
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1437 ngx_http_uwsgi_loc_conf_t *prev)
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1438 {
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1439 u_char *p;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1440 size_t size;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1441 uintptr_t *code;
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1442 ngx_uint_t i, nsrc;
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1443 ngx_array_t headers_names;
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1444 #if (NGX_HTTP_CACHE)
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1445 ngx_array_t params_merged;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1446 #endif
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1447 ngx_hash_key_t *hk;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1448 ngx_hash_init_t hash;
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1449 ngx_http_upstream_param_t *src;
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1450 ngx_http_script_compile_t sc;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1451 ngx_http_script_copy_code_t *copy;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1452
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1453 if (conf->params_source == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1454 conf->params_source = prev->params_source;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1455
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1456 if (prev->headers_hash.buckets
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1457 #if (NGX_HTTP_CACHE)
4522 14411ee4d89f Whitespace fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	1458 && ((conf->upstream.cache == NULL)
14411ee4d89f Whitespace fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	1459 == (prev->upstream.cache == NULL))
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1460 #endif
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1461 )
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1462 {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1463 conf->flushes = prev->flushes;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1464 conf->params_len = prev->params_len;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1465 conf->params = prev->params;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1466 conf->headers_hash = prev->headers_hash;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1467 conf->header_params = prev->header_params;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1468
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1469 return NGX_OK;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1470 }
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1471 }
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1472
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1473 if (conf->params_source == NULL
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1474 #if (NGX_HTTP_CACHE)
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1475 && (conf->upstream.cache == NULL)
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1476 #endif
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1477 )
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1478 {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1479 conf->headers_hash.buckets = (void *) 1;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1480 return NGX_OK;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1481 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1482
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1483 conf->params_len = ngx_array_create(cf->pool, 64, 1);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1484 if (conf->params_len == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1485 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1486 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1487
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1488 conf->params = ngx_array_create(cf->pool, 512, 1);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1489 if (conf->params == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1490 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1491 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1492
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1493 if (ngx_array_init(&headers_names, cf->temp_pool, 4, sizeof(ngx_hash_key_t))
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1494 != NGX_OK)
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1495 {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1496 return NGX_ERROR;
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1497 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1498
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1499 if (conf->params_source) {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1500 src = conf->params_source->elts;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1501 nsrc = conf->params_source->nelts;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1502
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1503 } else {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1504 src = NULL;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1505 nsrc = 0;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1506 }
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1507
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1508 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1509
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1510 if (conf->upstream.cache) {
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1511 ngx_keyval_t *h;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1512 ngx_http_upstream_param_t *s;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1513
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1514 if (ngx_array_init(&params_merged, cf->temp_pool, 4,
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1515 sizeof(ngx_http_upstream_param_t))
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1516 != NGX_OK)
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1517 {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1518 return NGX_ERROR;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1519 }
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1520
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1521 for (i = 0; i < nsrc; i++) {
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1522
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1523 s = ngx_array_push(&params_merged);
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1524 if (s == NULL) {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1525 return NGX_ERROR;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1526 }
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1527
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1528 *s = src[i];
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1529 }
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1530
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1531 h = ngx_http_uwsgi_cache_headers;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1532
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1533 while (h->key.len) {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1534
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1535 src = params_merged.elts;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1536 nsrc = params_merged.nelts;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1537
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1538 for (i = 0; i < nsrc; i++) {
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1539 if (ngx_strcasecmp(h->key.data, src[i].key.data) == 0) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1540 goto next;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1541 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1542 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1543
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1544 s = ngx_array_push(&params_merged);
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1545 if (s == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1546 return NGX_ERROR;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1547 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1548
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1549 s->key = h->key;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1550 s->value = h->value;
5451 e68af4e3396f Upstream: skip empty cache headers. Maxim Dounin <mdounin@mdounin.ru> parents: 5441 diff changeset	1551 s->skip_empty = 1;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1552
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1553 next:
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1554
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1555 h++;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1556 }
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1557
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1558 src = params_merged.elts;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1559 nsrc = params_merged.nelts;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1560 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1561
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1562 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1563
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1564 for (i = 0; i < nsrc; i++) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1565
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1566 if (src[i].key.len > sizeof("HTTP_") - 1
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1567 && ngx_strncmp(src[i].key.data, "HTTP_", sizeof("HTTP_") - 1) == 0)
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1568 {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1569 hk = ngx_array_push(&headers_names);
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1570 if (hk == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1571 return NGX_ERROR;
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1572 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1573
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1574 hk->key.len = src[i].key.len - 5;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1575 hk->key.data = src[i].key.data + 5;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1576 hk->key_hash = ngx_hash_key_lc(hk->key.data, hk->key.len);
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1577 hk->value = (void *) 1;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1578
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1579 if (src[i].value.len == 0) {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1580 continue;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1581 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1582 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1583
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1584 copy = ngx_array_push_n(conf->params_len,
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1585 sizeof(ngx_http_script_copy_code_t));
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1586 if (copy == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1587 return NGX_ERROR;
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1588 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1589
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1590 copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1591 copy->len = src[i].key.len;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1592
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1593 copy = ngx_array_push_n(conf->params_len,
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1594 sizeof(ngx_http_script_copy_code_t));
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1595 if (copy == NULL) {
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1596 return NGX_ERROR;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1597 }
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1598
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1599 copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1600 copy->len = src[i].skip_empty;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1601
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1602
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1603 size = (sizeof(ngx_http_script_copy_code_t)
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1604 + src[i].key.len + sizeof(uintptr_t) - 1)
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1605 & ~(sizeof(uintptr_t) - 1);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1606
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1607 copy = ngx_array_push_n(conf->params, size);
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1608 if (copy == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1609 return NGX_ERROR;
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1610 }
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1611
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1612 copy->code = ngx_http_script_copy_code;
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1613 copy->len = src[i].key.len;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1614
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1615 p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t);
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1616 ngx_memcpy(p, src[i].key.data, src[i].key.len);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1617
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1618
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1619 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1620
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1621 sc.cf = cf;
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1622 sc.source = &src[i].value;
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1623 sc.flushes = &conf->flushes;
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1624 sc.lengths = &conf->params_len;
fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1625 sc.values = &conf->params;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1626
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	1627 if (ngx_http_script_compile(&sc) != NGX_OK) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1628 return NGX_ERROR;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1629 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1630
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1631 code = ngx_array_push_n(conf->params_len, sizeof(uintptr_t));
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1632 if (code == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1633 return NGX_ERROR;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1634 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1635
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1636 *code = (uintptr_t) NULL;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1637
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1638
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1639 code = ngx_array_push_n(conf->params, sizeof(uintptr_t));
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1640 if (code == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1641 return NGX_ERROR;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1642 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1643
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1644 *code = (uintptr_t) NULL;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1645 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1646
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1647 code = ngx_array_push_n(conf->params_len, sizeof(uintptr_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1648 if (code == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1649 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1650 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1651
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1652 *code = (uintptr_t) NULL;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1653
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1654 conf->header_params = headers_names.nelts;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1655
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1656 hash.hash = &conf->headers_hash;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1657 hash.key = ngx_hash_key_lc;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1658 hash.max_size = 512;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1659 hash.bucket_size = 64;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1660 hash.name = "uwsgi_params_hash";
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1661 hash.pool = cf->pool;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1662 hash.temp_pool = NULL;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1663
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1664 return ngx_hash_init(&hash, headers_names.elts, headers_names.nelts);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1665 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1666
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1667
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1668 static char *
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1669 ngx_http_uwsgi_pass(ngx_conf_t cf, ngx_command_t cmd, void *conf)
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1670 {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1671 ngx_http_uwsgi_loc_conf_t *uwcf = conf;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1672
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1673 ngx_url_t u;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1674 ngx_str_t value, url;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1675 ngx_uint_t n;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1676 ngx_http_core_loc_conf_t *clcf;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1677 ngx_http_script_compile_t sc;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1678
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1679 if (uwcf->upstream.upstream \|\| uwcf->uwsgi_lengths) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1680 return "is duplicate";
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1681 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1682
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1683 clcf = ngx_http_conf_get_module_loc_conf (cf, ngx_http_core_module);
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1684 clcf->handler = ngx_http_uwsgi_handler;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1685
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1686 value = cf->args->elts;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1687
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1688 url = &value[1];
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1689
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1690 n = ngx_http_script_variables_count(url);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1691
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1692 if (n) {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1693
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1694 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1695
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1696 sc.cf = cf;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1697 sc.source = url;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1698 sc.lengths = &uwcf->uwsgi_lengths;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1699 sc.values = &uwcf->uwsgi_values;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1700 sc.variables = n;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1701 sc.complete_lengths = 1;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1702 sc.complete_values = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1703
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1704 if (ngx_http_script_compile(&sc) != NGX_OK) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1705 return NGX_CONF_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1706 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1707
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1708 return NGX_CONF_OK;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1709 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1710
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1711 ngx_memzero(&u, sizeof(ngx_url_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1712
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1713 u.url = value[1];
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1714 u.no_resolve = 1;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1715
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1716 uwcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1717 if (uwcf->upstream.upstream == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1718 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1719 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1720
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1721 if (clcf->name.data[clcf->name.len - 1] == '/') {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1722 clcf->auto_redirect = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1723 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1724
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1725 return NGX_CONF_OK;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1726 }
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1727
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1728
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1729 static char *
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1730 ngx_http_uwsgi_store(ngx_conf_t cf, ngx_command_t cmd, void *conf)
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1731 {
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1732 ngx_http_uwsgi_loc_conf_t *uwcf = conf;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1733
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1734 ngx_str_t *value;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1735 ngx_http_script_compile_t sc;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1736
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1737 if (uwcf->upstream.store != NGX_CONF_UNSET \|\| uwcf->upstream.store_lengths)
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1738 {
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1739 return "is duplicate";
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1740 }
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1741
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1742 value = cf->args->elts;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1743
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1744 if (ngx_strcmp(value[1].data, "off") == 0) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1745 uwcf->upstream.store = 0;
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1746 return NGX_CONF_OK;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1747 }
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1748
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1749 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1750
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1751 if (uwcf->upstream.cache != NGX_CONF_UNSET_PTR
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1752 && uwcf->upstream.cache != NULL)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1753 {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1754 return "is incompatible with \"uwsgi_cache\"";
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1755 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1756
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1757 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1758
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1759 if (ngx_strcmp(value[1].data, "on") == 0) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1760 uwcf->upstream.store = 1;
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1761 return NGX_CONF_OK;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1762 }
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1763
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1764 /* include the terminating '\0' into script */
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1765 value[1].len++;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1766
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1767 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1768
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1769 sc.cf = cf;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1770 sc.source = &value[1];
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1771 sc.lengths = &uwcf->upstream.store_lengths;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1772 sc.values = &uwcf->upstream.store_values;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1773 sc.variables = ngx_http_script_variables_count(&value[1]);;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1774 sc.complete_lengths = 1;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1775 sc.complete_values = 1;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1776
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1777 if (ngx_http_script_compile(&sc) != NGX_OK) {
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1778 return NGX_CONF_ERROR;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1779 }
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1780
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1781 return NGX_CONF_OK;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	1782 }
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1783
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1784
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1785 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1786
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1787 static char *
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1788 ngx_http_uwsgi_cache(ngx_conf_t cf, ngx_command_t cmd, void *conf)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1789 {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1790 ngx_http_uwsgi_loc_conf_t *uwcf = conf;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1791
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1792 ngx_str_t *value;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1793
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1794 value = cf->args->elts;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1795
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1796 if (uwcf->upstream.cache != NGX_CONF_UNSET_PTR) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1797 return "is duplicate";
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1798 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1799
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1800 if (ngx_strcmp(value[1].data, "off") == 0) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1801 uwcf->upstream.cache = NULL;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1802 return NGX_CONF_OK;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1803 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1804
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1805 if (uwcf->upstream.store > 0 \|\| uwcf->upstream.store_lengths) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1806 return "is incompatible with \"uwsgi_store\"";
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1807 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1808
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1809 uwcf->upstream.cache = ngx_shared_memory_add(cf, &value[1], 0,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1810 &ngx_http_uwsgi_module);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1811 if (uwcf->upstream.cache == NULL) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1812 return NGX_CONF_ERROR;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1813 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1814
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1815 return NGX_CONF_OK;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1816 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1817
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1818
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1819 static char *
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1820 ngx_http_uwsgi_cache_key(ngx_conf_t cf, ngx_command_t cmd, void *conf)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1821 {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1822 ngx_http_uwsgi_loc_conf_t *uwcf = conf;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1823
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1824 ngx_str_t *value;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1825 ngx_http_compile_complex_value_t ccv;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1826
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1827 value = cf->args->elts;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1828
4947 4251e72b8bb4 Allow the complex value to be defined as an empty string. Ruslan Ermilov <ru@nginx.com> parents: 4615 diff changeset	1829 if (uwcf->cache_key.value.data) {
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1830 return "is duplicate";
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1831 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1832
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1833 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1834
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1835 ccv.cf = cf;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1836 ccv.value = &value[1];
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1837 ccv.complex_value = &uwcf->cache_key;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1838
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1839 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1840 return NGX_CONF_ERROR;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1841 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1842
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1843 return NGX_CONF_OK;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1844 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1845
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1846 #endif

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_uwsgi_module.c @ 5451:e68af4e3396f