diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-03-19 15:38:37 +0300 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-03-19 15:38:37 +0300 |
| commit | c15717285d2157a603bb1b130b26d7baa549be7e (patch) | |
| tree | 56dc8346b22bb2660eecd3bc086d263ac6d67326 /src/core/ngx_file.h | |
| parent | e12fbfe82a176cd386cdcecfeabf43ac8fd870a4 (diff) | |
nginx-0.1.25-RELEASE importrelease-0.1.25
*) Bugfix: nginx did run on Linux parisc.
*) Feature: nginx now does not start under FreeBSD if the sysctl
kern.ipc.somaxconn value is too big.
*) Bugfix: if a request was internally redirected by the
ngx_http_index_module module to the ngx_http_proxy_module or
ngx_http_fastcgi_module modules, then the index file was not closed
after request completion.
*) Feature: the "proxy_pass" can be used in location with regular
expression.
*) Feature: the ngx_http_rewrite_filter_module module supports the
condition like "if ($HTTP_USER_AGENT ~ MSIE)".
*) Bugfix: nginx started too slow if the large number of addresses and
text values were used in the "geo" directive.
*) Change: a variable name must be declared as "$name" in the "geo"
directive. The previous variant without "$" is still supported, but
will be removed soon.
*) Feature: the "%{VARIABLE}v" logging parameter.
*) Feature: the "set $name value" directive.
*) Bugfix: gcc 4.0 compatibility.
*) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive.
Diffstat (limited to 'src/core/ngx_file.h')
| -rw-r--r-- | src/core/ngx_file.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h index c9063c5b4..2bda85886 100644 --- a/src/core/ngx_file.h +++ b/src/core/ngx_file.h @@ -70,7 +70,8 @@ char *ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); #define ngx_conf_merge_path_value(curr, prev, path, l1, l2, l3, clean, cf) \ if (curr == NULL) { \ if (prev == NULL) { \ - if (!(curr = ngx_palloc(cf->pool, sizeof(ngx_path_t)))) { \ + curr = ngx_palloc(cf->pool, sizeof(ngx_path_t)); \ + if (curr == NULL) { \ return NGX_CONF_ERROR; \ } \ \ |