comparison src/http/ngx_http_script.c @ 694:88a1b4797f2e NGINX_1_3_10

nginx 1.3.10 *) Change: domain names specified in configuration file are now resolved to IPv6 addresses as well as IPv4 ones. *) Change: now if the "include" directive with mask is used on Unix systems, included files are sorted in alphabetical order. *) Change: the "add_header" directive adds headers to 201 responses. *) Feature: the "geo" directive now supports IPv6 addresses in CIDR notation. *) Feature: the "flush" and "gzip" parameters of the "access_log" directive. *) Feature: variables support in the "auth_basic" directive. *) Bugfix: nginx could not be built with the ngx_http_perl_module in some cases. *) Bugfix: a segmentation fault might occur in a worker process if the ngx_http_xslt_module was used. *) Bugfix: nginx could not be built on MacOSX in some cases. Thanks to Piotr Sikora. *) Bugfix: the "limit_rate" directive with high rates might result in truncated responses on 32-bit platforms. Thanks to Alexey Antropov. *) Bugfix: a segmentation fault might occur in a worker process if the "if" directive was used. Thanks to Piotr Sikora. *) Bugfix: a "100 Continue" response was issued with "413 Request Entity Too Large" responses. *) Bugfix: the "image_filter", "image_filter_jpeg_quality" and "image_filter_sharpen" directives might be inherited incorrectly. Thanks to Ian Babrou. *) Bugfix: "crypt_r() failed" errors might appear if the "auth_basic" directive was used on Linux. *) Bugfix: in backup servers handling. Thanks to Thomas Chen. *) Bugfix: proxied HEAD requests might return incorrect response if the "gzip" directive was used.
author Igor Sysoev <http://sysoev.ru>
date Tue, 25 Dec 2012 00:00:00 +0400
parents 4dcaf40cc702
children
comparison
equal deleted inserted replaced
693:cfd4279acc6e 694:88a1b4797f2e
112 ngx_array_t flushes, lengths, values, *pf, *pl, *pv; 112 ngx_array_t flushes, lengths, values, *pf, *pl, *pv;
113 ngx_http_script_compile_t sc; 113 ngx_http_script_compile_t sc;
114 114
115 v = ccv->value; 115 v = ccv->value;
116 116
117 if (v->len == 0) {
118 ngx_conf_log_error(NGX_LOG_EMERG, ccv->cf, 0, "empty parameter");
119 return NGX_ERROR;
120 }
121
122 nv = 0; 117 nv = 0;
123 nc = 0; 118 nc = 0;
124 119
125 for (i = 0; i < v->len; i++) { 120 for (i = 0; i < v->len; i++) {
126 if (v->data[i] == '$') { 121 if (v->data[i] == '$') {
131 nv++; 126 nv++;
132 } 127 }
133 } 128 }
134 } 129 }
135 130
136 if (v->data[0] != '$' && (ccv->conf_prefix || ccv->root_prefix)) { 131 if ((v->len == 0 || v->data[0] != '$')
137 132 && (ccv->conf_prefix || ccv->root_prefix))
133 {
138 if (ngx_conf_full_name(ccv->cf->cycle, v, ccv->conf_prefix) != NGX_OK) { 134 if (ngx_conf_full_name(ccv->cf->cycle, v, ccv->conf_prefix) != NGX_OK) {
139 return NGX_ERROR; 135 return NGX_ERROR;
140 } 136 }
141 137
142 ccv->conf_prefix = 0; 138 ccv->conf_prefix = 0;