Mercurial > hg > nginx-vendor-current
comparison src/http/ngx_http_script.c @ 596:6c96fdd2dfc3 NGINX_0_8_50
nginx 0.8.50
*) Feature: the "secure_link", "secure_link_md5", and
"secure_link_expires" directives of the ngx_http_secure_link_module.
*) Feature: the -q switch.
Thanks to Gena Makhomed.
*) Bugfix: worker processes may got caught in an endless loop during
reconfiguration, if a caching was used; the bug had appeared in
0.8.48.
*) Bugfix: in the "gzip_disable" directive.
Thanks to Derrick Petzold.
*) Bugfix: nginx/Windows could not send stop, quit, reopen, and reload
signals to a process run in other session.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Thu, 02 Sep 2010 00:00:00 +0400 |
| parents | b6a5942a4e6a |
| children | be70f83b184f |
comparison
equal
deleted
inserted
replaced
| 595:57dcc025db4f | 596:6c96fdd2dfc3 |
|---|---|
| 209 | 209 |
| 210 return NGX_OK; | 210 return NGX_OK; |
| 211 } | 211 } |
| 212 | 212 |
| 213 | 213 |
| 214 char * | |
| 215 ngx_http_set_comlex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 216 { | |
| 217 char *p = conf; | |
| 218 | |
| 219 ngx_str_t *value; | |
| 220 ngx_http_complex_value_t **cv; | |
| 221 ngx_http_compile_complex_value_t ccv; | |
| 222 | |
| 223 cv = (ngx_http_complex_value_t **) (p + cmd->offset); | |
| 224 | |
| 225 if (*cv != NULL) { | |
| 226 return "duplicate"; | |
| 227 } | |
| 228 | |
| 229 *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t)); | |
| 230 if (*cv == NULL) { | |
| 231 return NGX_CONF_ERROR; | |
| 232 } | |
| 233 | |
| 234 value = cf->args->elts; | |
| 235 | |
| 236 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); | |
| 237 | |
| 238 ccv.cf = cf; | |
| 239 ccv.value = &value[1]; | |
| 240 ccv.complex_value = *cv; | |
| 241 | |
| 242 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { | |
| 243 return NGX_CONF_ERROR; | |
| 244 } | |
| 245 | |
| 246 return NGX_CONF_OK; | |
| 247 } | |
| 248 | |
| 249 | |
| 214 ngx_int_t | 250 ngx_int_t |
| 215 ngx_http_test_predicates(ngx_http_request_t *r, ngx_array_t *predicates) | 251 ngx_http_test_predicates(ngx_http_request_t *r, ngx_array_t *predicates) |
| 216 { | 252 { |
| 217 ngx_str_t val; | 253 ngx_str_t val; |
| 218 ngx_uint_t i; | 254 ngx_uint_t i; |