Mercurial > hg > nginx

comparison src/http/modules/ngx_http_uwsgi_module.c @ 4157:9d59a8eda373

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added uwsgi_buffering and scgi_buffering directives. Patch by Peter Smit.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 30 Sep 2011 11:53:27 +0000
parents e0a435f5f504
children e4b8255e44c3 94b995c7c614
comparison
equal deleted inserted replaced
4156:67a4654ba7d9 4157:9d59a8eda373
119 { ngx_string("uwsgi_store_access"), 119 { ngx_string("uwsgi_store_access"),
120 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123, 120 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123,
121 ngx_conf_set_access_slot, 121 ngx_conf_set_access_slot,
122 NGX_HTTP_LOC_CONF_OFFSET, 122 NGX_HTTP_LOC_CONF_OFFSET,
123 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.store_access), 123 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.store_access),
124 NULL },
125
126 { ngx_string("uwsgi_buffering"),
127 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
128 ngx_conf_set_flag_slot,
129 NGX_HTTP_LOC_CONF_OFFSET,
130 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.buffering),
124 NULL }, 131 NULL },
125 132
126 { ngx_string("uwsgi_ignore_client_abort"), 133 { ngx_string("uwsgi_ignore_client_abort"),
127 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 134 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
128 ngx_conf_set_flag_slot, 135 ngx_conf_set_flag_slot,
443 u->reinit_request = ngx_http_uwsgi_reinit_request; 450 u->reinit_request = ngx_http_uwsgi_reinit_request;
444 u->process_header = ngx_http_uwsgi_process_status_line; 451 u->process_header = ngx_http_uwsgi_process_status_line;
445 u->abort_request = ngx_http_uwsgi_abort_request; 452 u->abort_request = ngx_http_uwsgi_abort_request;
446 u->finalize_request = ngx_http_uwsgi_finalize_request; 453 u->finalize_request = ngx_http_uwsgi_finalize_request;
447 454
448 u->buffering = 1; 455 u->buffering = uwcf->upstream.buffering;
449 456
450 u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t)); 457 u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t));
451 if (u->pipe == NULL) { 458 if (u->pipe == NULL) {
452 return NGX_HTTP_INTERNAL_SERVER_ERROR; 459 return NGX_HTTP_INTERNAL_SERVER_ERROR;
453 } 460 }
1089 conf->upstream.intercept_errors = NGX_CONF_UNSET; 1096 conf->upstream.intercept_errors = NGX_CONF_UNSET;
1090 1097
1091 /* "uwsgi_cyclic_temp_file" is disabled */ 1098 /* "uwsgi_cyclic_temp_file" is disabled */
1092 conf->upstream.cyclic_temp_file = 0; 1099 conf->upstream.cyclic_temp_file = 0;
1093 1100
1101 conf->upstream.change_buffering = 1;
1102
1094 ngx_str_set(&conf->upstream.module, "uwsgi"); 1103 ngx_str_set(&conf->upstream.module, "uwsgi");
1095 1104
1096 return conf; 1105 return conf;
1097 } 1106 }
1098 1107