Mercurial > hg > nginx
comparison src/http/modules/ngx_http_secure_link_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 | bbb17a60ec44 |
children | 7224d008faaf |
comparison
equal
deleted
inserted
replaced
3236:9aa8fd2d5a00 | 3237:2efa8d2fcde1 |
---|---|
150 { | 150 { |
151 ngx_http_secure_link_conf_t *conf; | 151 ngx_http_secure_link_conf_t *conf; |
152 | 152 |
153 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_secure_link_conf_t)); | 153 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_secure_link_conf_t)); |
154 if (conf == NULL) { | 154 if (conf == NULL) { |
155 return NGX_CONF_ERROR; | 155 return NULL; |
156 } | 156 } |
157 | 157 |
158 /* | 158 /* |
159 * set by ngx_pcalloc(): | 159 * set by ngx_pcalloc(): |
160 * | 160 * |