diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-03-15 12:53:04 +0300 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-03-15 12:53:04 +0300 |
| commit | 8fea885cbf8d63d67ee6b7ea82e3e0438182ac36 (patch) | |
| tree | 232fb0db90b71aeb124c970bf619f3dd1de19aac /src/core | |
| parent | 5e40d785cbb896a9ed218c6a599863f2a82aa721 (diff) | |
nginx-0.3.33-RELEASE importrelease-0.3.33
*) Feature: the "http_503" parameter of the "proxy_next_upstream" or
"fastcgi_next_upstream" directives.
*) Bugfix: ngx_http_perl_module did not work with inlined in the
configuration code, if it was not started with the "sub" word.
*) Bugfix: in the "post_action" directive.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_conf_file.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index 86959ad6a..c5842582a 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.3.32" +#define NGINX_VER "nginx/0.3.33" #define NGINX_VAR "NGINX" #define NGX_OLDPID_EXT ".oldbin" diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index 62f365552..a183a5747 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -282,7 +282,7 @@ char *ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data); #define ngx_conf_merge_str_value(conf, prev, default) \ if (conf.data == NULL) { \ - if (prev.data) { \ + if (prev.data) { \ conf.len = prev.len; \ conf.data = prev.data; \ } else { \ |