nginx: src/http/modules/ngx_http_uwsgi

annotate src/http/modules/ngx_http_uwsgi_module.c @ 7730:1a719ee45526

Upstream: proxy_ssl_conf_command and friends. Similarly to ssl_conf_command, proxy_ssl_conf_command (grpc_ssl_conf_command, uwsgi_ssl_conf_command) can be used to set arbitrary OpenSSL configuration parameters as long as nginx is compiled with OpenSSL 1.0.2 or later, when connecting to upstream servers with SSL. Full list of available configuration commands can be found in the SSL_CONF_cmd manual page (https://www.openssl.org/docs/man1.1.1/man3/SSL_CONF_cmd.html).

author	Maxim Dounin <mdounin@mdounin.ru>
date	Thu, 22 Oct 2020 18:00:23 +0300
parents	bffcc5af1d72
children	7ce28b4cc57e

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 {
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	16 ngx_array_t caches; /* ngx_http_file_cache_t * */
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	17 } ngx_http_uwsgi_main_conf_t;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	18
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	19
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	20 typedef struct {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	21 ngx_array_t *flushes;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	22 ngx_array_t *lengths;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	23 ngx_array_t *values;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	24 ngx_uint_t number;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	25 ngx_hash_t hash;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	26 } ngx_http_uwsgi_params_t;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	27
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	28
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	29 typedef struct {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	30 ngx_http_upstream_conf_t upstream;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	31
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	32 ngx_http_uwsgi_params_t params;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	33 #if (NGX_HTTP_CACHE)
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	34 ngx_http_uwsgi_params_t params_cache;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	35 #endif
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	36 ngx_array_t *params_source;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	37
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	38 ngx_array_t *uwsgi_lengths;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	39 ngx_array_t *uwsgi_values;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	40
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	41 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	42 ngx_http_complex_value_t cache_key;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	43 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	44
3550 9f715c9e5b82 style fix Igor Sysoev <igor@sysoev.ru> parents: 3549 diff changeset	45 ngx_str_t uwsgi_string;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	46
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	47 ngx_uint_t modifier1;
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	48 ngx_uint_t modifier2;
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	49
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	50 #if (NGX_HTTP_SSL)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	51 ngx_uint_t ssl;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	52 ngx_uint_t ssl_protocols;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	53 ngx_str_t ssl_ciphers;
5662 3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	54 ngx_uint_t ssl_verify_depth;
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	55 ngx_str_t ssl_trusted_certificate;
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	56 ngx_str_t ssl_crl;
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	57 ngx_str_t ssl_certificate;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	58 ngx_str_t ssl_certificate_key;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	59 ngx_array_t *ssl_passwords;
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	60 ngx_array_t *ssl_conf_commands;
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	61 #endif
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	62 } ngx_http_uwsgi_loc_conf_t;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	63
3556 b9415935d95d style fix Igor Sysoev <igor@sysoev.ru> parents: 3555 diff changeset	64
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	65 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	66 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	67 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	68 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	69 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	70 static ngx_int_t ngx_http_uwsgi_process_header(ngx_http_request_t *r);
7678 bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	71 static ngx_int_t ngx_http_uwsgi_input_filter_init(void *data);
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	72 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	73 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	74 ngx_int_t rc);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	75
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	76 static void ngx_http_uwsgi_create_main_conf(ngx_conf_t cf);
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	77 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	78 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	79 void *child);
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	80 static ngx_int_t ngx_http_uwsgi_init_params(ngx_conf_t *cf,
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	81 ngx_http_uwsgi_loc_conf_t conf, ngx_http_uwsgi_params_t params,
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	82 ngx_keyval_t *default_params);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	83
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	84 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	85 void *conf);
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	86 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	87 void *conf);
3541 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 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	90 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	91 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	92 void *conf);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	93 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	94 void *conf);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	95 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	96
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	97 #if (NGX_HTTP_SSL)
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	98 static char ngx_http_uwsgi_ssl_password_file(ngx_conf_t cf,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	99 ngx_command_t cmd, void conf);
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	100 static char ngx_http_uwsgi_ssl_conf_command_check(ngx_conf_t cf, void *post,
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	101 void *data);
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	102 static ngx_int_t ngx_http_uwsgi_set_ssl(ngx_conf_t *cf,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	103 ngx_http_uwsgi_loc_conf_t *uwcf);
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	104 #endif
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	105
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	106
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	107 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	108 ngx_conf_check_num_bounds, 0, 255
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	109 };
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	110
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	111
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	112 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	113 { 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	114 { 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	115 { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
6467 91c8d990fb45 Upstream: proxy_next_upstream non_idempotent. Maxim Dounin <mdounin@mdounin.ru> parents: 6303 diff changeset	116 { ngx_string("non_idempotent"), NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT },
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	117 { 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	118 { 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	119 { 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	120 { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
6966 fa56ab75cffc Upstream: allow recovery from "429 Too Many Requests" response. Piotr Sikora <piotrsikora@google.com> parents: 6906 diff changeset	121 { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 },
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	122 { 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	123 { 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	124 { ngx_null_string, 0 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	125 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	126
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	127
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	128 #if (NGX_HTTP_SSL)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	129
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	130 static ngx_conf_bitmask_t ngx_http_uwsgi_ssl_protocols[] = {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	131 { ngx_string("SSLv2"), NGX_SSL_SSLv2 },
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	132 { ngx_string("SSLv3"), NGX_SSL_SSLv3 },
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	133 { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	134 { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	135 { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
6981 08dc60979133 SSL: added support for TLSv1.3 in ssl_protocols directive. Sergey Kandaurov <pluknet@nginx.com> parents: 6966 diff changeset	136 { ngx_string("TLSv1.3"), NGX_SSL_TLSv1_3 },
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	137 { ngx_null_string, 0 }
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	138 };
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	139
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	140 static ngx_conf_post_t ngx_http_uwsgi_ssl_conf_command_post =
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	141 { ngx_http_uwsgi_ssl_conf_command_check };
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	142
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	143 #endif
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	144
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	145
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	146 ngx_module_t ngx_http_uwsgi_module;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	147
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	148
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	149 static ngx_command_t ngx_http_uwsgi_commands[] = {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	150
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	151 { ngx_string("uwsgi_pass"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	152 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	153 ngx_http_uwsgi_pass,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	154 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	155 0,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	156 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	157
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	158 { ngx_string("uwsgi_modifier1"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	159 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	160 ngx_conf_set_num_slot,
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	161 NGX_HTTP_LOC_CONF_OFFSET,
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	162 offsetof(ngx_http_uwsgi_loc_conf_t, modifier1),
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	163 &ngx_http_uwsgi_modifier_bounds },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	164
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	165 { ngx_string("uwsgi_modifier2"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	166 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	167 ngx_conf_set_num_slot,
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	168 NGX_HTTP_LOC_CONF_OFFSET,
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	169 offsetof(ngx_http_uwsgi_loc_conf_t, modifier2),
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	170 &ngx_http_uwsgi_modifier_bounds },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	171
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	172 { ngx_string("uwsgi_store"),
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	173 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	174 ngx_http_uwsgi_store,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	175 NGX_HTTP_LOC_CONF_OFFSET,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	176 0,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	177 NULL },
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	178
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	179 { ngx_string("uwsgi_store_access"),
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	180 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	181 ngx_conf_set_access_slot,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	182 NGX_HTTP_LOC_CONF_OFFSET,
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	183 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.store_access),
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	184 NULL },
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	185
4157 9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	186 { ngx_string("uwsgi_buffering"),
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	187 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	188 ngx_conf_set_flag_slot,
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	189 NGX_HTTP_LOC_CONF_OFFSET,
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	190 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	191 NULL },
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	192
6053 b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	193 { ngx_string("uwsgi_request_buffering"),
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	194 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	195 ngx_conf_set_flag_slot,
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	196 NGX_HTTP_LOC_CONF_OFFSET,
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	197 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.request_buffering),
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	198 NULL },
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	199
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	200 { ngx_string("uwsgi_ignore_client_abort"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	201 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	202 ngx_conf_set_flag_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	203 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	204 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	205 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	206
3567 9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	207 { ngx_string("uwsgi_bind"),
6530 1d0e03db9f8e Upstream: the "transparent" parameter of proxy_bind and friends. Roman Arutyunyan <arut@nginx.com> parents: 6467 diff changeset	208 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE12,
3567 9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	209 ngx_http_upstream_bind_set_slot,
9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	210 NGX_HTTP_LOC_CONF_OFFSET,
9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	211 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.local),
9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	212 NULL },
9bbfce117cfb uwsgi_bind Igor Sysoev <igor@sysoev.ru> parents: 3566 diff changeset	213
7371 8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7348 diff changeset	214 { ngx_string("uwsgi_socket_keepalive"),
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7348 diff changeset	215 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7348 diff changeset	216 ngx_conf_set_flag_slot,
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7348 diff changeset	217 NGX_HTTP_LOC_CONF_OFFSET,
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7348 diff changeset	218 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.socket_keepalive),
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7348 diff changeset	219 NULL },
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7348 diff changeset	220
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	221 { ngx_string("uwsgi_connect_timeout"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	222 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	223 ngx_conf_set_msec_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	224 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	225 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	226 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	227
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	228 { ngx_string("uwsgi_send_timeout"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	229 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	230 ngx_conf_set_msec_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	231 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	232 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	233 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	234
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	235 { ngx_string("uwsgi_buffer_size"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	236 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	237 ngx_conf_set_size_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	238 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	239 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	240 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	241
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	242 { ngx_string("uwsgi_pass_request_headers"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	243 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	244 ngx_conf_set_flag_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	245 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	246 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	247 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	248
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	249 { ngx_string("uwsgi_pass_request_body"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	250 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	251 ngx_conf_set_flag_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	252 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	253 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	254 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	255
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	256 { ngx_string("uwsgi_intercept_errors"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	257 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	258 ngx_conf_set_flag_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	259 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	260 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	261 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	262
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	263 { ngx_string("uwsgi_read_timeout"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	264 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	265 ngx_conf_set_msec_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	266 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	267 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	268 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	269
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	270 { ngx_string("uwsgi_buffers"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	271 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	272 ngx_conf_set_bufs_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	273 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	274 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	275 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	276
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	277 { ngx_string("uwsgi_busy_buffers_size"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	278 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	279 ngx_conf_set_size_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	280 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	281 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	282 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	283
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	284 { ngx_string("uwsgi_force_ranges"),
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	285 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	286 ngx_conf_set_flag_slot,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	287 NGX_HTTP_LOC_CONF_OFFSET,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	288 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.force_ranges),
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	289 NULL },
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	290
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	291 { ngx_string("uwsgi_limit_rate"),
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	292 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	293 ngx_conf_set_size_slot,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	294 NGX_HTTP_LOC_CONF_OFFSET,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	295 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.limit_rate),
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	296 NULL },
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	297
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	298 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	299
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	300 { ngx_string("uwsgi_cache"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3699 diff changeset	301 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	302 ngx_http_uwsgi_cache,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	303 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	304 0,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	305 NULL },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	306
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	307 { ngx_string("uwsgi_cache_key"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3699 diff changeset	308 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	309 ngx_http_uwsgi_cache_key,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	310 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	311 0,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	312 NULL },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	313
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	314 { ngx_string("uwsgi_cache_path"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	315 NGX_HTTP_MAIN_CONF\|NGX_CONF_2MORE,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	316 ngx_http_file_cache_set_slot,
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	317 NGX_HTTP_MAIN_CONF_OFFSET,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	318 offsetof(ngx_http_uwsgi_main_conf_t, caches),
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	319 &ngx_http_uwsgi_module },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	320
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	321 { 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	322 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	323 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	324 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	325 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	326 NULL },
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	327
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	328 { ngx_string("uwsgi_no_cache"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	329 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	330 ngx_http_set_predicate_slot,
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	331 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	332 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.no_cache),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	333 NULL },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	334
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	335 { ngx_string("uwsgi_cache_valid"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	336 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	337 ngx_http_file_cache_valid_set_slot,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	338 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	339 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_valid),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	340 NULL },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	341
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	342 { ngx_string("uwsgi_cache_min_uses"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	343 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	344 ngx_conf_set_num_slot,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	345 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	346 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_min_uses),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	347 NULL },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	348
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	349 { ngx_string("uwsgi_cache_max_range_offset"),
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	350 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	351 ngx_conf_set_off_slot,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	352 NGX_HTTP_LOC_CONF_OFFSET,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	353 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_max_range_offset),
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	354 NULL },
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	355
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	356 { ngx_string("uwsgi_cache_use_stale"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	357 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	358 ngx_conf_set_bitmask_slot,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	359 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	360 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_use_stale),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	361 &ngx_http_uwsgi_next_upstream_masks },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	362
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	363 { ngx_string("uwsgi_cache_methods"),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	364 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	365 ngx_conf_set_bitmask_slot,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	366 NGX_HTTP_LOC_CONF_OFFSET,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	367 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_methods),
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	368 &ngx_http_upstream_cache_method_mask },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	369
4386 92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	370 { ngx_string("uwsgi_cache_lock"),
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	371 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	372 ngx_conf_set_flag_slot,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	373 NGX_HTTP_LOC_CONF_OFFSET,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	374 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	375 NULL },
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	376
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	377 { ngx_string("uwsgi_cache_lock_timeout"),
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	378 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	379 ngx_conf_set_msec_slot,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	380 NGX_HTTP_LOC_CONF_OFFSET,
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	381 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	382 NULL },
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	383
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	384 { ngx_string("uwsgi_cache_lock_age"),
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	385 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	386 ngx_conf_set_msec_slot,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	387 NGX_HTTP_LOC_CONF_OFFSET,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	388 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_lock_age),
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	389 NULL },
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	390
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	391 { ngx_string("uwsgi_cache_revalidate"),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	392 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	393 ngx_conf_set_flag_slot,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	394 NGX_HTTP_LOC_CONF_OFFSET,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	395 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	396 NULL },
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	397
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	398 { ngx_string("uwsgi_cache_background_update"),
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	399 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	400 ngx_conf_set_flag_slot,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	401 NGX_HTTP_LOC_CONF_OFFSET,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	402 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_background_update),
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	403 NULL },
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	404
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	405 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	406
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	407 { ngx_string("uwsgi_temp_path"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	408 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	409 ngx_conf_set_path_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	410 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	411 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	412 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	413
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	414 { 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	415 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	416 ngx_conf_set_size_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	417 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	418 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	419 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	420
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	421 { 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	422 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	423 ngx_conf_set_size_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	424 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	425 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	426 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	427
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	428 { ngx_string("uwsgi_next_upstream"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	429 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	430 ngx_conf_set_bitmask_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	431 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	432 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	433 &ngx_http_uwsgi_next_upstream_masks },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	434
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	435 { ngx_string("uwsgi_next_upstream_tries"),
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	436 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	437 ngx_conf_set_num_slot,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	438 NGX_HTTP_LOC_CONF_OFFSET,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	439 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.next_upstream_tries),
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	440 NULL },
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	441
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	442 { ngx_string("uwsgi_next_upstream_timeout"),
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	443 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	444 ngx_conf_set_msec_slot,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	445 NGX_HTTP_LOC_CONF_OFFSET,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	446 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.next_upstream_timeout),
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	447 NULL },
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	448
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	449 { 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	450 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	451 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	452 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	453 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	454 NULL },
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 { ngx_string("uwsgi_string"),
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	457 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	458 ngx_conf_set_str_slot,
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	459 NGX_HTTP_LOC_CONF_OFFSET,
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	460 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	461 NULL },
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	462
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	463 { ngx_string("uwsgi_pass_header"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3699 diff changeset	464 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	465 ngx_conf_set_str_array_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	466 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	467 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	468 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	469
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	470 { ngx_string("uwsgi_hide_header"),
3729 4b773fc06336 fix directive type Igor Sysoev <igor@sysoev.ru> parents: 3699 diff changeset	471 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	472 ngx_conf_set_str_array_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	473 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	474 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	475 NULL },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	476
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	477 { ngx_string("uwsgi_ignore_headers"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	478 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	479 ngx_conf_set_bitmask_slot,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	480 NGX_HTTP_LOC_CONF_OFFSET,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	481 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	482 &ngx_http_upstream_ignore_headers_masks },
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	483
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	484 #if (NGX_HTTP_SSL)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	485
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	486 { ngx_string("uwsgi_ssl_session_reuse"),
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	487 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	488 ngx_conf_set_flag_slot,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	489 NGX_HTTP_LOC_CONF_OFFSET,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	490 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.ssl_session_reuse),
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	491 NULL },
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	492
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	493 { ngx_string("uwsgi_ssl_protocols"),
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	494 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_1MORE,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	495 ngx_conf_set_bitmask_slot,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	496 NGX_HTTP_LOC_CONF_OFFSET,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	497 offsetof(ngx_http_uwsgi_loc_conf_t, ssl_protocols),
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	498 &ngx_http_uwsgi_ssl_protocols },
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	499
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	500 { ngx_string("uwsgi_ssl_ciphers"),
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	501 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	502 ngx_conf_set_str_slot,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	503 NGX_HTTP_LOC_CONF_OFFSET,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	504 offsetof(ngx_http_uwsgi_loc_conf_t, ssl_ciphers),
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	505 NULL },
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	506
5662 3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	507 { ngx_string("uwsgi_ssl_name"),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	508 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	509 ngx_http_set_complex_value_slot,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	510 NGX_HTTP_LOC_CONF_OFFSET,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	511 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.ssl_name),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	512 NULL },
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	513
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	514 { ngx_string("uwsgi_ssl_server_name"),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	515 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	516 ngx_conf_set_flag_slot,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	517 NGX_HTTP_LOC_CONF_OFFSET,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	518 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.ssl_server_name),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	519 NULL },
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	520
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	521 { ngx_string("uwsgi_ssl_verify"),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	522 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_FLAG,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	523 ngx_conf_set_flag_slot,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	524 NGX_HTTP_LOC_CONF_OFFSET,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	525 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.ssl_verify),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	526 NULL },
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	527
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	528 { ngx_string("uwsgi_ssl_verify_depth"),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	529 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	530 ngx_conf_set_num_slot,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	531 NGX_HTTP_LOC_CONF_OFFSET,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	532 offsetof(ngx_http_uwsgi_loc_conf_t, ssl_verify_depth),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	533 NULL },
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	534
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	535 { ngx_string("uwsgi_ssl_trusted_certificate"),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	536 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	537 ngx_conf_set_str_slot,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	538 NGX_HTTP_LOC_CONF_OFFSET,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	539 offsetof(ngx_http_uwsgi_loc_conf_t, ssl_trusted_certificate),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	540 NULL },
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	541
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	542 { ngx_string("uwsgi_ssl_crl"),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	543 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	544 ngx_conf_set_str_slot,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	545 NGX_HTTP_LOC_CONF_OFFSET,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	546 offsetof(ngx_http_uwsgi_loc_conf_t, ssl_crl),
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	547 NULL },
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	548
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	549 { ngx_string("uwsgi_ssl_certificate"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	550 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	551 ngx_conf_set_str_slot,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	552 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	553 offsetof(ngx_http_uwsgi_loc_conf_t, ssl_certificate),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	554 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	555
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	556 { ngx_string("uwsgi_ssl_certificate_key"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	557 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	558 ngx_conf_set_str_slot,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	559 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	560 offsetof(ngx_http_uwsgi_loc_conf_t, ssl_certificate_key),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	561 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	562
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	563 { ngx_string("uwsgi_ssl_password_file"),
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	564 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	565 ngx_http_uwsgi_ssl_password_file,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	566 NGX_HTTP_LOC_CONF_OFFSET,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	567 0,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	568 NULL },
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	569
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	570 { ngx_string("uwsgi_ssl_conf_command"),
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	571 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE2,
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	572 ngx_conf_set_keyval_slot,
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	573 NGX_HTTP_LOC_CONF_OFFSET,
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	574 offsetof(ngx_http_uwsgi_loc_conf_t, ssl_conf_commands),
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	575 &ngx_http_uwsgi_ssl_conf_command_post },
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	576
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	577 #endif
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	578
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	579 ngx_null_command
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	580 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	581
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	582
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	583 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	584 NULL, /* preconfiguration */
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	585 NULL, /* postconfiguration */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	586
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	587 ngx_http_uwsgi_create_main_conf, /* create main configuration */
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	588 NULL, /* init main configuration */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	589
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	590 NULL, /* create server configuration */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	591 NULL, /* merge server configuration */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	592
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	593 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	594 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	595 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	596
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	597
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	598 ngx_module_t ngx_http_uwsgi_module = {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	599 NGX_MODULE_V1,
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	600 &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	601 ngx_http_uwsgi_commands, /* module directives */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	602 NGX_HTTP_MODULE, /* module type */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	603 NULL, /* init master */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	604 NULL, /* init module */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	605 NULL, /* init process */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	606 NULL, /* init thread */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	607 NULL, /* exit thread */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	608 NULL, /* exit process */
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	609 NULL, /* exit master */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	610 NGX_MODULE_V1_PADDING
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	611 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	612
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	613
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	614 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	615 ngx_string("X-Accel-Expires"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	616 ngx_string("X-Accel-Redirect"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	617 ngx_string("X-Accel-Limit-Rate"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	618 ngx_string("X-Accel-Buffering"),
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	619 ngx_string("X-Accel-Charset"),
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	620 ngx_null_string
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	621 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	622
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	623
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	624 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	625
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	626 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	627 { ngx_string("HTTP_IF_MODIFIED_SINCE"),
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	628 ngx_string("$upstream_cache_last_modified") },
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	629 { ngx_string("HTTP_IF_UNMODIFIED_SINCE"), ngx_string("") },
5738 c95d7882dfc9 Upstream: cache revalidation using If-None-Match. Maxim Dounin <mdounin@mdounin.ru> parents: 5662 diff changeset	630 { ngx_string("HTTP_IF_NONE_MATCH"), ngx_string("$upstream_cache_etag") },
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	631 { ngx_string("HTTP_IF_MATCH"), ngx_string("") },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	632 { ngx_string("HTTP_RANGE"), ngx_string("") },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	633 { ngx_string("HTTP_IF_RANGE"), ngx_string("") },
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	634 { ngx_null_string, ngx_null_string }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	635 };
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	636
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	637 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	638
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	639
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	640 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	641 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	642 };
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	643
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	644
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	645 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	646 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	647 {
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	648 ngx_int_t rc;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	649 ngx_http_status_t *status;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	650 ngx_http_upstream_t *u;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	651 ngx_http_uwsgi_loc_conf_t *uwcf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	652 #if (NGX_HTTP_CACHE)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	653 ngx_http_uwsgi_main_conf_t *uwmcf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	654 #endif
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	655
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	656 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	657 return NGX_HTTP_INTERNAL_SERVER_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	658 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	659
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	660 status = ngx_pcalloc(r->pool, sizeof(ngx_http_status_t));
a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	661 if (status == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	662 return NGX_HTTP_INTERNAL_SERVER_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	663 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	664
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	665 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	666
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	667 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	668
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	669 u = r->upstream;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	670
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	671 if (uwcf->uwsgi_lengths == NULL) {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	672
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	673 #if (NGX_HTTP_SSL)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	674 u->ssl = (uwcf->upstream.ssl != NULL);
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	675
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	676 if (u->ssl) {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	677 ngx_str_set(&u->schema, "suwsgi://");
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	678
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	679 } else {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	680 ngx_str_set(&u->schema, "uwsgi://");
5467 f6258a7092e4 Trailing whitespace fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5462 diff changeset	681 }
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	682 #else
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	683 ngx_str_set(&u->schema, "uwsgi://");
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	684 #endif
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	685
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	686 } else {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	687 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	688 return NGX_HTTP_INTERNAL_SERVER_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	689 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	690 }
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 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	693
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	694 u->conf = &uwcf->upstream;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	695
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	696 #if (NGX_HTTP_CACHE)
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	697 uwmcf = ngx_http_get_module_main_conf(r, ngx_http_uwsgi_module);
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	698
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	699 u->caches = &uwmcf->caches;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	700 u->create_key = ngx_http_uwsgi_create_key;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	701 #endif
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	702
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	703 u->create_request = ngx_http_uwsgi_create_request;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	704 u->reinit_request = ngx_http_uwsgi_reinit_request;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	705 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	706 u->abort_request = ngx_http_uwsgi_abort_request;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	707 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	708 r->state = 0;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	709
4157 9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	710 u->buffering = uwcf->upstream.buffering;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	711
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	712 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	713 if (u->pipe == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	714 return NGX_HTTP_INTERNAL_SERVER_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	715 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	716
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	717 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	718 u->pipe->input_ctx = r;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	719
7678 bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	720 u->input_filter_init = ngx_http_uwsgi_input_filter_init;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	721 u->input_filter = ngx_http_upstream_non_buffered_filter;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	722 u->input_filter_ctx = r;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	723
6053 b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	724 if (!uwcf->upstream.request_buffering
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	725 && uwcf->upstream.pass_request_body
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	726 && !r->headers_in.chunked)
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	727 {
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	728 r->request_body_no_buffering = 1;
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	729 }
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	730
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	731 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	732
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	733 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	734 return rc;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	735 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	736
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	737 return NGX_DONE;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	738 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	739
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	740
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	741 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	742 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	743 {
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	744 size_t add;
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	745 ngx_url_t url;
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	746 ngx_http_upstream_t *u;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	747
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	748 ngx_memzero(&url, sizeof(ngx_url_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	749
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	750 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	751 uwcf->uwsgi_values->elts)
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	752 == NULL)
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	753 {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	754 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	755 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	756
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	757 if (url.url.len > 8
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	758 && ngx_strncasecmp(url.url.data, (u_char *) "uwsgi://", 8) == 0)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	759 {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	760 add = 8;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	761
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	762 } else if (url.url.len > 9
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	763 && ngx_strncasecmp(url.url.data, (u_char *) "suwsgi://", 9) == 0)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	764 {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	765
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	766 #if (NGX_HTTP_SSL)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	767 add = 9;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	768 r->upstream->ssl = 1;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	769 #else
5458 4a71ef1aa36d Fixed build without SSL, broken by c82b2e020b9f. Maxim Dounin <mdounin@mdounin.ru> parents: 5457 diff changeset	770 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
4a71ef1aa36d Fixed build without SSL, broken by c82b2e020b9f. Maxim Dounin <mdounin@mdounin.ru> parents: 5457 diff changeset	771 "suwsgi protocol requires SSL support");
4a71ef1aa36d Fixed build without SSL, broken by c82b2e020b9f. Maxim Dounin <mdounin@mdounin.ru> parents: 5457 diff changeset	772 return NGX_ERROR;
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	773 #endif
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	774
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	775 } else {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	776 add = 0;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	777 }
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	778
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	779 u = r->upstream;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	780
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	781 if (add) {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	782 u->schema.len = add;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	783 u->schema.data = url.url.data;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	784
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	785 url.url.data += add;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	786 url.url.len -= add;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	787
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	788 } else {
5462 58716fd3bd2d Fixed incorrect ngx_str_set() usage, broken in c82b2e020b9f. Piotr Sikora <piotr@cloudflare.com> parents: 5458 diff changeset	789 ngx_str_set(&u->schema, "uwsgi://");
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	790 }
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	791
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	792 url.no_resolve = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	793
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	794 if (ngx_parse_url(r->pool, &url) != NGX_OK) {
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	795 if (url.err) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	796 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	797 "%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	798 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	799
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	800 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	801 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	802
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	803 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	804 if (u->resolved == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	805 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	806 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	807
6784 1af120241cde Upstream: removed unnecessary condition in proxy_eval() and friends. Ruslan Ermilov <ru@nginx.com> parents: 6747 diff changeset	808 if (url.addrs) {
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	809 u->resolved->sockaddr = url.addrs[0].sockaddr;
edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	810 u->resolved->socklen = url.addrs[0].socklen;
6785 d1d0dd69a419 Upstream: added the ngx_http_upstream_resolved_t.name field. Ruslan Ermilov <ru@nginx.com> parents: 6784 diff changeset	811 u->resolved->name = url.addrs[0].name;
3610 edcc271f7c4c change variable names Igor Sysoev <igor@sysoev.ru> parents: 3608 diff changeset	812 u->resolved->naddrs = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	813 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	814
6785 d1d0dd69a419 Upstream: added the ngx_http_upstream_resolved_t.name field. Ruslan Ermilov <ru@nginx.com> parents: 6784 diff changeset	815 u->resolved->host = url.host;
6303 a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6157 diff changeset	816 u->resolved->port = url.port;
a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6157 diff changeset	817 u->resolved->no_port = url.no_port;
a93345ee8f52 Upstream: fixed "no port" detection in evaluated upstreams. Ruslan Ermilov <ru@nginx.com> parents: 6157 diff changeset	818
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	819 return NGX_OK;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	820 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	821
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	822
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	823 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	824
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	825 static ngx_int_t
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	826 ngx_http_uwsgi_create_key(ngx_http_request_t *r)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	827 {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	828 ngx_str_t *key;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	829 ngx_http_uwsgi_loc_conf_t *uwcf;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	830
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	831 key = ngx_array_push(&r->cache->keys);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	832 if (key == NULL) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	833 return NGX_ERROR;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	834 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	835
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	836 uwcf = ngx_http_get_module_loc_conf(r, ngx_http_uwsgi_module);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	837
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	838 if (ngx_http_complex_value(r, &uwcf->cache_key, key) != NGX_OK) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	839 return NGX_ERROR;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	840 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	841
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	842 return NGX_OK;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	843 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	844
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	845 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	846
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	847
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	848 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	849 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	850 {
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	851 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	852 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	853 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	854 ngx_buf_t *b;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	855 ngx_chain_t cl, body;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	856 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	857 ngx_table_elt_t header, *ignored;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	858 ngx_http_uwsgi_params_t *params;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	859 ngx_http_script_code_pt code;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	860 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	861 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	862 ngx_http_script_len_code_pt lcode;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	863
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	864 len = 0;
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	865 header_params = 0;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	866 ignored = NULL;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	867
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	868 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	869
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	870 #if (NGX_HTTP_CACHE)
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	871 params = r->upstream->cacheable ? &uwcf->params_cache : &uwcf->params;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	872 #else
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	873 params = &uwcf->params;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	874 #endif
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	875
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	876 if (params->lengths) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	877 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	878
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	879 ngx_http_script_flush_no_cacheable_variables(r, params->flushes);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	880 le.flushed = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	881
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	882 le.ip = params->lengths->elts;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	883 le.request = r;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	884
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	885 while ((uintptr_t ) le.ip) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	886
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	887 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	888 key_len = lcode(&le);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	889
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	890 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	891 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	892
7088 f684178faec9 Style. Maxim Dounin <mdounin@mdounin.ru> parents: 7001 diff changeset	893 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	894 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	895 }
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	896 le.ip += sizeof(uintptr_t);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	897
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	898 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	899 continue;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	900 }
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	901
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	902 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	903 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	904 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	905
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	906 if (uwcf->upstream.pass_request_headers) {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	907
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	908 allocated = 0;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	909 lowcase_key = NULL;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	910
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	911 if (params->number) {
4015 e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	912 n = 0;
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	913 part = &r->headers_in.headers.part;
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	914
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	915 while (part) {
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	916 n += part->nelts;
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	917 part = part->next;
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	918 }
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	919
e0a435f5f504 Fix ignored headers handling in fastcgi/scgi/uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 3976 diff changeset	920 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	921 if (ignored == NULL) {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	922 return NGX_ERROR;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	923 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	924 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	925
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	926 part = &r->headers_in.headers.part;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	927 header = part->elts;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	928
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	929 for (i = 0; /* void */ ; i++) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	930
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	931 if (i >= part->nelts) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	932 if (part->next == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	933 break;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	934 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	935
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	936 part = part->next;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	937 header = part->elts;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	938 i = 0;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	939 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	940
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	941 if (params->number) {
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	942 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	943 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	944 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	945 if (lowcase_key == NULL) {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	946 return NGX_ERROR;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	947 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	948 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	949
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	950 hash = 0;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	951
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	952 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	953 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	954
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	955 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	956 ch \|= 0x20;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	957
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	958 } else if (ch == '-') {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	959 ch = '_';
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	960 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	961
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	962 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	963 lowcase_key[n] = ch;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	964 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	965
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	966 if (ngx_hash_find(&params->hash, hash, lowcase_key, n)) {
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	967 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	968 continue;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	969 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	970 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	971
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	972 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	973 + 2 + header[i].value.len;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	974 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	975 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	976
3555 bc734cf061b0 improve uwsgi_string processing Igor Sysoev <igor@sysoev.ru> parents: 3554 diff changeset	977 len += uwcf->uwsgi_string.len;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	978
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	979 #if 0
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	980 /* allow custom uwsgi packet */
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	981 if (len > 0 && len < 2) {
7347 b9b3518fa93b Uwsgi: style. Maxim Dounin <mdounin@mdounin.ru> parents: 7321 diff changeset	982 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
b9b3518fa93b Uwsgi: style. Maxim Dounin <mdounin@mdounin.ru> parents: 7321 diff changeset	983 "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	984 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	985 }
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	986 #endif
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	987
7348 f6e7831a17d4 Uwsgi: added a check on maximum uwsgi request size. Maxim Dounin <mdounin@mdounin.ru> parents: 7347 diff changeset	988 if (len > 65535) {
f6e7831a17d4 Uwsgi: added a check on maximum uwsgi request size. Maxim Dounin <mdounin@mdounin.ru> parents: 7347 diff changeset	989 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
f6e7831a17d4 Uwsgi: added a check on maximum uwsgi request size. Maxim Dounin <mdounin@mdounin.ru> parents: 7347 diff changeset	990 "uwsgi request is too big: %uz", len);
f6e7831a17d4 Uwsgi: added a check on maximum uwsgi request size. Maxim Dounin <mdounin@mdounin.ru> parents: 7347 diff changeset	991 return NGX_ERROR;
f6e7831a17d4 Uwsgi: added a check on maximum uwsgi request size. Maxim Dounin <mdounin@mdounin.ru> parents: 7347 diff changeset	992 }
f6e7831a17d4 Uwsgi: added a check on maximum uwsgi request size. Maxim Dounin <mdounin@mdounin.ru> parents: 7347 diff changeset	993
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	994 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	995 if (b == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	996 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	997 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	998
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	999 cl = ngx_alloc_chain_link(r->pool);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1000 if (cl == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1001 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1002 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1003
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1004 cl->buf = b;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1005
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1006 *b->last++ = (u_char) uwcf->modifier1;
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	1007 *b->last++ = (u_char) (len & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	1008 *b->last++ = (u_char) ((len >> 8) & 0xff);
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1009 *b->last++ = (u_char) uwcf->modifier2;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1010
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1011 if (params->lengths) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1012 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	1013
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1014 e.ip = params->values->elts;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1015 e.pos = b->last;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1016 e.request = r;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1017 e.flushed = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1018
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1019 le.ip = params->lengths->elts;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1020
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1021 while ((uintptr_t ) le.ip) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1022
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1023 lcode = (ngx_http_script_len_code_pt ) le.ip;
7088 f684178faec9 Style. Maxim Dounin <mdounin@mdounin.ru> parents: 7001 diff changeset	1024 key_len = (u_char) lcode(&le);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1025
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1026 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	1027 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	1028
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1029 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	1030 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	1031 }
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1032 le.ip += sizeof(uintptr_t);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1033
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1034 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	1035 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	1036
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1037 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	1038 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	1039 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	1040 }
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1041 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	1042
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1043 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	1044
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1045 continue;
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1046 }
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1047
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	1048 *e.pos++ = (u_char) (key_len & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	1049 *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	1050
3547 c2da61796410 remove useless copy: key name should be just copied before value length Igor Sysoev <igor@sysoev.ru> parents: 3546 diff changeset	1051 code = (ngx_http_script_code_pt ) e.ip;
7088 f684178faec9 Style. Maxim Dounin <mdounin@mdounin.ru> parents: 7001 diff changeset	1052 code((ngx_http_script_engine_t *) &e);
3547 c2da61796410 remove useless copy: key name should be just copied before value length Igor Sysoev <igor@sysoev.ru> parents: 3546 diff changeset	1053
c2da61796410 remove useless copy: key name should be just copied before value length Igor Sysoev <igor@sysoev.ru> parents: 3546 diff changeset	1054 *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	1055 *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	1056
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1057 while ((uintptr_t ) e.ip) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1058 code = (ngx_http_script_code_pt ) e.ip;
7088 f684178faec9 Style. Maxim Dounin <mdounin@mdounin.ru> parents: 7001 diff changeset	1059 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	1060 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1061
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1062 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	1063
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	1064 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	1065 "uwsgi param: \"%s: %s\"",
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	1066 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	1067 val_len, e.pos - val_len);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1068 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1069
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1070 b->last = e.pos;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1071 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1072
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1073 if (uwcf->upstream.pass_request_headers) {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1074
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1075 part = &r->headers_in.headers.part;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1076 header = part->elts;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1077
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1078 for (i = 0; /* void */ ; i++) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1079
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1080 if (i >= part->nelts) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1081 if (part->next == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1082 break;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1083 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1084
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1085 part = part->next;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1086 header = part->elts;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1087 i = 0;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1088 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1089
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1090 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	1091 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	1092 goto next;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1093 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1094 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1095
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1096 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	1097 *b->last++ = (u_char) (key_len & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	1098 *b->last++ = (u_char) ((key_len >> 8) & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	1099
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1100 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	1101 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	1102 ch = header[i].key.data[n];
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1103
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1104 if (ch >= 'a' && ch <= 'z') {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1105 ch &= ~0x20;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1106
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1107 } else if (ch == '-') {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1108 ch = '_';
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1109 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1110
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1111 *b->last++ = ch;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1112 }
3546 3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	1113
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	1114 val_len = header[i].value.len;
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	1115 *b->last++ = (u_char) (val_len & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	1116 *b->last++ = (u_char) ((val_len >> 8) & 0xff);
3a9fca8cbdfc simplify binary little endian length processing Igor Sysoev <igor@sysoev.ru> parents: 3545 diff changeset	1117 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	1118
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	1119 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	1120 "uwsgi param: \"%s: %s\"",
3da009cc90f3 add uwsgi_param and client request headers debug logging Igor Sysoev <igor@sysoev.ru> parents: 3556 diff changeset	1121 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	1122 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	1123 next:
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1124
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1125 continue;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1126 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1127 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1128
3555 bc734cf061b0 improve uwsgi_string processing Igor Sysoev <igor@sysoev.ru> parents: 3554 diff changeset	1129 b->last = ngx_copy(b->last, uwcf->uwsgi_string.data,
bc734cf061b0 improve uwsgi_string processing Igor Sysoev <igor@sysoev.ru> parents: 3554 diff changeset	1130 uwcf->uwsgi_string.len);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1131
6053 b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	1132 if (r->request_body_no_buffering) {
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	1133 r->upstream->request_bufs = cl;
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	1134
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	1135 } else if (uwcf->upstream.pass_request_body) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1136 body = r->upstream->request_bufs;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1137 r->upstream->request_bufs = cl;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1138
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1139 while (body) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1140 b = ngx_alloc_buf(r->pool);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1141 if (b == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1142 return NGX_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1143 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1144
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1145 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	1146
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1147 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	1148 if (cl->next == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1149 return NGX_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1150 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1151
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1152 cl = cl->next;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1153 cl->buf = b;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1154
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1155 body = body->next;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1156 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1157
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1158 } else {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1159 r->upstream->request_bufs = cl;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1160 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1161
7666 8cf31489b479 Correctly flush request body to uwsgi with SSL. Quantum <quantum2048@gmail.com> parents: 7473 diff changeset	1162 b->flush = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1163 cl->next = NULL;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1164
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1165 return NGX_OK;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1166 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1167
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1168
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1169 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1170 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	1171 {
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	1172 ngx_http_status_t *status;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1173
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	1174 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	1175
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	1176 if (status == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1177 return NGX_OK;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1178 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1179
3629 a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	1180 status->code = 0;
a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	1181 status->count = 0;
a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	1182 status->start = NULL;
a2a3378824ba fix r3628 Igor Sysoev <igor@sysoev.ru> parents: 3628 diff changeset	1183 status->end = NULL;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1184
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1185 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	1186 r->state = 0;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1187
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1188 return NGX_OK;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1189 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1190
3623 633ef29c9881 style fix Igor Sysoev <igor@sysoev.ru> parents: 3611 diff changeset	1191
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1192 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1193 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	1194 {
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1195 size_t len;
3623 633ef29c9881 style fix Igor Sysoev <igor@sysoev.ru> parents: 3611 diff changeset	1196 ngx_int_t rc;
3630 b5819529738a style fix Igor Sysoev <igor@sysoev.ru> parents: 3629 diff changeset	1197 ngx_http_status_t *status;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1198 ngx_http_upstream_t *u;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1199
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	1200 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	1201
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	1202 if (status == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1203 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1204 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1205
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	1206 u = r->upstream;
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	1207
9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	1208 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	1209
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1210 if (rc == NGX_AGAIN) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1211 return rc;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1212 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1213
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	1214 if (rc == NGX_ERROR) {
3624 3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1215 u->process_header = ngx_http_uwsgi_process_header;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1216 return ngx_http_uwsgi_process_header(r);
3541 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
5575 d15822784cf9 Upstream: fix $upstream_status variable. Piotr Sikora <piotr@cloudflare.com> parents: 5496 diff changeset	1219 if (u->state && u->state->status == 0) {
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	1220 u->state->status = status->code;
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
3627 9061fdb2ed8c use ngx_http_parse_status_line() Igor Sysoev <igor@sysoev.ru> parents: 3625 diff changeset	1223 u->headers_in.status_n = status->code;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1224
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1225 len = status->end - status->start;
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1226 u->headers_in.status_line.len = len;
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1227
cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1228 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	1229 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	1230 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1231 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1232
3628 cf47471a9eda make code more obviuos Igor Sysoev <igor@sysoev.ru> parents: 3627 diff changeset	1233 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	1234
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1235 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	1236 "http uwsgi status %ui \"%V\"",
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1237 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	1238
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1239 u->process_header = ngx_http_uwsgi_process_header;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1240
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1241 return ngx_http_uwsgi_process_header(r);
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
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1245 static ngx_int_t
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1246 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	1247 {
3624 3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1248 ngx_str_t *status_line;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1249 ngx_int_t rc, status;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1250 ngx_table_elt_t *h;
3624 3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1251 ngx_http_upstream_t *u;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1252 ngx_http_upstream_header_t *hh;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1253 ngx_http_upstream_main_conf_t *umcf;
3541 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 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	1256
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1257 for ( ;; ) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1258
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1259 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	1260
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1261 if (rc == NGX_OK) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1262
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1263 /* a header line has been parsed successfully */
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1264
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1265 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	1266 if (h == NULL) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1267 return NGX_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1268 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1269
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1270 h->hash = r->header_hash;
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 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	1273 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	1274
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1275 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	1276 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	1277 + h->key.len);
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1278 if (h->key.data == NULL) {
7001 08537eab4f23 Upstream: fixed u->headers_in.headers allocation error handling. Sergey Kandaurov <pluknet@nginx.com> parents: 6981 diff changeset	1279 h->hash = 0;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1280 return NGX_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1281 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1282
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1283 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	1284 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	1285
4529 1ebec1d15a25 Fixed incorrect ngx_cpystrn() usage in ngx_http__process_header(). Maxim Dounin <mdounin@mdounin.ru>* parents: 4527 diff changeset	1286 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	1287 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	1288 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	1289 h->value.data[h->value.len] = '\0';
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1290
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1291 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	1292 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	1293
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1294 } else {
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1295 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	1296 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1297
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1298 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	1299 h->lowcase_key, h->key.len);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1300
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1301 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	1302 return NGX_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1303 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1304
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1305 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	1306 "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	1307
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1308 continue;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1309 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1310
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1311 if (rc == NGX_HTTP_PARSE_HEADER_DONE) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1312
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1313 /* a whole header has been parsed successfully */
3541 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 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	1316 "http uwsgi header done");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1317
4527 9c3a2fc3c460 Uwsgi: merged r->http_version fixes from scgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 4522 diff changeset	1318 u = r->upstream;
9c3a2fc3c460 Uwsgi: merged r->http_version fixes from scgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 4522 diff changeset	1319
9c3a2fc3c460 Uwsgi: merged r->http_version fixes from scgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 4522 diff changeset	1320 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	1321 goto done;
3624 3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1322 }
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1323
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1324 if (u->headers_in.status) {
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1325 status_line = &u->headers_in.status->value;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1326
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1327 status = ngx_atoi(status_line->data, 3);
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1328 if (status == NGX_ERROR) {
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1329 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1330 "upstream sent invalid status \"%V\"",
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1331 status_line);
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1332 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1333 }
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1334
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1335 u->headers_in.status_n = status;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1336 u->headers_in.status_line = *status_line;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1337
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1338 } else if (u->headers_in.location) {
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1339 u->headers_in.status_n = 302;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1340 ngx_str_set(&u->headers_in.status_line,
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1341 "302 Moved Temporarily");
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1342
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1343 } else {
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1344 u->headers_in.status_n = 200;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1345 ngx_str_set(&u->headers_in.status_line, "200 OK");
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1346 }
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1347
5575 d15822784cf9 Upstream: fix $upstream_status variable. Piotr Sikora <piotr@cloudflare.com> parents: 5496 diff changeset	1348 if (u->state && u->state->status == 0) {
3624 3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1349 u->state->status = u->headers_in.status_n;
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1350 }
3b7e8fa31a00 support CGI-style response Igor Sysoev <igor@sysoev.ru> parents: 3623 diff changeset	1351
5078 10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1352 done:
10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1353
10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1354 if (u->headers_in.status_n == NGX_HTTP_SWITCHING_PROTOCOLS
5080 8da37c1b22a4 Trailing whitespace fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5078 diff changeset	1355 && r->headers_in.upgrade)
5078 10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1356 {
10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1357 u->upgrade = 1;
10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1358 }
10c74d3b15d1 Connection upgrade support in uwsgi and scgi modules. Maxim Dounin <mdounin@mdounin.ru> parents: 5008 diff changeset	1359
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1360 return NGX_OK;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1361 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1362
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1363 if (rc == NGX_AGAIN) {
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1364 return NGX_AGAIN;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1365 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1366
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1367 /* 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	1368
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1369 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	1370 "upstream sent invalid header");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1371
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1372 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1373 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1374 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1375
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1376
7678 bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1377 static ngx_int_t
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1378 ngx_http_uwsgi_input_filter_init(void *data)
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1379 {
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1380 ngx_http_request_t *r = data;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1381 ngx_http_upstream_t *u;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1382
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1383 u = r->upstream;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1384
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1385 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1386 "http uwsgi filter init s:%ui l:%O",
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1387 u->headers_in.status_n, u->headers_in.content_length_n);
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1388
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1389 if (u->headers_in.status_n == NGX_HTTP_NO_CONTENT
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1390 \|\| u->headers_in.status_n == NGX_HTTP_NOT_MODIFIED)
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1391 {
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1392 u->pipe->length = 0;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1393 u->length = 0;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1394
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1395 } else if (r->method == NGX_HTTP_HEAD) {
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1396 u->pipe->length = -1;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1397 u->length = -1;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1398
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1399 } else {
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1400 u->pipe->length = u->headers_in.content_length_n;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1401 u->length = u->headers_in.content_length_n;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1402 }
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1403
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1404 return NGX_OK;
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1405 }
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1406
bffcc5af1d72 Upstream: drop extra data sent by upstream. Maxim Dounin <mdounin@mdounin.ru> parents: 7666 diff changeset	1407
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1408 static void
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1409 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	1410 {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1411 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	1412 "abort http uwsgi request");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1413
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1414 return;
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
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1417
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1418 static void
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1419 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	1420 {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1421 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	1422 "finalize http uwsgi request");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1423
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1424 return;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1425 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1426
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1427
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1428 static void *
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1429 ngx_http_uwsgi_create_main_conf(ngx_conf_t *cf)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1430 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1431 ngx_http_uwsgi_main_conf_t *conf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1432
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1433 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_uwsgi_main_conf_t));
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1434 if (conf == NULL) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1435 return NULL;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1436 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1437
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1438 #if (NGX_HTTP_CACHE)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1439 if (ngx_array_init(&conf->caches, cf->pool, 4,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1440 sizeof(ngx_http_file_cache_t *))
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1441 != NGX_OK)
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1442 {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1443 return NULL;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1444 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1445 #endif
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1446
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1447 return conf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1448 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1449
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1450
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1451 static void *
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1452 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	1453 {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1454 ngx_http_uwsgi_loc_conf_t *conf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1455
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1456 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	1457 if (conf == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1458 return NULL;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1459 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1460
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1461 conf->modifier1 = NGX_CONF_UNSET_UINT;
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1462 conf->modifier2 = NGX_CONF_UNSET_UINT;
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1463
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1464 conf->upstream.store = NGX_CONF_UNSET;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1465 conf->upstream.store_access = NGX_CONF_UNSET_UINT;
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	1466 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1467 conf->upstream.buffering = NGX_CONF_UNSET;
6053 b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	1468 conf->upstream.request_buffering = NGX_CONF_UNSET;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1469 conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1470 conf->upstream.force_ranges = NGX_CONF_UNSET;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1471
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4947 diff changeset	1472 conf->upstream.local = NGX_CONF_UNSET_PTR;
7371 8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7348 diff changeset	1473 conf->upstream.socket_keepalive = NGX_CONF_UNSET;
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4947 diff changeset	1474
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1475 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1476 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1477 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	1478 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1479
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1480 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1481 conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE;
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	1482 conf->upstream.limit_rate = NGX_CONF_UNSET_SIZE;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1483
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1484 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	1485 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	1486 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	1487
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1488 conf->upstream.pass_request_headers = NGX_CONF_UNSET;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1489 conf->upstream.pass_request_body = NGX_CONF_UNSET;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1490
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1491 #if (NGX_HTTP_CACHE)
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1492 conf->upstream.cache = NGX_CONF_UNSET;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1493 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	1494 conf->upstream.cache_max_range_offset = NGX_CONF_UNSET;
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	1495 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	1496 conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1497 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	1498 conf->upstream.cache_lock = NGX_CONF_UNSET;
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1499 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	1500 conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC;
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	1501 conf->upstream.cache_revalidate = NGX_CONF_UNSET;
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	1502 conf->upstream.cache_background_update = NGX_CONF_UNSET;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1503 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1504
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1505 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1506 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1507
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1508 conf->upstream.intercept_errors = NGX_CONF_UNSET;
5662 3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1509
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1510 #if (NGX_HTTP_SSL)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1511 conf->upstream.ssl_session_reuse = NGX_CONF_UNSET;
5662 3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1512 conf->upstream.ssl_server_name = NGX_CONF_UNSET;
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1513 conf->upstream.ssl_verify = NGX_CONF_UNSET;
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1514 conf->ssl_verify_depth = NGX_CONF_UNSET_UINT;
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	1515 conf->ssl_passwords = NGX_CONF_UNSET_PTR;
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	1516 conf->ssl_conf_commands = NGX_CONF_UNSET_PTR;
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1517 #endif
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1518
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1519 /* "uwsgi_cyclic_temp_file" is disabled */
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1520 conf->upstream.cyclic_temp_file = 0;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1521
4157 9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	1522 conf->upstream.change_buffering = 1;
9d59a8eda373 Added uwsgi_buffering and scgi_buffering directives. Maxim Dounin <mdounin@mdounin.ru> parents: 4015 diff changeset	1523
3976 215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	1524 ngx_str_set(&conf->upstream.module, "uwsgi");
215fe9223419 update r3945 with more descriptive error message Igor Sysoev <igor@sysoev.ru> parents: 3879 diff changeset	1525
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1526 return conf;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1527 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1528
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1529
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1530 static char *
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1531 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	1532 {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1533 ngx_http_uwsgi_loc_conf_t *prev = parent;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1534 ngx_http_uwsgi_loc_conf_t *conf = child;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1535
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1536 size_t size;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1537 ngx_int_t rc;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1538 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	1539 ngx_http_core_loc_conf_t *clcf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1540
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	1541 #if (NGX_HTTP_CACHE)
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	1542
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	1543 if (conf->upstream.store > 0) {
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1544 conf->upstream.cache = 0;
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	1545 }
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	1546
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1547 if (conf->upstream.cache > 0) {
5948 f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	1548 conf->upstream.store = 0;
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	1549 }
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	1550
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	1551 #endif
f2ff0aa89126 Upstream: mutually exclusive inheritance of "cache" and "store". Valentin Bartenev <vbart@nginx.com> parents: 5947 diff changeset	1552
5940 e3b3b89d74e8 Upstream: fixed inheritance of proxy_store and friends. Valentin Bartenev <vbart@nginx.com> parents: 5938 diff changeset	1553 if (conf->upstream.store == NGX_CONF_UNSET) {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1554 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	1555
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	1556 conf->upstream.store_lengths = prev->upstream.store_lengths;
d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	1557 conf->upstream.store_values = prev->upstream.store_values;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1558 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1559
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1560 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	1561 prev->upstream.store_access, 0600);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1562
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	1563 ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	1564 prev->upstream.next_upstream_tries, 0);
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	1565
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1566 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	1567 prev->upstream.buffering, 1);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1568
6053 b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	1569 ngx_conf_merge_value(conf->upstream.request_buffering,
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	1570 prev->upstream.request_buffering, 1);
b6eb6ec4fbd9 Upstream: uwsgi_request_buffering, scgi_request_buffering. Maxim Dounin <mdounin@mdounin.ru> parents: 5951 diff changeset	1571
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1572 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	1573 prev->upstream.ignore_client_abort, 0);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1574
5874 2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1575 ngx_conf_merge_value(conf->upstream.force_ranges,
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1576 prev->upstream.force_ranges, 0);
2aff40b3dea2 Upstream: proxy_force_ranges and friends. Roman Arutyunyan <arut@nginx.com> parents: 5832 diff changeset	1577
5008 fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4947 diff changeset	1578 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	1579 prev->upstream.local, NULL);
fd84344f1df7 Fixed and improved the "_bind" directives of proxying modules. Ruslan Ermilov <ru@nginx.com>* parents: 4947 diff changeset	1580
7371 8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7348 diff changeset	1581 ngx_conf_merge_value(conf->upstream.socket_keepalive,
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7348 diff changeset	1582 prev->upstream.socket_keepalive, 0);
8b68d50090e4 Upstream: proxy_socket_keepalive and friends. Vladimir Homutov <vl@nginx.com> parents: 7348 diff changeset	1583
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1584 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	1585 prev->upstream.connect_timeout, 60000);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1586
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1587 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	1588 prev->upstream.send_timeout, 60000);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1589
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1590 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	1591 prev->upstream.read_timeout, 60000);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1592
5832 d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	1593 ngx_conf_merge_msec_value(conf->upstream.next_upstream_timeout,
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	1594 prev->upstream.next_upstream_timeout, 0);
d09b689911ac Upstream: limited next_upstream time and tries (ticket #544). Roman Arutyunyan <arut@nginx.com> parents: 5829 diff changeset	1595
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1596 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	1597 prev->upstream.send_lowat, 0);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1598
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1599 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	1600 prev->upstream.buffer_size,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1601 (size_t) ngx_pagesize);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1602
5883 973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	1603 ngx_conf_merge_size_value(conf->upstream.limit_rate,
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	1604 prev->upstream.limit_rate, 0);
973ee2276300 Upstream: proxy_limit_rate and friends. Roman Arutyunyan <arut@nginx.com> parents: 5874 diff changeset	1605
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1606
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1607 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	1608 8, ngx_pagesize);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1609
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1610 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	1611 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	1612 "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	1613 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1614 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1615
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1616
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1617 size = conf->upstream.buffer_size;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1618 if (size < conf->upstream.bufs.size) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1619 size = conf->upstream.bufs.size;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1620 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1621
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1622
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1623 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	1624 prev->upstream.busy_buffers_size_conf,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1625 NGX_CONF_UNSET_SIZE);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1626
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1627 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	1628 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	1629 } else {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1630 conf->upstream.busy_buffers_size =
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1631 conf->upstream.busy_buffers_size_conf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1632 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1633
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1634 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	1635 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	1636 "\"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	1637 "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	1638 "one of the \"uwsgi_buffers\"");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1639
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1640 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1641 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1642
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1643 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	1644 > (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	1645 {
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1646 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	1647 "\"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	1648 "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	1649
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1650 return NGX_CONF_ERROR;
3541 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
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1653
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1654 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	1655 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	1656 NGX_CONF_UNSET_SIZE);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1657
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1658 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	1659 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	1660 } else {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1661 conf->upstream.temp_file_write_size =
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1662 conf->upstream.temp_file_write_size_conf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1663 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1664
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1665 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	1666 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	1667 "\"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	1668 "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	1669 "one of the \"uwsgi_buffers\"");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1670
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1671 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1672 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1673
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1674
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1675 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	1676 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	1677 NGX_CONF_UNSET_SIZE);
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 (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	1680 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	1681 } else {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1682 conf->upstream.max_temp_file_size =
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1683 conf->upstream.max_temp_file_size_conf;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1684 }
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 if (conf->upstream.max_temp_file_size != 0
5828 733952da0a8a Style. Maxim Dounin <mdounin@mdounin.ru> parents: 5758 diff changeset	1687 && conf->upstream.max_temp_file_size < size)
733952da0a8a Style. Maxim Dounin <mdounin@mdounin.ru> parents: 5758 diff changeset	1688 {
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1689 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	1690 "\"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	1691 "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	1692 "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	1693 "one of the \"uwsgi_buffers\"");
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1694
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1695 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1696 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1697
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1698
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1699 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	1700 prev->upstream.ignore_headers,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1701 NGX_CONF_BITMASK_SET);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1702
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 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	1705 prev->upstream.next_upstream,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1706 (NGX_CONF_BITMASK_SET
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1707 \|NGX_HTTP_UPSTREAM_FT_ERROR
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1708 \|NGX_HTTP_UPSTREAM_FT_TIMEOUT));
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 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	1711 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	1712 \|NGX_HTTP_UPSTREAM_FT_OFF;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1713 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1714
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1715 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	1716 prev->upstream.temp_path,
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1717 &ngx_http_uwsgi_temp_path)
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1718 != NGX_OK)
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1719 {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1720 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1721 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1722
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1723 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1724
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1725 if (conf->upstream.cache == NGX_CONF_UNSET) {
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1726 ngx_conf_merge_value(conf->upstream.cache,
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1727 prev->upstream.cache, 0);
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1728
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1729 conf->upstream.cache_zone = prev->upstream.cache_zone;
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	1730 conf->upstream.cache_value = prev->upstream.cache_value;
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1731 }
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1732
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1733 if (conf->upstream.cache_zone && conf->upstream.cache_zone->data == NULL) {
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1734 ngx_shm_zone_t *shm_zone;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1735
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	1736 shm_zone = conf->upstream.cache_zone;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1737
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1738 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1739 "\"uwsgi_cache\" zone \"%V\" is unknown",
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1740 &shm_zone->shm.name);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1741
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1742 return NGX_CONF_ERROR;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1743 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1744
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1745 ngx_conf_merge_uint_value(conf->upstream.cache_min_uses,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1746 prev->upstream.cache_min_uses, 1);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1747
6793 0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	1748 ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	1749 prev->upstream.cache_max_range_offset,
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	1750 NGX_MAX_OFF_T_VALUE);
0fba3ed4e7eb Cache: proxy_cache_max_range_offset and friends. Dmitry Volyntsev <xeioex@nginx.com> parents: 6785 diff changeset	1751
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1752 ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1753 prev->upstream.cache_use_stale,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1754 (NGX_CONF_BITMASK_SET
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1755 \|NGX_HTTP_UPSTREAM_FT_OFF));
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 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1758 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1759 \|NGX_HTTP_UPSTREAM_FT_OFF;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1760 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1761
4401 d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4386 diff changeset	1762 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	1763 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	1764 }
d45742815c90 Fixed proxy_cache_use_stale in "no live upstreams" case. Maxim Dounin <mdounin@mdounin.ru> parents: 4386 diff changeset	1765
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1766 if (conf->upstream.cache_methods == 0) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1767 conf->upstream.cache_methods = prev->upstream.cache_methods;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1768 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1769
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1770 conf->upstream.cache_methods \|= NGX_HTTP_GET\|NGX_HTTP_HEAD;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1771
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3693 diff changeset	1772 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	1773 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	1774
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1775 ngx_conf_merge_ptr_value(conf->upstream.no_cache,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1776 prev->upstream.no_cache, NULL);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1777
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1778 ngx_conf_merge_ptr_value(conf->upstream.cache_valid,
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1779 prev->upstream.cache_valid, NULL);
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1780
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1781 if (conf->cache_key.value.data == NULL) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1782 conf->cache_key = prev->cache_key;
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
5829 906530c9ffd2 Added warning about unset cache keys. Maxim Dounin <mdounin@mdounin.ru> parents: 5828 diff changeset	1785 if (conf->upstream.cache && conf->cache_key.value.data == NULL) {
906530c9ffd2 Added warning about unset cache keys. Maxim Dounin <mdounin@mdounin.ru> parents: 5828 diff changeset	1786 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
906530c9ffd2 Added warning about unset cache keys. Maxim Dounin <mdounin@mdounin.ru> parents: 5828 diff changeset	1787 "no \"uwsgi_cache_key\" for \"uwsgi_cache\"");
906530c9ffd2 Added warning about unset cache keys. Maxim Dounin <mdounin@mdounin.ru> parents: 5828 diff changeset	1788 }
906530c9ffd2 Added warning about unset cache keys. Maxim Dounin <mdounin@mdounin.ru> parents: 5828 diff changeset	1789
4386 92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1790 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	1791 prev->upstream.cache_lock, 0);
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1792
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1793 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	1794 prev->upstream.cache_lock_timeout, 5000);
92deb73393f7 Cache lock support for fastcgi, scgi, uwsgi. Maxim Dounin <mdounin@mdounin.ru> parents: 4330 diff changeset	1795
5905 2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	1796 ngx_conf_merge_msec_value(conf->upstream.cache_lock_age,
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	1797 prev->upstream.cache_lock_age, 5000);
2f7e557eab5b Cache: proxy_cache_lock_age and friends. Roman Arutyunyan <arut@nginx.com> parents: 5900 diff changeset	1798
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	1799 ngx_conf_merge_value(conf->upstream.cache_revalidate,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	1800 prev->upstream.cache_revalidate, 0);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5393 diff changeset	1801
6906 1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	1802 ngx_conf_merge_value(conf->upstream.cache_background_update,
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	1803 prev->upstream.cache_background_update, 0);
1aeaae6e9446 Upstream: proxy_cache_background_update and friends. Roman Arutyunyan <arut@nginx.com> parents: 6793 diff changeset	1804
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1805 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1806
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1807 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	1808 prev->upstream.pass_request_headers, 1);
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1809 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	1810 prev->upstream.pass_request_body, 1);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1811
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1812 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	1813 prev->upstream.intercept_errors, 0);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1814
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1815 #if (NGX_HTTP_SSL)
5662 3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1816
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1817 ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1818 prev->upstream.ssl_session_reuse, 1);
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1819
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1820 ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
6157 b2899e7d0ef8 Disabled SSLv3 by default (ticket #653). Maxim Dounin <mdounin@mdounin.ru> parents: 6053 diff changeset	1821 (NGX_CONF_BITMASK_SET\|NGX_SSL_TLSv1
b2899e7d0ef8 Disabled SSLv3 by default (ticket #653). Maxim Dounin <mdounin@mdounin.ru> parents: 6053 diff changeset	1822 \|NGX_SSL_TLSv1_1\|NGX_SSL_TLSv1_2));
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1823
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1824 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1825 "DEFAULT");
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1826
5662 3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1827 if (conf->upstream.ssl_name == NULL) {
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1828 conf->upstream.ssl_name = prev->upstream.ssl_name;
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1829 }
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1830
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1831 ngx_conf_merge_value(conf->upstream.ssl_server_name,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1832 prev->upstream.ssl_server_name, 0);
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1833 ngx_conf_merge_value(conf->upstream.ssl_verify,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1834 prev->upstream.ssl_verify, 0);
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1835 ngx_conf_merge_uint_value(conf->ssl_verify_depth,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1836 prev->ssl_verify_depth, 1);
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1837 ngx_conf_merge_str_value(conf->ssl_trusted_certificate,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1838 prev->ssl_trusted_certificate, "");
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1839 ngx_conf_merge_str_value(conf->ssl_crl, prev->ssl_crl, "");
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	1840
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	1841 ngx_conf_merge_str_value(conf->ssl_certificate,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	1842 prev->ssl_certificate, "");
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	1843 ngx_conf_merge_str_value(conf->ssl_certificate_key,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	1844 prev->ssl_certificate_key, "");
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	1845 ngx_conf_merge_ptr_value(conf->ssl_passwords, prev->ssl_passwords, NULL);
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	1846
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	1847 ngx_conf_merge_ptr_value(conf->ssl_conf_commands,
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	1848 prev->ssl_conf_commands, NULL);
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	1849
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1850 if (conf->ssl && ngx_http_uwsgi_set_ssl(cf, conf) != NGX_OK) {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1851 return NGX_CONF_ERROR;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1852 }
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1853
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1854 #endif
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	1855
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1856 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	1857
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1858 hash.max_size = 512;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1859 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	1860 hash.name = "uwsgi_hide_headers_hash";
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1861
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1862 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	1863 &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	1864 != NGX_OK)
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	1865 {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1866 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1867 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1868
5938 cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	1869 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	1870
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	1871 if (clcf->noname
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	1872 && conf->upstream.upstream == NULL && conf->uwsgi_lengths == NULL)
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	1873 {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1874 conf->upstream.upstream = prev->upstream.upstream;
5937 5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5909 diff changeset	1875
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1876 conf->uwsgi_lengths = prev->uwsgi_lengths;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	1877 conf->uwsgi_values = prev->uwsgi_values;
5937 5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5909 diff changeset	1878
5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5909 diff changeset	1879 #if (NGX_HTTP_SSL)
5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5909 diff changeset	1880 conf->upstream.ssl = prev->upstream.ssl;
5b9f711dc819 Upstream: inheritance of proxy_pass and friends (ticket #645). Maxim Dounin <mdounin@mdounin.ru> parents: 5909 diff changeset	1881 #endif
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1882 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1883
5938 cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	1884 if (clcf->lmt_excpt && clcf->handler == NULL
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	1885 && (conf->upstream.upstream \|\| conf->uwsgi_lengths))
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	1886 {
cd2abf7e7740 Upstream: fixed unexpected inheritance into limit_except blocks. Maxim Dounin <mdounin@mdounin.ru> parents: 5937 diff changeset	1887 clcf->handler = ngx_http_uwsgi_handler;
3731 72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	1888 }
72cc5b789021 inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside Igor Sysoev <igor@sysoev.ru> parents: 3729 diff changeset	1889
3552 40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1890 ngx_conf_merge_uint_value(conf->modifier1, prev->modifier1, 0);
40eba0271b1d improve uwsgi_modifierX processing: Igor Sysoev <igor@sysoev.ru> parents: 3551 diff changeset	1891 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	1892
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	1893 if (conf->params_source == NULL) {
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1894 conf->params = prev->params;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1895 #if (NGX_HTTP_CACHE)
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1896 conf->params_cache = prev->params_cache;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1897 #endif
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	1898 conf->params_source = prev->params_source;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1899 }
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1900
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1901 rc = ngx_http_uwsgi_init_params(cf, conf, &conf->params, NULL);
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1902 if (rc != NGX_OK) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1903 return NGX_CONF_ERROR;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1904 }
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	1905
195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	1906 #if (NGX_HTTP_CACHE)
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1907
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1908 if (conf->upstream.cache) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1909 rc = ngx_http_uwsgi_init_params(cf, conf, &conf->params_cache,
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1910 ngx_http_uwsgi_cache_headers);
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1911 if (rc != NGX_OK) {
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1912 return NGX_CONF_ERROR;
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	1913 }
195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	1914 }
195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	1915
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1916 #endif
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1917
6747 20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1918 /*
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1919 * special handling to preserve conf->params in the "http" section
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1920 * to inherit it to all servers
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1921 */
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1922
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1923 if (prev->params.hash.buckets == NULL
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1924 && conf->params_source == prev->params_source)
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1925 {
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1926 prev->params = conf->params;
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1927 #if (NGX_HTTP_CACHE)
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1928 prev->params_cache = conf->params_cache;
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1929 #endif
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1930 }
20eb4587225b Upstream: handling of proxy_set_header at http level. Maxim Dounin <mdounin@mdounin.ru> parents: 6591 diff changeset	1931
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1932 return NGX_CONF_OK;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1933 }
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1934
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1935
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1936 static ngx_int_t
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1937 ngx_http_uwsgi_init_params(ngx_conf_t cf, ngx_http_uwsgi_loc_conf_t conf,
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1938 ngx_http_uwsgi_params_t params, ngx_keyval_t default_params)
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1939 {
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1940 u_char *p;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1941 size_t size;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1942 uintptr_t *code;
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1943 ngx_uint_t i, nsrc;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1944 ngx_array_t headers_names, params_merged;
8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1945 ngx_keyval_t *h;
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1946 ngx_hash_key_t *hk;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1947 ngx_hash_init_t hash;
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1948 ngx_http_upstream_param_t src, s;
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1949 ngx_http_script_compile_t sc;
e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1950 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	1951
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1952 if (params->hash.buckets) {
5907 195561ef367f Upstream: moved header initializations to separate functions. Roman Arutyunyan <arut@nginx.com> parents: 5905 diff changeset	1953 return NGX_OK;
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1954 }
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1955
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1956 if (conf->params_source == NULL && default_params == NULL) {
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1957 params->hash.buckets = (void *) 1;
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1958 return NGX_OK;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1959 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1960
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1961 params->lengths = ngx_array_create(cf->pool, 64, 1);
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1962 if (params->lengths == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1963 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1964 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1965
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1966 params->values = ngx_array_create(cf->pool, 512, 1);
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	1967 if (params->values == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1968 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1969 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1970
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1971 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	1972 != NGX_OK)
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1973 {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	1974 return NGX_ERROR;
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1975 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	1976
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1977 if (conf->params_source) {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1978 src = conf->params_source->elts;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1979 nsrc = conf->params_source->nelts;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1980
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1981 } else {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1982 src = NULL;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1983 nsrc = 0;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1984 }
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1985
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	1986 if (default_params) {
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	1987 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	1988 sizeof(ngx_http_upstream_param_t))
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1989 != NGX_OK)
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1990 {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1991 return NGX_ERROR;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1992 }
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1993
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1994 for (i = 0; i < nsrc; i++) {
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	1995
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1996 s = ngx_array_push(&params_merged);
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1997 if (s == NULL) {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1998 return NGX_ERROR;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	1999 }
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2000
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2001 *s = src[i];
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2002 }
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2003
5909 8d0cf26ce071 Upstream: different header lists for cached and uncached requests. Roman Arutyunyan <arut@nginx.com> parents: 5908 diff changeset	2004 h = default_params;
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2005
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2006 while (h->key.len) {
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2007
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2008 src = params_merged.elts;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2009 nsrc = params_merged.nelts;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2010
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2011 for (i = 0; i < nsrc; i++) {
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2012 if (ngx_strcasecmp(h->key.data, src[i].key.data) == 0) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2013 goto next;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2014 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2015 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2016
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2017 s = ngx_array_push(&params_merged);
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2018 if (s == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	2019 return NGX_ERROR;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2020 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2021
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	2022 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	2023 s->value = h->value;
5451 e68af4e3396f Upstream: skip empty cache headers. Maxim Dounin <mdounin@mdounin.ru> parents: 5441 diff changeset	2024 s->skip_empty = 1;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2025
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2026 next:
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2027
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2028 h++;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2029 }
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2030
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2031 src = params_merged.elts;
f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2032 nsrc = params_merged.nelts;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2033 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2034
4278 f57229cba7ad Fixed fastcgi/scgi/uwsgi_param inheritance. Maxim Dounin <mdounin@mdounin.ru> parents: 4277 diff changeset	2035 for (i = 0; i < nsrc; i++) {
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2036
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2037 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	2038 && 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	2039 {
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2040 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	2041 if (hk == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	2042 return NGX_ERROR;
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2043 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2044
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2045 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	2046 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	2047 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	2048 hk->value = (void *) 1;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2049
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2050 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	2051 continue;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2052 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2053 }
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2054
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2055 copy = ngx_array_push_n(params->lengths,
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	2056 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	2057 if (copy == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	2058 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	2059 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2060
7271 9e25a5380a21 Silenced -Wcast-function-type warnings (closes #1546). Sergey Kandaurov <pluknet@nginx.com> parents: 7088 diff changeset	2061 copy->code = (ngx_http_script_code_pt) (void *)
9e25a5380a21 Silenced -Wcast-function-type warnings (closes #1546). Sergey Kandaurov <pluknet@nginx.com> parents: 7088 diff changeset	2062 ngx_http_script_copy_len_code;
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	2063 copy->len = src[i].key.len;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2064
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2065 copy = ngx_array_push_n(params->lengths,
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	2066 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	2067 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	2068 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	2069 }
5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	2070
7271 9e25a5380a21 Silenced -Wcast-function-type warnings (closes #1546). Sergey Kandaurov <pluknet@nginx.com> parents: 7088 diff changeset	2071 copy->code = (ngx_http_script_code_pt) (void *)
9e25a5380a21 Silenced -Wcast-function-type warnings (closes #1546). Sergey Kandaurov <pluknet@nginx.com> parents: 7088 diff changeset	2072 ngx_http_script_copy_len_code;
4330 5ee5ddec17b1 uwsgi: added "if_not_empty" flag support to the "uwsgi_param" directive. Valentin Bartenev <vbart@nginx.com> parents: 4278 diff changeset	2073 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	2074
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2075
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	2076 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	2077 + 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	2078 & ~(sizeof(uintptr_t) - 1);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2079
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2080 copy = ngx_array_push_n(params->values, size);
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	2081 if (copy == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	2082 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	2083 }
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	2084
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	2085 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	2086 copy->len = src[i].key.len;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2087
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	2088 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	2089 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	2090
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2091
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	2092 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	2093
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	2094 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	2095 sc.source = &src[i].value;
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2096 sc.flushes = &params->flushes;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2097 sc.lengths = &params->lengths;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2098 sc.values = &params->values;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2099
3548 fc7541a6959d fix the previous commit when value is static string: remove the special Igor Sysoev <igor@sysoev.ru> parents: 3547 diff changeset	2100 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	2101 return NGX_ERROR;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2102 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2103
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2104 code = ngx_array_push_n(params->lengths, sizeof(uintptr_t));
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2105 if (code == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	2106 return NGX_ERROR;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2107 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2108
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2109 *code = (uintptr_t) NULL;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2110
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2111
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2112 code = ngx_array_push_n(params->values, sizeof(uintptr_t));
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2113 if (code == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	2114 return NGX_ERROR;
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2115 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2116
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2117 *code = (uintptr_t) NULL;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2118 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2119
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2120 code = ngx_array_push_n(params->lengths, sizeof(uintptr_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2121 if (code == NULL) {
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	2122 return NGX_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2123 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2124
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2125 *code = (uintptr_t) NULL;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2126
5908 f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2127 params->number = headers_names.nelts;
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2128
f8e80f8c7fc7 Upstream: moved header lists to separate structures. Roman Arutyunyan <arut@nginx.com> parents: 5907 diff changeset	2129 hash.hash = &params->hash;
3566 b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2130 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	2131 hash.max_size = 512;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2132 hash.bucket_size = 64;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2133 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	2134 hash.pool = cf->pool;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2135 hash.temp_pool = NULL;
b81d44244cb1 allow uwsgi_param to override client headers using HTTP_ parameters Igor Sysoev <igor@sysoev.ru> parents: 3565 diff changeset	2136
4277 e4b8255e44c3 Separate functions to merge fastcgi/scgi/uwsgi params. Maxim Dounin <mdounin@mdounin.ru> parents: 4157 diff changeset	2137 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	2138 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2139
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2140
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2141 static char *
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	2142 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	2143 {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2144 ngx_http_uwsgi_loc_conf_t *uwcf = conf;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2145
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2146 size_t add;
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	2147 ngx_url_t u;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	2148 ngx_str_t value, url;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	2149 ngx_uint_t n;
e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	2150 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	2151 ngx_http_script_compile_t sc;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2152
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2153 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	2154 return "is duplicate";
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2155 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2156
5758 f3df4e420ae7 Style: remove whitespace between function name and parentheses. Piotr Sikora <piotr@cloudflare.com> parents: 5738 diff changeset	2157 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2158 clcf->handler = ngx_http_uwsgi_handler;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2159
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2160 value = cf->args->elts;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2161
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2162 url = &value[1];
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2163
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	2164 n = ngx_http_script_variables_count(url);
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2165
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2166 if (n) {
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2167
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	2168 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	2169
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2170 sc.cf = cf;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2171 sc.source = url;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2172 sc.lengths = &uwcf->uwsgi_lengths;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2173 sc.values = &uwcf->uwsgi_values;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2174 sc.variables = n;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2175 sc.complete_lengths = 1;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2176 sc.complete_values = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2177
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	2178 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	2179 return NGX_CONF_ERROR;
9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2180 }
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2181
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2182 #if (NGX_HTTP_SSL)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2183 uwcf->ssl = 1;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2184 #endif
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2185
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2186 return NGX_CONF_OK;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2187 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2188
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2189 if (ngx_strncasecmp(url->data, (u_char *) "uwsgi://", 8) == 0) {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2190 add = 8;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2191
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2192 } else if (ngx_strncasecmp(url->data, (u_char *) "suwsgi://", 9) == 0) {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2193
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2194 #if (NGX_HTTP_SSL)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2195 add = 9;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2196 uwcf->ssl = 1;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2197 #else
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2198 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2199 "suwsgi protocol requires SSL support");
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2200 return NGX_CONF_ERROR;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2201 #endif
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2202
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2203 } else {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2204 add = 0;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2205 }
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2206
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	2207 ngx_memzero(&u, sizeof(ngx_url_t));
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2208
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2209 u.url.len = url->len - add;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2210 u.url.data = url->data + add;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2211 u.no_resolve = 1;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2212
3543 e132566a942e fix style, some names, and building by MSVC8 Igor Sysoev <igor@sysoev.ru> parents: 3542 diff changeset	2213 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	2214 if (uwcf->upstream.upstream == NULL) {
3542 9bf51b3fc1c1 style fix: remove tabs and trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 3541 diff changeset	2215 return NGX_CONF_ERROR;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2216 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2217
7321 45e513c3540d Fixed invalid access to location defined as an empty string. Ruslan Ermilov <ru@nginx.com> parents: 7320 diff changeset	2218 if (clcf->name.len && 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	2219 clcf->auto_redirect = 1;
3541 21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2220 }
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2221
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2222 return NGX_CONF_OK;
21452748d165 import original ngx_http_uwsgi_module version Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2223 }
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2224
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2225
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2226 static char *
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2227 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	2228 {
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2229 ngx_http_uwsgi_loc_conf_t *uwcf = conf;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2230
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2231 ngx_str_t *value;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2232 ngx_http_script_compile_t sc;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2233
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	2234 if (uwcf->upstream.store != NGX_CONF_UNSET) {
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2235 return "is duplicate";
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2236 }
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2237
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2238 value = cf->args->elts;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2239
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2240 if (ngx_strcmp(value[1].data, "off") == 0) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2241 uwcf->upstream.store = 0;
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2242 return NGX_CONF_OK;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2243 }
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2244
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2245 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2246
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2247 if (uwcf->upstream.cache > 0) {
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2248 return "is incompatible with \"uwsgi_cache\"";
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2249 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2250
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2251 #endif
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2252
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	2253 uwcf->upstream.store = 1;
d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	2254
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2255 if (ngx_strcmp(value[1].data, "on") == 0) {
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2256 return NGX_CONF_OK;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2257 }
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2258
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2259 /* include the terminating '\0' into script */
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2260 value[1].len++;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2261
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2262 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2263
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2264 sc.cf = cf;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2265 sc.source = &value[1];
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2266 sc.lengths = &uwcf->upstream.store_lengths;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2267 sc.values = &uwcf->upstream.store_values;
5496 9d056f10fb99 Style: removed surplus semicolons. Valentin Bartenev <vbart@nginx.com> parents: 5467 diff changeset	2268 sc.variables = ngx_http_script_variables_count(&value[1]);
3565 1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2269 sc.complete_lengths = 1;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2270 sc.complete_values = 1;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2271
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2272 if (ngx_http_script_compile(&sc) != NGX_OK) {
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2273 return NGX_CONF_ERROR;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2274 }
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2275
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2276 return NGX_CONF_OK;
1e86f0ac9a44 uwsgi_store Igor Sysoev <igor@sysoev.ru> parents: 3564 diff changeset	2277 }
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2278
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2279
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2280 #if (NGX_HTTP_CACHE)
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2281
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2282 static char *
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2283 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	2284 {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2285 ngx_http_uwsgi_loc_conf_t *uwcf = conf;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2286
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2287 ngx_str_t *value;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2288 ngx_http_complex_value_t cv;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2289 ngx_http_compile_complex_value_t ccv;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2290
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2291 value = cf->args->elts;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2292
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2293 if (uwcf->upstream.cache != NGX_CONF_UNSET) {
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2294 return "is duplicate";
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2295 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2296
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2297 if (ngx_strcmp(value[1].data, "off") == 0) {
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2298 uwcf->upstream.cache = 0;
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2299 return NGX_CONF_OK;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2300 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2301
5947 d9025ea1f5a5 Upstream: simplified proxy_store and friends configuration code. Valentin Bartenev <vbart@nginx.com> parents: 5940 diff changeset	2302 if (uwcf->upstream.store > 0) {
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2303 return "is incompatible with \"uwsgi_store\"";
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2304 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2305
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2306 uwcf->upstream.cache = 1;
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2307
5951 610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2308 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2309
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2310 ccv.cf = cf;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2311 ccv.value = &value[1];
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2312 ccv.complex_value = &cv;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2313
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2314 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2315 return NGX_CONF_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2316 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2317
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2318 if (cv.lengths != NULL) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2319
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2320 uwcf->upstream.cache_value = ngx_palloc(cf->pool,
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2321 sizeof(ngx_http_complex_value_t));
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2322 if (uwcf->upstream.cache_value == NULL) {
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2323 return NGX_CONF_ERROR;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2324 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2325
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2326 *uwcf->upstream.cache_value = cv;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2327
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2328 return NGX_CONF_OK;
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2329 }
610832763648 Upstream: added variables support to proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5949 diff changeset	2330
5949 634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2331 uwcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2332 &ngx_http_uwsgi_module);
634da79665d3 Upstream: refactored proxy_cache and friends. Valentin Bartenev <vbart@nginx.com> parents: 5948 diff changeset	2333 if (uwcf->upstream.cache_zone == NULL) {
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2334 return NGX_CONF_ERROR;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2335 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2336
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2337 return NGX_CONF_OK;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2338 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2339
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2340
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2341 static char *
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2342 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	2343 {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2344 ngx_http_uwsgi_loc_conf_t *uwcf = conf;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2345
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2346 ngx_str_t *value;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2347 ngx_http_compile_complex_value_t ccv;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2348
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2349 value = cf->args->elts;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2350
4947 4251e72b8bb4 Allow the complex value to be defined as an empty string. Ruslan Ermilov <ru@nginx.com> parents: 4615 diff changeset	2351 if (uwcf->cache_key.value.data) {
3568 7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2352 return "is duplicate";
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2353 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2354
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2355 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2356
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2357 ccv.cf = cf;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2358 ccv.value = &value[1];
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2359 ccv.complex_value = &uwcf->cache_key;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2360
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2361 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2362 return NGX_CONF_ERROR;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2363 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2364
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2365 return NGX_CONF_OK;
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2366 }
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2367
7cfbc51bac01 uwsgi cache Igor Sysoev <igor@sysoev.ru> parents: 3567 diff changeset	2368 #endif
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2369
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2370
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2371 #if (NGX_HTTP_SSL)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2372
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2373 static char *
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2374 ngx_http_uwsgi_ssl_password_file(ngx_conf_t cf, ngx_command_t cmd, void *conf)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2375 {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2376 ngx_http_uwsgi_loc_conf_t *uwcf = conf;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2377
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2378 ngx_str_t *value;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2379
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2380 if (uwcf->ssl_passwords != NGX_CONF_UNSET_PTR) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2381 return "is duplicate";
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2382 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2383
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2384 value = cf->args->elts;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2385
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2386 uwcf->ssl_passwords = ngx_ssl_read_password_file(cf, &value[1]);
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2387
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2388 if (uwcf->ssl_passwords == NULL) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2389 return NGX_CONF_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2390 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2391
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2392 return NGX_CONF_OK;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2393 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2394
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2395
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2396 static char *
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2397 ngx_http_uwsgi_ssl_conf_command_check(ngx_conf_t cf, void post, void *data)
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2398 {
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2399 #ifndef SSL_CONF_FLAG_FILE
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2400 return "is not supported on this platform";
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2401 #endif
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2402
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2403 return NGX_CONF_OK;
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2404 }
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2405
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2406
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2407 static ngx_int_t
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2408 ngx_http_uwsgi_set_ssl(ngx_conf_t cf, ngx_http_uwsgi_loc_conf_t uwcf)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2409 {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2410 ngx_pool_cleanup_t *cln;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2411
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2412 uwcf->upstream.ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2413 if (uwcf->upstream.ssl == NULL) {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2414 return NGX_ERROR;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2415 }
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2416
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2417 uwcf->upstream.ssl->log = cf->log;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2418
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2419 if (ngx_ssl_create(uwcf->upstream.ssl, uwcf->ssl_protocols, NULL)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2420 != NGX_OK)
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2421 {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2422 return NGX_ERROR;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2423 }
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2424
5659 3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	2425 cln = ngx_pool_cleanup_add(cf->pool, 0);
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	2426 if (cln == NULL) {
7473 8981dbb12254 SSL: fixed potential leak on memory allocation errors. Maxim Dounin <mdounin@mdounin.ru> parents: 7371 diff changeset	2427 ngx_ssl_cleanup_ctx(uwcf->upstream.ssl);
5659 3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	2428 return NGX_ERROR;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	2429 }
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	2430
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	2431 cln->handler = ngx_ssl_cleanup_ctx;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	2432 cln->data = uwcf->upstream.ssl;
3fb6615bb87f Upstream: plugged potential memory leak on reload. Maxim Dounin <mdounin@mdounin.ru> parents: 5575 diff changeset	2433
5900 20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2434 if (uwcf->ssl_certificate.len) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2435
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2436 if (uwcf->ssl_certificate_key.len == 0) {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2437 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2438 "no \"uwsgi_ssl_certificate_key\" is defined "
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2439 "for certificate \"%V\"", &uwcf->ssl_certificate);
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2440 return NGX_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2441 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2442
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2443 if (ngx_ssl_certificate(cf, uwcf->upstream.ssl, &uwcf->ssl_certificate,
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2444 &uwcf->ssl_certificate_key, uwcf->ssl_passwords)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2445 != NGX_OK)
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2446 {
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2447 return NGX_ERROR;
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2448 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2449 }
20d966ad5e89 Upstream: add "proxy_ssl_certificate" and friends. Piotr Sikora <piotr@cloudflare.com> parents: 5883 diff changeset	2450
6591 04d8d1f85649 SSL: ngx_ssl_ciphers() to set list of ciphers. Tim Taubert <tim@timtaubert.de> parents: 6530 diff changeset	2451 if (ngx_ssl_ciphers(cf, uwcf->upstream.ssl, &uwcf->ssl_ciphers, 0)
04d8d1f85649 SSL: ngx_ssl_ciphers() to set list of ciphers. Tim Taubert <tim@timtaubert.de> parents: 6530 diff changeset	2452 != NGX_OK)
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2453 {
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2454 return NGX_ERROR;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2455 }
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2456
5662 3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2457 if (uwcf->upstream.ssl_verify) {
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2458 if (uwcf->ssl_trusted_certificate.len == 0) {
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2459 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2460 "no uwsgi_ssl_trusted_certificate for uwsgi_ssl_verify");
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2461 return NGX_ERROR;
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2462 }
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2463
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2464 if (ngx_ssl_trusted_certificate(cf, uwcf->upstream.ssl,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2465 &uwcf->ssl_trusted_certificate,
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2466 uwcf->ssl_verify_depth)
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2467 != NGX_OK)
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2468 {
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2469 return NGX_ERROR;
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2470 }
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2471
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2472 if (ngx_ssl_crl(cf, uwcf->upstream.ssl, &uwcf->ssl_crl) != NGX_OK) {
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2473 return NGX_ERROR;
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2474 }
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2475 }
3cb79707516a Upstream: uwsgi_ssl_name, uwsgi_ssl_verify, and so on. Maxim Dounin <mdounin@mdounin.ru> parents: 5659 diff changeset	2476
7320 696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	2477 if (ngx_ssl_client_session_cache(cf, uwcf->upstream.ssl,
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	2478 uwcf->upstream.ssl_session_reuse)
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	2479 != NGX_OK)
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	2480 {
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	2481 return NGX_ERROR;
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	2482 }
696df3ac27ac SSL: save sessions for upstream peers using a callback function. Sergey Kandaurov <pluknet@nginx.com> parents: 7271 diff changeset	2483
7730 1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2484 if (ngx_ssl_conf_commands(cf, uwcf->upstream.ssl, uwcf->ssl_conf_commands)
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2485 != NGX_OK)
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2486 {
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2487 return NGX_ERROR;
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2488 }
1a719ee45526 Upstream: proxy_ssl_conf_command and friends. Maxim Dounin <mdounin@mdounin.ru> parents: 7678 diff changeset	2489
5457 c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2490 return NGX_OK;
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2491 }
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2492
c82b2e020b9f SSL support in the uwsgi module. Maxim Dounin <mdounin@mdounin.ru> parents: 5451 diff changeset	2493 #endif

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_uwsgi_module.c @ 7730:1a719ee45526