Mercurial > hg > nginx

comparison src/http/modules/ngx_http_scgi_module.c @ 4252:94049ec3eeda stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging r4158: Added uwsgi_buffering and scgi_buffering directives. Patch by Peter Smit.
author Igor Sysoev <igor@sysoev.ru>
date Tue, 01 Nov 2011 14:04:23 +0000
parents 36d2cd2e361d
children e4b8255e44c3 94b995c7c614
comparison
equal deleted inserted replaced
4251:cc7ea429170d 4252:94049ec3eeda
92 { ngx_string("scgi_store_access"), 92 { ngx_string("scgi_store_access"),
93 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123, 93 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123,
94 ngx_conf_set_access_slot, 94 ngx_conf_set_access_slot,
95 NGX_HTTP_LOC_CONF_OFFSET, 95 NGX_HTTP_LOC_CONF_OFFSET,
96 offsetof(ngx_http_scgi_loc_conf_t, upstream.store_access), 96 offsetof(ngx_http_scgi_loc_conf_t, upstream.store_access),
97 NULL },
98
99 { ngx_string("scgi_buffering"),
100 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
101 ngx_conf_set_flag_slot,
102 NGX_HTTP_LOC_CONF_OFFSET,
103 offsetof(ngx_http_scgi_loc_conf_t, upstream.buffering),
97 NULL }, 104 NULL },
98 105
99 { ngx_string("scgi_ignore_client_abort"), 106 { ngx_string("scgi_ignore_client_abort"),
100 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 107 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
101 ngx_conf_set_flag_slot, 108 ngx_conf_set_flag_slot,
410 u->reinit_request = ngx_http_scgi_reinit_request; 417 u->reinit_request = ngx_http_scgi_reinit_request;
411 u->process_header = ngx_http_scgi_process_status_line; 418 u->process_header = ngx_http_scgi_process_status_line;
412 u->abort_request = ngx_http_scgi_abort_request; 419 u->abort_request = ngx_http_scgi_abort_request;
413 u->finalize_request = ngx_http_scgi_finalize_request; 420 u->finalize_request = ngx_http_scgi_finalize_request;
414 421
415 u->buffering = 1; 422 u->buffering = scf->upstream.buffering;
416 423
417 u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t)); 424 u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t));
418 if (u->pipe == NULL) { 425 if (u->pipe == NULL) {
419 return NGX_HTTP_INTERNAL_SERVER_ERROR; 426 return NGX_HTTP_INTERNAL_SERVER_ERROR;
420 } 427 }
1036 conf->upstream.intercept_errors = NGX_CONF_UNSET; 1043 conf->upstream.intercept_errors = NGX_CONF_UNSET;
1037 1044
1038 /* "scgi_cyclic_temp_file" is disabled */ 1045 /* "scgi_cyclic_temp_file" is disabled */
1039 conf->upstream.cyclic_temp_file = 0; 1046 conf->upstream.cyclic_temp_file = 0;
1040 1047
1048 conf->upstream.change_buffering = 1;
1049
1041 ngx_str_set(&conf->upstream.module, "scgi"); 1050 ngx_str_set(&conf->upstream.module, "scgi");
1042 1051
1043 return conf; 1052 return conf;
1044 } 1053 }
1045 1054