Mercurial > hg > nginx
comparison src/http/modules/ngx_http_userid_filter_module.c @ 663:6d5c1535bb9d release-0.3.53
nginx-0.3.53-RELEASE import
*) Change: the "add_header" directive adds the string to 204, 301, and
302 responses.
*) Feature: the "server" directive in the "upstream" context supports
the "weight" parameter.
*) Feature: the "server_name" directive supports the "*" wildcard.
*) Feature: nginx supports the request body size more than 2G.
*) Bugfix: if a client was successfully authorized using "satisfy_any
on", then anyway the message "access forbidden by rule" was written
in the log.
*) Bugfix: the "PUT" method may erroneously not create a file and
return the 409 code.
*) Bugfix: if the IMAP/POP3 backend returned an error, then nginx
continued proxying anyway.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 07 Jul 2006 16:33:19 +0000 |
parents | 400711951595 |
children | 63a820b0bc6c |
comparison
equal
deleted
inserted
replaced
662:4c15f63afe65 | 663:6d5c1535bb9d |
---|---|
668 ngx_http_userid_merge_conf(ngx_conf_t *cf, void *parent, void *child) | 668 ngx_http_userid_merge_conf(ngx_conf_t *cf, void *parent, void *child) |
669 { | 669 { |
670 ngx_http_userid_conf_t *prev = parent; | 670 ngx_http_userid_conf_t *prev = parent; |
671 ngx_http_userid_conf_t *conf = child; | 671 ngx_http_userid_conf_t *conf = child; |
672 | 672 |
673 ngx_conf_merge_unsigned_value(conf->enable, prev->enable, | 673 ngx_conf_merge_uint_value(conf->enable, prev->enable, |
674 NGX_HTTP_USERID_OFF); | 674 NGX_HTTP_USERID_OFF); |
675 | 675 |
676 ngx_conf_merge_str_value(conf->name, prev->name, "uid"); | 676 ngx_conf_merge_str_value(conf->name, prev->name, "uid"); |
677 ngx_conf_merge_str_value(conf->domain, prev->domain, ""); | 677 ngx_conf_merge_str_value(conf->domain, prev->domain, ""); |
678 ngx_conf_merge_str_value(conf->path, prev->path, "; path=/"); | 678 ngx_conf_merge_str_value(conf->path, prev->path, "; path=/"); |
679 ngx_conf_merge_str_value(conf->p3p, prev->p3p, ""); | 679 ngx_conf_merge_str_value(conf->p3p, prev->p3p, ""); |