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

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
1171 conf->upstream.busy_buffers_size_conf; 1171 conf->upstream.busy_buffers_size_conf;
1172 } 1172 }
1173 1173
1174 if (conf->upstream.busy_buffers_size < size) { 1174 if (conf->upstream.busy_buffers_size < size) {
1175 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 1175 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1176 "\"scgi_busy_buffers_size\" must be equal or bigger " 1176 "\"scgi_busy_buffers_size\" must be equal to or greater "
1177 "than maximum of the value of \"scgi_buffer_size\" and " 1177 "than the maximum of the value of \"scgi_buffer_size\" and "
1178 "one of the \"scgi_buffers\""); 1178 "one of the \"scgi_buffers\"");
1179 1179
1180 return NGX_CONF_ERROR; 1180 return NGX_CONF_ERROR;
1181 } 1181 }
1182 1182
1202 conf->upstream.temp_file_write_size_conf; 1202 conf->upstream.temp_file_write_size_conf;
1203 } 1203 }
1204 1204
1205 if (conf->upstream.temp_file_write_size < size) { 1205 if (conf->upstream.temp_file_write_size < size) {
1206 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 1206 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1207 "\"scgi_temp_file_write_size\" must be equal or bigger than " 1207 "\"scgi_temp_file_write_size\" must be equal to or greater than "
1208 "maximum of the value of \"scgi_buffer_size\" and " 1208 "the maximum of the value of \"scgi_buffer_size\" and "
1209 "one of the \"scgi_buffers\""); 1209 "one of the \"scgi_buffers\"");
1210 1210
1211 return NGX_CONF_ERROR; 1211 return NGX_CONF_ERROR;
1212 } 1212 }
1213 1213
1225 1225
1226 if (conf->upstream.max_temp_file_size != 0 1226 if (conf->upstream.max_temp_file_size != 0
1227 && conf->upstream.max_temp_file_size < size) { 1227 && conf->upstream.max_temp_file_size < size) {
1228 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 1228 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1229 "\"scgi_max_temp_file_size\" must be equal to zero to disable " 1229 "\"scgi_max_temp_file_size\" must be equal to zero to disable "
1230 "the temporary files usage or must be equal or bigger than " 1230 "temporary files usage or must be equal to or greater than "
1231 "maximum of the value of \"scgi_buffer_size\" and " 1231 "the maximum of the value of \"scgi_buffer_size\" and "
1232 "one of the \"scgi_buffers\""); 1232 "one of the \"scgi_buffers\"");
1233 1233
1234 return NGX_CONF_ERROR; 1234 return NGX_CONF_ERROR;
1235 } 1235 }
1236 1236