diff options
| author | nginx <nginx@nginx.org> | 2014-07-08 13:45:06 +0000 |
|---|---|---|
| committer | Jon Kolb <kolbyjack@gmail.com> | 2014-07-08 13:45:06 +0000 |
| commit | 251331cd59f780fca94bef334f58a6e311e4ad32 (patch) | |
| tree | 529cad425bb96637cb24ee746ea34f598f40a237 /src/http/ngx_http.c | |
| parent | a995714bb2b96df7f846a8eec89715000f0699dd (diff) | |
| download | nginx-1.7.3.tar.gz | |
Changes with nginx 1.7.3 08 Jul 2014v1.7.3
*) Feature: weak entity tags are now preserved on response
modifications, and strong ones are changed to weak.
*) Feature: cache revalidation now uses If-None-Match header if
possible.
*) Feature: the "ssl_password_file" directive.
*) Bugfix: the If-None-Match request header line was ignored if there
was no Last-Modified header in a response returned from cache.
*) Bugfix: "peer closed connection in SSL handshake" messages were
logged at "info" level instead of "error" while connecting to
backends.
*) Bugfix: in the ngx_http_dav_module module in nginx/Windows.
*) Bugfix: SPDY connections might be closed prematurely if caching was
used.
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index ce5adb737..31577f9a2 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -742,7 +742,7 @@ ngx_http_init_locations(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, if (named) { clcfp = ngx_palloc(cf->pool, - (n + 1) * sizeof(ngx_http_core_loc_conf_t **)); + (n + 1) * sizeof(ngx_http_core_loc_conf_t *)); if (clcfp == NULL) { return NGX_ERROR; } @@ -768,7 +768,7 @@ ngx_http_init_locations(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, if (regex) { clcfp = ngx_palloc(cf->pool, - (r + 1) * sizeof(ngx_http_core_loc_conf_t **)); + (r + 1) * sizeof(ngx_http_core_loc_conf_t *)); if (clcfp == NULL) { return NGX_ERROR; } |