summaryrefslogtreecommitdiff
path: root/src/http/ngx_http_variables.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2008-06-23 10:36:08 +0000
committerJonathan Kolb <jon@b0g.us>2008-06-23 10:36:08 +0000
commit7c29bc0923869f5d766a72363a2b536c2f17ea7b (patch)
tree325389ad84ed5e53eeb5d6314378ca2c7ff21ac9 /src/http/ngx_http_variables.c
parentff4a9ea8bfe7f2ee7a9b965b521c3dd9fda49365 (diff)
downloadnginx-7c29bc0923869f5d766a72363a2b536c2f17ea7b.tar.gz
Changes with nginx 0.7.3 23 Jun 2008v0.7.3
*) Change: the "rss" extension MIME type has been changed to "application/rss+xml". *) Change: now the "gzip_vary" directive turned on issues a "Vary: Accept-Encoding" header line for uncompressed responses too. *) Feature: now the "rewrite" directive does a redirect automatically if the "https://" protocol is used. *) Bugfix: the "proxy_pass" directive did not work with the HTTPS protocol; the bug had appeared in 0.6.9.
Diffstat (limited to 'src/http/ngx_http_variables.c')
-rw-r--r--src/http/ngx_http_variables.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 16f092305..e014170a0 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -272,7 +272,7 @@ ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_uint_t flags)
}
v->name.len = name->len;
- v->name.data = ngx_palloc(cf->pool, name->len);
+ v->name.data = ngx_pnalloc(cf->pool, name->len);
if (v->name.data == NULL) {
return NULL;
}
@@ -339,7 +339,7 @@ ngx_http_get_variable_index(ngx_conf_t *cf, ngx_str_t *name)
}
v->name.len = name->len;
- v->name.data = ngx_palloc(cf->pool, name->len);
+ v->name.data = ngx_pnalloc(cf->pool, name->len);
if (v->name.data == NULL) {
return NGX_ERROR;
}
@@ -615,7 +615,7 @@ ngx_http_variable_headers(ngx_http_request_t *r, ngx_http_variable_value_t *v,
len += h[i]->value.len + sizeof("; ") - 1;
}
- p = ngx_palloc(r->pool, len);
+ p = ngx_pnalloc(r->pool, len);
if (p == NULL) {
return NGX_ERROR;
}
@@ -782,7 +782,7 @@ ngx_http_variable_remote_port(ngx_http_request_t *r,
v->no_cacheable = 0;
v->not_found = 0;
- v->data = ngx_palloc(r->pool, sizeof("65535") - 1);
+ v->data = ngx_pnalloc(r->pool, sizeof("65535") - 1);
if (v->data == NULL) {
return NGX_ERROR;
}
@@ -809,7 +809,7 @@ ngx_http_variable_server_addr(ngx_http_request_t *r,
{
ngx_str_t s;
- s.data = ngx_palloc(r->pool, INET_ADDRSTRLEN);
+ s.data = ngx_pnalloc(r->pool, INET_ADDRSTRLEN);
if (s.data == NULL) {
return NGX_ERROR;
}
@@ -1032,7 +1032,7 @@ ngx_http_variable_body_bytes_sent(ngx_http_request_t *r,
sent = 0;
}
- p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
+ p = ngx_pnalloc(r->pool, NGX_OFF_T_LEN);
if (p == NULL) {
return NGX_ERROR;
}
@@ -1083,7 +1083,7 @@ ngx_http_variable_sent_content_length(ngx_http_request_t *r,
}
if (r->headers_out.content_length_n >= 0) {
- p = ngx_palloc(r->pool, NGX_OFF_T_LEN);
+ p = ngx_pnalloc(r->pool, NGX_OFF_T_LEN);
if (p == NULL) {
return NGX_ERROR;
}
@@ -1120,7 +1120,7 @@ ngx_http_variable_sent_last_modified(ngx_http_request_t *r,
}
if (r->headers_out.last_modified_time >= 0) {
- p = ngx_palloc(r->pool,
+ p = ngx_pnalloc(r->pool,
sizeof("Last-Modified: Mon, 28 Sep 1970 06:00:00 GMT") - 1);
if (p == NULL) {
return NGX_ERROR;
@@ -1179,7 +1179,7 @@ ngx_http_variable_sent_keep_alive(ngx_http_request_t *r,
if (clcf->keepalive_header) {
- p = ngx_palloc(r->pool, sizeof("timeout=") - 1 + NGX_TIME_T_LEN);
+ p = ngx_pnalloc(r->pool, sizeof("timeout=") - 1 + NGX_TIME_T_LEN);
if (p == NULL) {
return NGX_ERROR;
}