Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_fastcgi_module.c @ 672:f41d4b305d22 NGINX_1_2_0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.2.0 *) Bugfix: a segmentation fault might occur in a worker process if the "try_files" directive was used; the bug had appeared in 1.1.19. *) Bugfix: response might be truncated if there were more than IOV_MAX buffers used. *) Bugfix: in the "crop" parameter of the "image_filter" directive. Thanks to Maxim Bublis.
author Igor Sysoev <http://sysoev.ru>
date Mon, 23 Apr 2012 00:00:00 +0400
parents bf8b55a5ac89
children 4dcaf40cc702
comparison
equal deleted inserted replaced
671:47cb3497fbab 672:f41d4b305d22
1252 return NGX_HTTP_UPSTREAM_INVALID_HEADER; 1252 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
1253 } 1253 }
1254 1254
1255 if (f->type == NGX_HTTP_FASTCGI_STDOUT && f->length == 0) { 1255 if (f->type == NGX_HTTP_FASTCGI_STDOUT && f->length == 0) {
1256 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, 1256 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
1257 "upstream closed prematurely FastCGI stdout"); 1257 "upstream prematurely closed FastCGI stdout");
1258 1258
1259 return NGX_HTTP_UPSTREAM_INVALID_HEADER; 1259 return NGX_HTTP_UPSTREAM_INVALID_HEADER;
1260 } 1260 }
1261 } 1261 }
1262 1262
2196 conf->upstream.busy_buffers_size_conf; 2196 conf->upstream.busy_buffers_size_conf;
2197 } 2197 }
2198 2198
2199 if (conf->upstream.busy_buffers_size < size) { 2199 if (conf->upstream.busy_buffers_size < size) {
2200 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 2200 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2201 "\"fastcgi_busy_buffers_size\" must be equal or bigger than " 2201 "\"fastcgi_busy_buffers_size\" must be equal to or greater than "
2202 "maximum of the value of \"fastcgi_buffer_size\" and " 2202 "the maximum of the value of \"fastcgi_buffer_size\" and "
2203 "one of the \"fastcgi_buffers\""); 2203 "one of the \"fastcgi_buffers\"");
2204 2204
2205 return NGX_CONF_ERROR; 2205 return NGX_CONF_ERROR;
2206 } 2206 }
2207 2207
2227 conf->upstream.temp_file_write_size_conf; 2227 conf->upstream.temp_file_write_size_conf;
2228 } 2228 }
2229 2229
2230 if (conf->upstream.temp_file_write_size < size) { 2230 if (conf->upstream.temp_file_write_size < size) {
2231 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 2231 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2232 "\"fastcgi_temp_file_write_size\" must be equal or bigger than " 2232 "\"fastcgi_temp_file_write_size\" must be equal to or greater "
2233 "maximum of the value of \"fastcgi_buffer_size\" and " 2233 "than the maximum of the value of \"fastcgi_buffer_size\" and "
2234 "one of the \"fastcgi_buffers\""); 2234 "one of the \"fastcgi_buffers\"");
2235 2235
2236 return NGX_CONF_ERROR; 2236 return NGX_CONF_ERROR;
2237 } 2237 }
2238 2238
2251 if (conf->upstream.max_temp_file_size != 0 2251 if (conf->upstream.max_temp_file_size != 0
2252 && conf->upstream.max_temp_file_size < size) 2252 && conf->upstream.max_temp_file_size < size)
2253 { 2253 {
2254 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 2254 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2255 "\"fastcgi_max_temp_file_size\" must be equal to zero to disable " 2255 "\"fastcgi_max_temp_file_size\" must be equal to zero to disable "
2256 "the temporary files usage or must be equal or bigger than " 2256 "temporary files usage or must be equal to or greater than "
2257 "maximum of the value of \"fastcgi_buffer_size\" and " 2257 "the maximum of the value of \"fastcgi_buffer_size\" and "
2258 "one of the \"fastcgi_buffers\""); 2258 "one of the \"fastcgi_buffers\"");
2259 2259
2260 return NGX_CONF_ERROR; 2260 return NGX_CONF_ERROR;
2261 } 2261 }
2262 2262