comparison src/http/ngx_http_variables.h @ 578:f3a9e57d2e17

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Mar 2010 21:27:17 +0300
parents 43e02819c5cf
children 566e105a89f1
comparison
equal deleted inserted replaced
539:5f4de8cf0d9d 578:f3a9e57d2e17
57 57
58 58
59 #define ngx_http_clear_variable(r, index) r->variables0[index].text.data = NULL; 59 #define ngx_http_clear_variable(r, index) r->variables0[index].text.data = NULL;
60 60
61 61
62 #if (NGX_PCRE)
63
64 typedef struct {
65 ngx_uint_t capture;
66 ngx_int_t index;
67 } ngx_http_regex_variable_t;
68
69
70 typedef struct {
71 ngx_regex_t *regex;
72 ngx_uint_t ncaptures;
73 ngx_http_regex_variable_t *variables;
74 ngx_uint_t nvariables;
75 ngx_str_t name;
76 } ngx_http_regex_t;
77
78
79 ngx_http_regex_t *ngx_http_regex_compile(ngx_conf_t *cf,
80 ngx_regex_compile_t *rc);
81 ngx_int_t ngx_http_regex_exec(ngx_http_request_t *r, ngx_http_regex_t *re,
82 ngx_str_t *s);
83
84 #endif
85
86
62 ngx_int_t ngx_http_variables_add_core_vars(ngx_conf_t *cf); 87 ngx_int_t ngx_http_variables_add_core_vars(ngx_conf_t *cf);
63 ngx_int_t ngx_http_variables_init_vars(ngx_conf_t *cf); 88 ngx_int_t ngx_http_variables_init_vars(ngx_conf_t *cf);
64 89
65 90
66 typedef struct { 91 typedef struct {