Mercurial > hg > nginx

comparison src/http/ngx_http_script.c @ 6940:39ff6939266e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unified error messages about duplicate directives.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 22 Mar 2017 22:49:52 +0300
parents e4590dfd97ff
children 3fb9b5eb75c0
comparison
equal deleted inserted replaced
6939:633a36655bb6 6940:39ff6939266e
218 ngx_http_compile_complex_value_t ccv; 218 ngx_http_compile_complex_value_t ccv;
219 219
220 cv = (ngx_http_complex_value_t **) (p + cmd->offset); 220 cv = (ngx_http_complex_value_t **) (p + cmd->offset);
221 221
222 if (*cv != NULL) { 222 if (*cv != NULL) {
223 return "duplicate"; 223 return "is duplicate";
224 } 224 }
225 225
226 *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t)); 226 *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
227 if (*cv == NULL) { 227 if (*cv == NULL) {
228 return NGX_CONF_ERROR; 228 return NGX_CONF_ERROR;