nginx-mail: src/http/ngx_http_variables.c comparison

comparison src/http/ngx_http_variables.c @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Mon, 25 Apr 2011 04:22:17 +0400
parents	8214eaef3530
children

comparison

equal deleted inserted replaced

-:06419a2298a9
+:0b460e61bdcd
 static ngx_int_t ngx_http_variable_request(ngx_http_request_t *r,
 ngx_http_variable_value_t *v, uintptr_t data);
 static void ngx_http_variable_request_set(ngx_http_request_t *r,
+ngx_http_variable_value_t *v, uintptr_t data);
+static ngx_int_t ngx_http_variable_request_get_size(ngx_http_request_t *r,
 ngx_http_variable_value_t *v, uintptr_t data);
 static void ngx_http_variable_request_set_size(ngx_http_request_t *r,
 ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_header(ngx_http_request_t *r,
 ngx_http_variable_value_t *v, uintptr_t data);
 NGX_HTTP_VAR_NOCACHEABLE, 0 },
 { ngx_string("server_name"), NULL, ngx_http_variable_server_name, 0, 0, 0 },
 { ngx_string("request_method"), NULL,
-ngx_http_variable_request_method, 0, 0, 0 },
+ngx_http_variable_request_method, 0,
+NGX_HTTP_VAR_NOCACHEABLE, 0 },
 { ngx_string("remote_user"), NULL, ngx_http_variable_remote_user, 0, 0, 0 },
 { ngx_string("body_bytes_sent"), NULL, ngx_http_variable_body_bytes_sent,
 0, 0, 0 },
 { ngx_string("sent_http_cache_control"), NULL, ngx_http_variable_headers,
 offsetof(ngx_http_request_t, headers_out.cache_control), 0, 0 },
 { ngx_string("limit_rate"), ngx_http_variable_request_set_size,
-ngx_http_variable_request,
+ngx_http_variable_request_get_size,
 offsetof(ngx_http_request_t, limit_rate),
 NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
 { ngx_string("nginx_version"), NULL, ngx_http_variable_nginx_version,
 0, 0, 0 },
 return ngx_http_get_indexed_variable(r, index);
 }
 ngx_http_variable_value_t *
-ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key,
+ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key)
-ngx_uint_t nowarn)
 {
 ngx_http_variable_t        *v;
 ngx_http_variable_value_t  *vv;
 ngx_http_core_main_conf_t  *cmcf;
 v = ngx_hash_find(&cmcf->variables_hash, key, name->data, name->len);
 if (v) {
 if (v->flags & NGX_HTTP_VAR_INDEXED) {
-return ngx_http_get_indexed_variable(r, v->index);
+return ngx_http_get_flushed_variable(r, v->index);
 } else {
 vv = ngx_palloc(r->pool, sizeof(ngx_http_variable_value_t));
 }
 return NULL;
 }
-if (ngx_strncmp(name->data, "upstream_http_", 10) == 0) {
+if (ngx_strncmp(name->data, "upstream_http_", 14) == 0) {
 if (ngx_http_upstream_header_variable(r, vv, (uintptr_t) name)
 == NGX_OK)
 {
 return vv;
 return NULL;
 }
 vv->not_found = 1;
-if (nowarn == 0) {
-ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-"unknown \"%V\" variable", name);
-}
 return vv;
 }
 s->len = v->len;
 s->data = v->data;
 }
+static ngx_int_t
+ngx_http_variable_request_get_size(ngx_http_request_t *r,
+ngx_http_variable_value_t *v, uintptr_t data)
+{
+size_t  *sp;
+sp = (size_t *) ((char *) r + data);
+v->data = ngx_pnalloc(r->pool, NGX_SIZE_T_LEN);
+if (v->data == NULL) {
+return NGX_ERROR;
+}
+v->len = ngx_sprintf(v->data, "%uz", *sp) - v->data;
+v->valid = 1;
+v->no_cacheable = 0;
+v->not_found = 0;
+return NGX_OK;
+}
 static void
 ngx_http_variable_request_set_size(ngx_http_request_t *r,
 ngx_http_variable_value_t *v, uintptr_t data)
 {
 ssize_t    s, *sp;
 v->len = sizeof(struct in6_addr);
 v->valid = 1;
 v->no_cacheable = 0;
 v->not_found = 0;
-v->data = (u_char *) &sin6->sin6_addr;
+v->data = sin6->sin6_addr.s6_addr;
 break;
 #endif
 default: /* AF_INET */
 v->data = r->headers_out.location->value.data;
 return NGX_OK;
 }
-name.len = sizeof("sent_http_location") - 1;
+ngx_str_set(&name, "sent_http_location");
-name.data = (u_char *) "sent_http_location";
 return ngx_http_variable_unknown_header(v, &name,
 &r->headers_out.headers.part,
 sizeof("sent_http_") - 1);
 }
 v->not_found = 0;
 v->data = p;
 return NGX_OK;
 }
+void *
+ngx_http_map_find(ngx_http_request_t *r, ngx_http_map_t *map, ngx_uint_t key,
+u_char *text, size_t len, ngx_str_t *match)
+{
+void  *p;
+p = ngx_hash_find_combined(&map->hash, key, text, len);
+if (p) {
+return p;
+}
+#if (NGX_PCRE)
+if (len && map->nregex) {
+ngx_int_t              n;
+ngx_uint_t             i;
+ngx_http_map_regex_t  *reg;
+reg = map->regex;
+for (i = 0; i < map->nregex; i++) {
+n = ngx_http_regex_exec(r, reg[i].regex, match);
+if (n == NGX_OK) {
+return reg[i].value;
+}
+if (n == NGX_DECLINED) {
+continue;
+}
+/* NGX_ERROR */
+return NULL;
+}
+}
+#endif
+return NULL;
+}
+#if (NGX_PCRE)
+static ngx_int_t
+ngx_http_variable_not_found(ngx_http_request_t *r, ngx_http_variable_value_t *v,
+uintptr_t data)
+{
+v->not_found = 1;
+return NGX_OK;
+}
+ngx_http_regex_t *
+ngx_http_regex_compile(ngx_conf_t *cf, ngx_regex_compile_t *rc)
+{
+u_char                     *p;
+size_t                      size;
+ngx_str_t                   name;
+ngx_uint_t                  i, n;
+ngx_http_variable_t        *v;
+ngx_http_regex_t           *re;
+ngx_http_regex_variable_t  *rv;
+ngx_http_core_main_conf_t  *cmcf;
+rc->pool = cf->pool;
+if (ngx_regex_compile(rc) != NGX_OK) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc->err);
+return NULL;
+}
+re = ngx_pcalloc(cf->pool, sizeof(ngx_http_regex_t));
+if (re == NULL) {
+return NULL;
+}
+re->regex = rc->regex;
+re->ncaptures = rc->captures;
+cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+cmcf->ncaptures = ngx_max(cmcf->ncaptures, re->ncaptures);
+n = (ngx_uint_t) rc->named_captures;
+if (n == 0) {
+return re;
+}
+rv = ngx_palloc(rc->pool, n * sizeof(ngx_http_regex_variable_t));
+if (rv == NULL) {
+return NULL;
+}
+re->variables = rv;
+re->nvariables = n;
+re->name = rc->pattern;
+size = rc->name_size;
+p = rc->names;
+for (i = 0; i < n; i++) {
+rv[i].capture = 2 * ((p[0] << 8) + p[1]);
+name.data = &p[2];
+name.len = ngx_strlen(name.data);
+v = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE);
+if (v == NULL) {
+return NULL;
+}
+rv[i].index = ngx_http_get_variable_index(cf, &name);
+if (rv[i].index == NGX_ERROR) {
+return NULL;
+}
+v->get_handler = ngx_http_variable_not_found;
+p += size;
+}
+return re;
+}
+ngx_int_t
+ngx_http_regex_exec(ngx_http_request_t *r, ngx_http_regex_t *re, ngx_str_t *s)
+{
+ngx_int_t                   rc, index;
+ngx_uint_t                  i, n, len;
+ngx_http_variable_value_t  *vv;
+ngx_http_core_main_conf_t  *cmcf;
+cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+if (re->ncaptures) {
+len = cmcf->ncaptures;
+if (r->captures == NULL) {
+r->captures = ngx_palloc(r->pool, len * sizeof(int));
+if (r->captures == NULL) {
+return NGX_ERROR;
+}
+}
+} else {
+len = 0;
+}
+rc = ngx_regex_exec(re->regex, s, r->captures, len);
+if (rc == NGX_REGEX_NO_MATCHED) {
+return NGX_DECLINED;
+}
+if (rc < 0) {
+ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+ngx_regex_exec_n " failed: %i on \"%V\" using \"%V\"",
+rc, s, &re->name);
+return NGX_ERROR;
+}
+for (i = 0; i < re->nvariables; i++) {
+n = re->variables[i].capture;
+index = re->variables[i].index;
+vv = &r->variables[index];
+vv->len = r->captures[n + 1] - r->captures[n];
+vv->valid = 1;
+vv->no_cacheable = 0;
+vv->not_found = 0;
+vv->data = &s->data[r->captures[n]];
+#if (NGX_DEBUG)
+{
+ngx_http_variable_t  *v;
+v = cmcf->variables.elts;
+ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+"http regex set $%V to \"%*s\"",
+&v[index].name, vv->len, vv->data);
+}
+#endif
+}
+r->ncaptures = rc * 2;
+r->captures_data = s->data;
+return NGX_OK;
+}
+#endif
 ngx_int_t
 ngx_http_variables_add_core_vars(ngx_conf_t *cf)
 {
 }
 if (ngx_strncmp(v[i].name.data, "arg_", 4) == 0) {
 v[i].get_handler = ngx_http_variable_argument;
 v[i].data = (uintptr_t) &v[i].name;
+v[i].flags = NGX_HTTP_VAR_NOCACHEABLE;
 continue;
 }
 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
 cmcf->variables_keys = NULL;
 return NGX_OK;
 }
-void
-ngx_http_variable_value_rbtree_insert(ngx_rbtree_node_t *temp,
-ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel)
-{
-ngx_rbtree_node_t               **p;
-ngx_http_variable_value_node_t   *vvn, *vvt;
-for ( ;; ) {
-vvn = (ngx_http_variable_value_node_t *) node;
-vvt = (ngx_http_variable_value_node_t *) temp;
-if (node->key != temp->key) {
-p = (node->key < temp->key) ? &temp->left : &temp->right;
-} else if (vvn->len != vvt->len) {
-p = (vvn->len < vvt->len) ? &temp->left : &temp->right;
-} else {
-p = (ngx_memcmp(vvn->value->data, vvt->value->data, vvn->len) < 0)
-? &temp->left : &temp->right;
-}
-if (*p == sentinel) {
-break;
-}
-temp = *p;
-}
-*p = node;
-node->parent = temp;
-node->left = sentinel;
-node->right = sentinel;
-ngx_rbt_red(node);
-}
-ngx_http_variable_value_t *
-ngx_http_variable_value_lookup(ngx_rbtree_t *rbtree, ngx_str_t *val,
-uint32_t hash)
-{
-ngx_int_t                        rc;
-ngx_rbtree_node_t               *node, *sentinel;
-ngx_http_variable_value_node_t  *vvn;
-node = rbtree->root;
-sentinel = rbtree->sentinel;
-while (node != sentinel) {
-vvn = (ngx_http_variable_value_node_t *) node;
-if (hash != node->key) {
-node = (hash < node->key) ? node->left : node->right;
-continue;
-}
-if (val->len != vvn->len) {
-node = (val->len < vvn->len) ? node->left : node->right;
-continue;
-}
-rc = ngx_memcmp(val->data, vvn->value->data, val->len);
-if (rc < 0) {
-node = node->left;
-continue;
-}
-if (rc > 0) {
-node = node->right;
-continue;
-}
-return vvn->value;
-}
-return NULL;
-}

Mercurial > hg > nginx-mail

comparison src/http/ngx_http_variables.c @ 665:0b460e61bdcd default tip