Mercurial > hg > nginx
comparison src/http/modules/ngx_http_image_filter_module.c @ 3237:2efa8d2fcde1 stable-0.7
merge r2903, r2911, r2912, r3002:
fix various failures handling
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 26 Oct 2009 15:54:29 +0000 |
parents | 5da043342fe4 |
children | 8b2d478de54b |
comparison
equal
deleted
inserted
replaced
3236:9aa8fd2d5a00 | 3237:2efa8d2fcde1 |
---|---|
946 { | 946 { |
947 ngx_http_image_filter_conf_t *conf; | 947 ngx_http_image_filter_conf_t *conf; |
948 | 948 |
949 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_image_filter_conf_t)); | 949 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_image_filter_conf_t)); |
950 if (conf == NULL) { | 950 if (conf == NULL) { |
951 return NGX_CONF_ERROR; | 951 return NULL; |
952 } | 952 } |
953 | 953 |
954 conf->filter = NGX_CONF_UNSET_UINT; | 954 conf->filter = NGX_CONF_UNSET_UINT; |
955 conf->jpeg_quality = NGX_CONF_UNSET; | 955 conf->jpeg_quality = NGX_CONF_UNSET; |
956 conf->buffer_size = NGX_CONF_UNSET_SIZE; | 956 conf->buffer_size = NGX_CONF_UNSET_SIZE; |