ngx_str_set() and ngx_str_null()
diff --git a/src/http/modules/ngx_http_auth_basic_module.c b/src/http/modules/ngx_http_auth_basic_module.c
index c9ce694..a6b95fa 100644
--- a/src/http/modules/ngx_http_auth_basic_module.c
+++ b/src/http/modules/ngx_http_auth_basic_module.c
@@ -348,8 +348,7 @@
}
r->headers_out.www_authenticate->hash = 1;
- r->headers_out.www_authenticate->key.len = sizeof("WWW-Authenticate") - 1;
- r->headers_out.www_authenticate->key.data = (u_char *) "WWW-Authenticate";
+ ngx_str_set(&r->headers_out.www_authenticate->key, "WWW-Authenticate");
r->headers_out.www_authenticate->value = *realm;
return NGX_HTTP_UNAUTHORIZED;
@@ -425,9 +424,7 @@
u_char *basic, *p;
if (ngx_strcmp(realm->data, "off") == 0) {
- realm->len = 0;
- realm->data = (u_char *) "";
-
+ ngx_str_set(realm, "");
return NGX_CONF_OK;
}
diff --git a/src/http/modules/ngx_http_autoindex_module.c b/src/http/modules/ngx_http_autoindex_module.c
index 698b763..9dc4870 100644
--- a/src/http/modules/ngx_http_autoindex_module.c
+++ b/src/http/modules/ngx_http_autoindex_module.c
@@ -235,8 +235,7 @@
r->headers_out.status = NGX_HTTP_OK;
r->headers_out.content_type_len = sizeof("text/html") - 1;
- r->headers_out.content_type.len = sizeof("text/html") - 1;
- r->headers_out.content_type.data = (u_char *) "text/html";
+ ngx_str_set(&r->headers_out.content_type, "text/html");
rc = ngx_http_send_header(r);
diff --git a/src/http/modules/ngx_http_empty_gif_module.c b/src/http/modules/ngx_http_empty_gif_module.c
index e6515df..35c4415 100644
--- a/src/http/modules/ngx_http_empty_gif_module.c
+++ b/src/http/modules/ngx_http_empty_gif_module.c
@@ -123,8 +123,7 @@
}
r->headers_out.content_type_len = sizeof("image/gif") - 1;
- r->headers_out.content_type.len = sizeof("image/gif") - 1;
- r->headers_out.content_type.data = (u_char *) "image/gif";
+ ngx_str_set(&r->headers_out.content_type, "image/gif");
if (r->method == NGX_HTTP_HEAD) {
r->headers_out.status = NGX_HTTP_OK;
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 77b6d9d..162eca8 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -589,9 +589,7 @@
u = r->upstream;
- u->schema.len = sizeof("fastcgi://") - 1;
- u->schema.data = (u_char *) "fastcgi://";
-
+ ngx_str_set(&u->schema, "fastcgi://");
u->output.tag = (ngx_buf_tag_t) &ngx_http_fastcgi_module;
u->conf = &flcf->upstream;
@@ -1449,15 +1447,12 @@
} else if (u->headers_in.location) {
u->headers_in.status_n = 302;
- u->headers_in.status_line.len =
- sizeof("302 Moved Temporarily") - 1;
- u->headers_in.status_line.data =
- (u_char *) "302 Moved Temporarily";
+ ngx_str_set(&u->headers_in.status_line,
+ "302 Moved Temporarily");
} else {
u->headers_in.status_n = 200;
- u->headers_in.status_line.len = sizeof("200 OK") - 1;
- u->headers_in.status_line.data = (u_char *) "200 OK";
+ ngx_str_set(&u->headers_in.status_line, "200 OK");
}
if (u->state) {
@@ -1922,8 +1917,7 @@
* conf->upstream.store_lengths = NULL;
* conf->upstream.store_values = NULL;
*
- * conf->index.len = 0;
- * conf->index.data = NULL;
+ * conf->index.len = { 0, NULL };
*/
conf->upstream.store = NGX_CONF_UNSET;
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index 879971f..e2b204b 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -285,11 +285,8 @@
}
h->hash = 1;
- h->key.len = sizeof("Content-Encoding") - 1;
- h->key.data = (u_char *) "Content-Encoding";
- h->value.len = sizeof("gzip") - 1;
- h->value.data = (u_char *) "gzip";
-
+ ngx_str_set(&h->key, "Content-Encoding");
+ ngx_str_set(&h->value, "gzip");
r->headers_out.content_encoding = h;
r->main_filter_need_in_memory = 1;
diff --git a/src/http/modules/ngx_http_gzip_static_module.c b/src/http/modules/ngx_http_gzip_static_module.c
index 2098d8c..0c6dbbb 100644
--- a/src/http/modules/ngx_http_gzip_static_module.c
+++ b/src/http/modules/ngx_http_gzip_static_module.c
@@ -212,12 +212,10 @@
}
h->hash = 1;
- h->key.len = sizeof("Content-Encoding") - 1;
- h->key.data = (u_char *) "Content-Encoding";
- h->value.len = sizeof("gzip") - 1;
- h->value.data = (u_char *) "gzip";
-
+ ngx_str_set(&h->key, "Content-Encoding");
+ ngx_str_set(&h->value, "gzip");
r->headers_out.content_encoding = h;
+
r->ignore_content_encoding = 1;
/* we need to allocate all before the header would be sent */
diff --git a/src/http/modules/ngx_http_headers_filter_module.c b/src/http/modules/ngx_http_headers_filter_module.c
index fb6c005..1d40958 100644
--- a/src/http/modules/ngx_http_headers_filter_module.c
+++ b/src/http/modules/ngx_http_headers_filter_module.c
@@ -196,8 +196,7 @@
r->headers_out.expires = expires;
expires->hash = 1;
- expires->key.len = sizeof("Expires") - 1;
- expires->key.data = (u_char *) "Expires";
+ ngx_str_set(&expires->key, "Expires");
}
len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT");
@@ -225,9 +224,7 @@
}
cc->hash = 1;
- cc->key.len = sizeof("Cache-Control") - 1;
- cc->key.data = (u_char *) "Cache-Control";
-
+ ngx_str_set(&cc->key, "Cache-Control");
*ccp = cc;
} else {
@@ -240,20 +237,14 @@
if (conf->expires == NGX_HTTP_EXPIRES_EPOCH) {
expires->value.data = (u_char *) "Thu, 01 Jan 1970 00:00:01 GMT";
-
- cc->value.len = sizeof("no-cache") - 1;
- cc->value.data = (u_char *) "no-cache";
-
+ ngx_str_set(&cc->value, "no-cache");
return NGX_OK;
}
if (conf->expires == NGX_HTTP_EXPIRES_MAX) {
expires->value.data = (u_char *) "Thu, 31 Dec 2037 23:55:55 GMT";
-
/* 10 years */
- cc->value.len = sizeof("max-age=315360000") - 1;
- cc->value.data = (u_char *) "max-age=315360000";
-
+ ngx_str_set(&cc->value, "max-age=315360000");
return NGX_OK;
}
@@ -265,10 +256,7 @@
if (conf->expires_time == 0) {
ngx_memcpy(expires->value.data, ngx_cached_http_time.data,
ngx_cached_http_time.len + 1);
-
- cc->value.len = sizeof("max-age=0") - 1;
- cc->value.data = (u_char *) "max-age=0";
-
+ ngx_str_set(&cc->value, "max-age=0");
return NGX_OK;
}
@@ -292,9 +280,7 @@
ngx_http_time(expires->value.data, expires_time);
if (conf->expires_time < 0 || max_age < 0) {
- cc->value.len = sizeof("no-cache") - 1;
- cc->value.data = (u_char *) "no-cache";
-
+ ngx_str_set(&cc->value, "no-cache");
return NGX_OK;
}
@@ -361,8 +347,7 @@
}
cc->hash = 1;
- cc->key.len = sizeof("Cache-Control") - 1;
- cc->key.data = (u_char *) "Cache-Control";
+ ngx_str_set(&cc->key, "Cache-Control");
cc->value = *value;
*ccp = cc;
diff --git a/src/http/modules/ngx_http_image_filter_module.c b/src/http/modules/ngx_http_image_filter_module.c
index 6511317..b5f8425 100644
--- a/src/http/modules/ngx_http_image_filter_module.c
+++ b/src/http/modules/ngx_http_image_filter_module.c
@@ -529,8 +529,7 @@
ngx_http_clean_header(r);
r->headers_out.status = NGX_HTTP_OK;
- r->headers_out.content_type.len = sizeof("text/plain") - 1;
- r->headers_out.content_type.data = (u_char *) "text/plain";
+ ngx_str_set(&r->headers_out.content_type, "text/plain");
r->headers_out.content_type_lowcase = NULL;
if (ctx == NULL) {
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index 1796ee2..5f356c3 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -747,8 +747,7 @@
return NULL;
}
- fmt->name.len = sizeof("combined") - 1;
- fmt->name.data = (u_char *) "combined";
+ ngx_str_set(&fmt->name, "combined");
fmt->flushes = NULL;
@@ -922,8 +921,7 @@
}
} else {
- name.len = sizeof("combined") - 1;
- name.data = (u_char *) "combined";
+ ngx_str_set(&name, "combined");
lmcf->combined_used = 1;
}
diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c
index 090a285..607e319 100644
--- a/src/http/modules/ngx_http_memcached_module.c
+++ b/src/http/modules/ngx_http_memcached_module.c
@@ -189,9 +189,7 @@
u = r->upstream;
- u->schema.len = sizeof("memcached://") - 1;
- u->schema.data = (u_char *) "memcached://";
-
+ ngx_str_set(&u->schema, "memcached://");
u->output.tag = (ngx_buf_tag_t) &ngx_http_memcached_module;
mlcf = ngx_http_get_module_loc_conf(r, ngx_http_memcached_module);
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 7b2e077..1db2657 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -1568,10 +1568,8 @@
h->hash = ngx_hash(ngx_hash(ngx_hash(ngx_hash(
ngx_hash('s', 'e'), 'r'), 'v'), 'e'), 'r');
- h->key.len = sizeof("Server") - 1;
- h->key.data = (u_char *) "Server";
- h->value.len = 0;
- h->value.data = NULL;
+ ngx_str_set(&h->key, "Server");
+ ngx_str_null(&h->value);
h->lowcase_key = (u_char *) "server";
}
@@ -1583,10 +1581,8 @@
h->hash = ngx_hash(ngx_hash(ngx_hash('d', 'a'), 't'), 'e');
- h->key.len = sizeof("Date") - 1;
- h->key.data = (u_char *) "Date";
- h->value.len = 0;
- h->value.data = NULL;
+ ngx_str_set(&h->key, "Date");
+ ngx_str_null(&h->value);
h->lowcase_key = (u_char *) "date";
}
@@ -2222,8 +2218,7 @@
pr->replacement.text = conf->location;
} else {
- pr->replacement.text.len = 0;
- pr->replacement.text.data = NULL;
+ ngx_str_null(&pr->replacement.text);
}
}
}
@@ -2311,10 +2306,8 @@
return NGX_CONF_ERROR;
}
- s->key.len = sizeof("Content-Length") - 1;
- s->key.data = (u_char *) "Content-Length";
- s->value.len = sizeof("$proxy_internal_body_length") - 1;
- s->value.data = (u_char *) "$proxy_internal_body_length";
+ ngx_str_set(&s->key, "Content-Length");
+ ngx_str_set(&s->value, "$proxy_internal_body_length");
}
if (ngx_http_proxy_merge_headers(cf, conf, prev) != NGX_OK) {
@@ -2777,8 +2770,7 @@
pr->replacement.text = plcf->location;
} else {
- pr->replacement.text.len = 0;
- pr->replacement.text.data = NULL;
+ ngx_str_null(&pr->replacement.text);
}
return NGX_CONF_OK;
@@ -3038,12 +3030,10 @@
v->host_header = u->host;
if (u->default_port == 80) {
- v->port.len = sizeof("80") - 1;
- v->port.data = (u_char *) "80";
+ ngx_str_set(&v->port, "80");
} else {
- v->port.len = sizeof("443") - 1;
- v->port.data = (u_char *) "443";
+ ngx_str_set(&v->port, "443");
}
} else {
@@ -3055,10 +3045,8 @@
v->key_start.len += v->host_header.len;
} else {
- v->host_header.len = sizeof("localhost") - 1;
- v->host_header.data = (u_char *) "localhost";
- v->port.len = 0;
- v->port.data = (u_char *) "";
+ ngx_str_set(&v->host_header, "localhost");
+ ngx_str_null(&v->port);
v->key_start.len += sizeof("unix:") - 1 + u->host.len + 1;
}
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index bc28408..e112406 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -224,10 +224,8 @@
}
r->headers_out.accept_ranges->hash = 1;
- r->headers_out.accept_ranges->key.len = sizeof("Accept-Ranges") - 1;
- r->headers_out.accept_ranges->key.data = (u_char *) "Accept-Ranges";
- r->headers_out.accept_ranges->value.len = sizeof("bytes") - 1;
- r->headers_out.accept_ranges->value.data = (u_char *) "bytes";
+ ngx_str_set(&r->headers_out.accept_ranges->key, "Accept-Ranges");
+ ngx_str_set(&r->headers_out.accept_ranges->value, "bytes");
return ngx_http_next_header_filter(r);
}
@@ -355,8 +353,7 @@
r->headers_out.content_range = content_range;
content_range->hash = 1;
- content_range->key.len = sizeof("Content-Range") - 1;
- content_range->key.data = (u_char *) "Content-Range";
+ ngx_str_set(&content_range->key, "Content-Range");
content_range->value.data = ngx_pnalloc(r->pool,
sizeof("bytes -/") - 1 + 3 * NGX_OFF_T_LEN);
@@ -520,8 +517,7 @@
r->headers_out.content_range = content_range;
content_range->hash = 1;
- content_range->key.len = sizeof("Content-Range") - 1;
- content_range->key.data = (u_char *) "Content-Range";
+ ngx_str_set(&content_range->key, "Content-Range");
content_range->value.data = ngx_pnalloc(r->pool,
sizeof("bytes */") - 1 + NGX_OFF_T_LEN);
diff --git a/src/http/modules/ngx_http_referer_module.c b/src/http/modules/ngx_http_referer_module.c
index 78cc7f4..8530084 100644
--- a/src/http/modules/ngx_http_referer_module.c
+++ b/src/http/modules/ngx_http_referer_module.c
@@ -363,8 +363,7 @@
ngx_http_server_name_t *sn;
ngx_http_core_srv_conf_t *cscf;
- name.len = sizeof("invalid_referer") - 1;
- name.data = (u_char *) "invalid_referer";
+ ngx_str_set(&name, "invalid_referer");
var = ngx_http_add_variable(cf, &name,
NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOHASH);
@@ -407,8 +406,7 @@
continue;
}
- uri.len = 0;
- uri.data = NULL;
+ ngx_str_null(&uri);
if (ngx_strcmp(value[i].data, "server_names") == 0) {
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index 7a2beed..b994711 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -346,13 +346,9 @@
ctx->params.nalloc = NGX_HTTP_SSI_PARAMS_N;
ctx->params.pool = r->pool;
- ctx->timefmt.len = sizeof("%A, %d-%b-%Y %H:%M:%S %Z") - 1;
- ctx->timefmt.data = (u_char *) "%A, %d-%b-%Y %H:%M:%S %Z";
-
- ctx->errmsg.len =
- sizeof("[an error occurred while processing the directive]") - 1;
- ctx->errmsg.data = (u_char *)
- "[an error occurred while processing the directive]";
+ ngx_str_set(&ctx->timefmt, "%A, %d-%b-%Y %H:%M:%S %Z");
+ ngx_str_set(&ctx->errmsg,
+ "[an error occurred while processing the directive]");
r->filter_need_in_memory = 1;
@@ -1904,8 +1900,7 @@
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"ssi include: \"%V\"", uri);
- args.len = 0;
- args.data = NULL;
+ ngx_str_null(&args);
flags = NGX_HTTP_LOG_UNSAFE;
if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) {
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index 3fe0d43..ee6cc6f 100644
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -314,8 +314,7 @@
* sscf->dhparam = { 0, NULL };
* sscf->client_certificate = { 0, NULL };
* sscf->crl = { 0, NULL };
- * sscf->ciphers.len = 0;
- * sscf->ciphers.data = NULL;
+ * sscf->ciphers = { 0, NULL };
* sscf->shm_zone = NULL;
*/
diff --git a/src/http/modules/ngx_http_stub_status_module.c b/src/http/modules/ngx_http_stub_status_module.c
index 9d2d074..4b74eb8 100644
--- a/src/http/modules/ngx_http_stub_status_module.c
+++ b/src/http/modules/ngx_http_stub_status_module.c
@@ -75,8 +75,7 @@
return rc;
}
- r->headers_out.content_type.len = sizeof("text/plain") - 1;
- r->headers_out.content_type.data = (u_char *) "text/plain";
+ ngx_str_set(&r->headers_out.content_type, "text/plain");
if (r->method == NGX_HTTP_HEAD) {
r->headers_out.status = NGX_HTTP_OK;
diff --git a/src/http/modules/ngx_http_userid_filter_module.c b/src/http/modules/ngx_http_userid_filter_module.c
index 2a5dbb7..03efd3a 100644
--- a/src/http/modules/ngx_http_userid_filter_module.c
+++ b/src/http/modules/ngx_http_userid_filter_module.c
@@ -493,8 +493,7 @@
}
set_cookie->hash = 1;
- set_cookie->key.len = sizeof("Set-Cookie") - 1;
- set_cookie->key.data = (u_char *) "Set-Cookie";
+ ngx_str_set(&set_cookie->key, "Set-Cookie");
set_cookie->value.len = p - cookie;
set_cookie->value.data = cookie;
@@ -511,8 +510,7 @@
}
p3p->hash = 1;
- p3p->key.len = sizeof("P3P") - 1;
- p3p->key.data = (u_char *) "P3P";
+ ngx_str_set(&p3p->key, "P3P");
p3p->value = conf->p3p;
return NGX_OK;
@@ -576,14 +574,10 @@
/*
* set by ngx_pcalloc():
*
- * conf->name.len = 0;
- * conf->name.date = NULL;
- * conf->domain.len = 0;
- * conf->domain.date = NULL;
- * conf->path.len = 0;
- * conf->path.date = NULL;
- * conf->p3p.len = 0;
- * conf->p3p.date = NULL;
+ * conf->name = { 0, NULL };
+ * conf->domain = { 0, NULL };
+ * conf->path = { 0, NULL };
+ * conf->p3p = { 0, NULL };
*/
conf->enable = NGX_CONF_UNSET_UINT;
@@ -642,9 +636,7 @@
u_char *p, *new;
if (ngx_strcmp(domain->data, "none") == 0) {
- domain->len = 0;
- domain->data = (u_char *) "";
-
+ ngx_str_set(domain, "");
return NGX_CONF_OK;
}
@@ -727,8 +719,7 @@
ngx_str_t *p3p = data;
if (ngx_strcmp(p3p->data, "none") == 0) {
- p3p->len = 0;
- p3p->data = (u_char *) "";
+ ngx_str_set(p3p, "");
}
return NGX_CONF_OK;
diff --git a/src/http/modules/ngx_http_xslt_filter_module.c b/src/http/modules/ngx_http_xslt_filter_module.c
index bb11afa..a06b26c 100644
--- a/src/http/modules/ngx_http_xslt_filter_module.c
+++ b/src/http/modules/ngx_http_xslt_filter_module.c
@@ -837,8 +837,7 @@
} else if (doc_type == XML_HTML_DOCUMENT_NODE) {
r->headers_out.content_type_len = sizeof("text/html") - 1;
- r->headers_out.content_type.len = sizeof("text/html") - 1;
- r->headers_out.content_type.data = (u_char *) "text/html";
+ ngx_str_set(&r->headers_out.content_type, "text/html");
}
r->headers_out.content_type_lowcase = NULL;
diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c
index e1388f1..5096b50 100644
--- a/src/http/modules/perl/ngx_http_perl_module.c
+++ b/src/http/modules/perl/ngx_http_perl_module.c
@@ -481,8 +481,7 @@
return NGX_CONF_ERROR;
}
- m->len = sizeof(NGX_PERL_MODULES) - 1;
- m->data = NGX_PERL_MODULES;
+ ngx_str_set(m, NGX_PERL_MODULES);
}
#endif
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 29ff64c..23e9388 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1685,8 +1685,7 @@
{
ngx_int_t i;
- r->exten.len = 0;
- r->exten.data = NULL;
+ ngx_str_null(&r->exten);
for (i = r->uri.len - 1; i > 1; i--) {
if (r->uri.data[i] == '.' && r->uri.data[i - 1] != '/') {
@@ -2187,8 +2186,7 @@
r->args = *args;
} else {
- r->args.len = 0;
- r->args.data = NULL;
+ ngx_str_null(&r->args);
}
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -3032,8 +3030,7 @@
conf->root_values = prev->root_values;
if (prev->root.data == NULL) {
- conf->root.len = sizeof("html") - 1;
- conf->root.data = (u_char *) "html";
+ ngx_str_set(&conf->root, "html");
if (ngx_conf_full_name(cf->cycle, &conf->root, 0) != NGX_OK) {
return NGX_CONF_ERROR;
@@ -3891,8 +3888,7 @@
return NGX_CONF_ERROR;
}
- args.len = 0;
- args.data = NULL;
+ ngx_str_null(&args);
if (cv.lengths == NULL && uri.data[0] == '/') {
p = (u_char *) ngx_strchr(uri.data, '?');
diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index 4f40236..c62d723 100644
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -218,8 +218,7 @@
if (status == NGX_HTTP_NO_CONTENT) {
r->header_only = 1;
- r->headers_out.content_type.len = 0;
- r->headers_out.content_type.data = NULL;
+ ngx_str_null(&r->headers_out.content_type);
r->headers_out.last_modified_time = -1;
r->headers_out.last_modified = NULL;
r->headers_out.content_length = NULL;
@@ -371,8 +370,7 @@
}
} else {
- host.len = 0;
- host.data = NULL;
+ ngx_str_null(&host);
port = 0;
}
@@ -539,8 +537,7 @@
r->headers_out.location->value.len = b->last - p;
r->headers_out.location->value.data = p;
- r->headers_out.location->key.len = sizeof("Location") - 1;
- r->headers_out.location->key.data = (u_char *) "Location";
+ ngx_str_set(&r->headers_out.location->key, "Location");
*b->last++ = CR; *b->last++ = LF;
}
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index aa03df0..5ccce00 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -1008,8 +1008,7 @@
}
r->headers_out.location->hash = 1;
- r->headers_out.location->key.len = sizeof("Location") - 1;
- r->headers_out.location->key.data = (u_char *) "Location";
+ ngx_str_set(&r->headers_out.location->key, "Location");
r->headers_out.location->value = e->buf;
e->ip += sizeof(ngx_http_script_regex_end_code_t);
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index 060cc99..5c032f3 100644
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -553,8 +553,7 @@
r->err_status = NGX_HTTP_MOVED_TEMPORARILY;
location->hash = 1;
- location->key.len = sizeof("Location") - 1;
- location->key.data = (u_char *) "Location";
+ ngx_str_set(&location->key, "Location");
location->value = uri;
r->headers_out.location = location;
@@ -608,8 +607,7 @@
}
r->headers_out.content_type_len = sizeof("text/html") - 1;
- r->headers_out.content_type.len = sizeof("text/html") - 1;
- r->headers_out.content_type.data = (u_char *) "text/html";
+ ngx_str_set(&r->headers_out.content_type, "text/html");
r->headers_out.content_type_lowcase = NULL;
} else {
@@ -711,8 +709,7 @@
r->err_status = NGX_HTTP_OK;
r->headers_out.content_type_len = sizeof("text/html") - 1;
- r->headers_out.content_type.len = sizeof("text/html") - 1;
- r->headers_out.content_type.data = (u_char *) "text/html";
+ ngx_str_set(&r->headers_out.content_type, "text/html");
r->headers_out.content_type_lowcase = NULL;
r->headers_out.location->hash = 0;
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 522a605..e6bef3c 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1800,8 +1800,7 @@
}
uri = &u->headers_in.x_accel_redirect->value;
- args.len = 0;
- args.data = NULL;
+ ngx_str_null(&args);
flags = NGX_HTTP_LOG_UNSAFE;
if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) {
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index c8d1c8d..0bba281 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -1390,8 +1390,7 @@
return NGX_OK;
}
- name.len = sizeof("sent_http_location") - 1;
- name.data = (u_char *) "sent_http_location";
+ ngx_str_set(&name, "sent_http_location");
return ngx_http_variable_unknown_header(v, &name,
&r->headers_out.headers.part,
