Mercurial > hg > nginx-vendor-current
comparison src/http/modules/ngx_http_uwsgi_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 |
---|---|
1214 conf->upstream.busy_buffers_size_conf; | 1214 conf->upstream.busy_buffers_size_conf; |
1215 } | 1215 } |
1216 | 1216 |
1217 if (conf->upstream.busy_buffers_size < size) { | 1217 if (conf->upstream.busy_buffers_size < size) { |
1218 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 1218 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
1219 "\"uwsgi_busy_buffers_size\" must be equal or bigger " | 1219 "\"uwsgi_busy_buffers_size\" must be equal to or greater " |
1220 "than maximum of the value of \"uwsgi_buffer_size\" and " | 1220 "than the maximum of the value of \"uwsgi_buffer_size\" and " |
1221 "one of the \"uwsgi_buffers\""); | 1221 "one of the \"uwsgi_buffers\""); |
1222 | 1222 |
1223 return NGX_CONF_ERROR; | 1223 return NGX_CONF_ERROR; |
1224 } | 1224 } |
1225 | 1225 |
1245 conf->upstream.temp_file_write_size_conf; | 1245 conf->upstream.temp_file_write_size_conf; |
1246 } | 1246 } |
1247 | 1247 |
1248 if (conf->upstream.temp_file_write_size < size) { | 1248 if (conf->upstream.temp_file_write_size < size) { |
1249 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 1249 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
1250 "\"uwsgi_temp_file_write_size\" must be equal or bigger than " | 1250 "\"uwsgi_temp_file_write_size\" must be equal to or greater than " |
1251 "maximum of the value of \"uwsgi_buffer_size\" and " | 1251 "the maximum of the value of \"uwsgi_buffer_size\" and " |
1252 "one of the \"uwsgi_buffers\""); | 1252 "one of the \"uwsgi_buffers\""); |
1253 | 1253 |
1254 return NGX_CONF_ERROR; | 1254 return NGX_CONF_ERROR; |
1255 } | 1255 } |
1256 | 1256 |
1268 | 1268 |
1269 if (conf->upstream.max_temp_file_size != 0 | 1269 if (conf->upstream.max_temp_file_size != 0 |
1270 && conf->upstream.max_temp_file_size < size) { | 1270 && conf->upstream.max_temp_file_size < size) { |
1271 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 1271 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
1272 "\"uwsgi_max_temp_file_size\" must be equal to zero to disable " | 1272 "\"uwsgi_max_temp_file_size\" must be equal to zero to disable " |
1273 "the temporary files usage or must be equal or bigger than " | 1273 "temporary files usage or must be equal to or greater than " |
1274 "maximum of the value of \"uwsgi_buffer_size\" and " | 1274 "the maximum of the value of \"uwsgi_buffer_size\" and " |
1275 "one of the \"uwsgi_buffers\""); | 1275 "one of the \"uwsgi_buffers\""); |
1276 | 1276 |
1277 return NGX_CONF_ERROR; | 1277 return NGX_CONF_ERROR; |
1278 } | 1278 } |
1279 | 1279 |