Nginx-ru mailing list archive (nginx-ru@sysoev.ru)
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: captures in regex location
On Thu, Mar 05, 2009 at 01:59:35AM +0300, Vladimir Sopot wrote:
> Супер, спасибо.
>
> А можно такое же ещё и для server_name?
Новый патч с поддержкой server_name.
> On Mar 4, 2009, at 11:58 PM, Igor Sysoev wrote:
>
> >Патч для 0.7.39 для поддержки
> >
> >1) captures в regex location
> >2) alias'а внутри таких location'ов
> >
> > location ~* ^/files/(.+\.(?:gif|jpe?g|png))$ {
> >
> > alias /path/to/$1;
> > }
> >
> >3) captures становятся глобальными и могут использоваться наравне
> > с переменными:
> >
> > location ~* ^/files/(.+\.(?:gif|jpe?g|png))$ {
> >
> > error_page 404 /index.php?img=$1;
> > }
--
Игорь Сысоев
http://sysoev.ru
Index: src/http/ngx_http_request.c
===================================================================
--- src/http/ngx_http_request.c (revision 1866)
+++ src/http/ngx_http_request.c (working copy)
@@ -1653,12 +1653,34 @@
name.len = len;
name.data = server;
+ len = 0;
+
sn = vn->regex;
for (i = 0; i < vn->nregex; i++) {
- n = ngx_regex_exec(sn[i].regex, &name, NULL, 0);
+ if (sn[i].captures && r->captures == NULL) {
+ len = (NGX_HTTP_MAX_CAPTURES + 1) * 3 * sizeof(int);
+
+ r->captures = ngx_palloc(r->pool, len);
+ if (r->captures == NULL) {
+ return NGX_ERROR;
+ }
+
+ if (server == buf) {
+ server = ngx_pnalloc(r->pool, len);
+ if (server == NULL) {
+ return NGX_ERROR;
+ }
+
+ ngx_memcpy(server, buf, len);
+ name.data = server;
+ }
+ }
+
+ n = ngx_regex_exec(sn[i].regex, &name, r->captures, len);
+
if (n == NGX_REGEX_NO_MATCHED) {
continue;
}
@@ -1675,6 +1697,9 @@
cscf = sn[i].core_srv_conf;
+ r->ncaptures = len;
+ r->captures_data = server;
+
goto found;
}
}
Index: src/http/ngx_http_request.h
===================================================================
--- src/http/ngx_http_request.h (revision 1866)
+++ src/http/ngx_http_request.h (working copy)
@@ -10,6 +10,7 @@
#define NGX_HTTP_MAX_URI_CHANGES 10
#define NGX_HTTP_MAX_SUBREQUESTS 50
+#define NGX_HTTP_MAX_CAPTURES 9
/* must be 2^n */
#define NGX_HTTP_LC_HEADER_LEN 32
@@ -390,6 +391,12 @@
ngx_http_variable_value_t *variables;
+#if (NGX_PCRE)
+ ngx_uint_t ncaptures;
+ int *captures;
+ u_char *captures_data;
+#endif
+
size_t limit_rate;
/* used to learn the Apache compatible response length without a header */
Index: src/http/ngx_http_core_module.c
===================================================================
--- src/http/ngx_http_core_module.c (revision 1866)
+++ src/http/ngx_http_core_module.c (working copy)
@@ -1337,7 +1337,7 @@
ngx_int_t rc;
ngx_http_core_loc_conf_t *pclcf;
#if (NGX_PCRE)
- ngx_int_t n;
+ ngx_int_t n, len;
ngx_uint_t noregex;
ngx_http_core_loc_conf_t *clcf, **clcfp;
@@ -1371,13 +1371,25 @@
if (noregex == 0 && pclcf->regex_locations) {
+ len = 0;
+
for (clcfp = pclcf->regex_locations; *clcfp; clcfp++) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"test location: ~ \"%V\"", &(*clcfp)->name);
- n = ngx_regex_exec((*clcfp)->regex, &r->uri, NULL, 0);
+ if ((*clcfp)->captures && r->captures == NULL) {
+ len = (NGX_HTTP_MAX_CAPTURES + 1) * 3 * sizeof(int);
+
+ r->captures = ngx_palloc(r->pool, len);
+ if (r->captures == NULL) {
+ return NGX_ERROR;
+ }
+ }
+
+ n = ngx_regex_exec((*clcfp)->regex, &r->uri, r->captures, len);
+
if (n == NGX_REGEX_NO_MATCHED) {
continue;
}
@@ -1394,6 +1406,9 @@
r->loc_conf = (*clcfp)->loc_conf;
+ r->ncaptures = len;
+ r->captures_data = r->uri.data;
+
/* look up nested locations */
rc = ngx_http_core_find_location(r);
@@ -1686,6 +1701,11 @@
*root_length = path->len - reserved;
last = path->data + *root_length;
+
+ if (alias) {
+ *last = '\0';
+ return last;
+ }
}
last = ngx_cpystrn(last, r->uri.data + alias, r->uri.len - alias + 1);
@@ -2534,6 +2554,7 @@
}
clcf->name = *regex;
+ clcf->captures = (ngx_regex_capture_count(clcf->regex) > 0);
return NGX_OK;
@@ -2798,6 +2819,7 @@
#if (NGX_PCRE)
sn->regex = NULL;
+ sn->captures = 0;
#endif
sn->core_srv_conf = conf;
sn->name.len = conf->server_name.len;
@@ -3399,6 +3421,7 @@
#if (NGX_PCRE)
sn->regex = NULL;
+ sn->captures = 0;
#endif
sn->core_srv_conf = cscf;
sn->name = value[i];
@@ -3425,6 +3448,7 @@
return NGX_CONF_ERROR;
}
+ sn->captures = (ngx_regex_capture_count(sn->regex) > 0);
sn->name = value[i];
}
#else
@@ -3477,18 +3501,6 @@
return NGX_CONF_ERROR;
}
-#if (NGX_PCRE)
-
- if (lcf->regex && alias) {
- ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "the \"alias\" directive may not be used "
- "inside location given by regular expression");
-
- return NGX_CONF_ERROR;
- }
-
-#endif
-
value = cf->args->elts;
if (ngx_strstr(value[1].data, "$document_root")
@@ -3528,24 +3540,36 @@
n = ngx_http_script_variables_count(&lcf->root);
- if (n == 0) {
- return NGX_CONF_OK;
+ ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
+
+ if (n) {
+ sc.cf = cf;
+ sc.source = &lcf->root;
+ sc.lengths = &lcf->root_lengths;
+ sc.values = &lcf->root_values;
+ sc.variables = n;
+ sc.complete_lengths = 1;
+ sc.complete_values = 1;
+
+ if (ngx_http_script_compile(&sc) != NGX_OK) {
+ return NGX_CONF_ERROR;
+ }
}
- ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
+#if (NGX_PCRE)
- sc.cf = cf;
- sc.source = &lcf->root;
- sc.lengths = &lcf->root_lengths;
- sc.values = &lcf->root_values;
- sc.variables = n;
- sc.complete_lengths = 1;
- sc.complete_values = 1;
+ if (alias && lcf->regex
+ && (ngx_regex_capture_count(lcf->regex) <= 0 || sc.ncaptures == 0))
+ {
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+ "the \"alias\" directive must use captures "
+ "inside location given by regular expression");
- if (ngx_http_script_compile(&sc) != NGX_OK) {
return NGX_CONF_ERROR;
}
+#endif
+
return NGX_CONF_OK;
}
Index: src/http/ngx_http_core_module.h
===================================================================
--- src/http/ngx_http_core_module.h (revision 1866)
+++ src/http/ngx_http_core_module.h (working copy)
@@ -245,6 +245,7 @@
struct ngx_http_server_name_s {
#if (NGX_PCRE)
ngx_regex_t *regex;
+ ngx_uint_t captures; /* unsigned captures:1; */
#endif
ngx_http_core_srv_conf_t *core_srv_conf; /* virtual name server conf */
ngx_str_t name;
@@ -274,6 +275,8 @@
#if (NGX_PCRE)
ngx_regex_t *regex;
+
+ unsigned captures:1;
#endif
unsigned noname:1; /* "if () {}" block or limit_except */
Index: src/http/ngx_http_script.c
===================================================================
--- src/http/ngx_http_script.c (revision 1866)
+++ src/http/ngx_http_script.c (working copy)
@@ -40,7 +40,9 @@
ngx_uint_t i, n, bracket;
ngx_http_script_var_code_t *var_code;
ngx_http_script_copy_code_t *copy;
+#if (NGX_PCRE)
ngx_http_script_copy_capture_code_t *copy_capture;
+#endif
if (sc->flushes && *sc->flushes == NULL) {
n = sc->variables ? sc->variables : 1;
@@ -89,6 +91,10 @@
goto invalid_variable;
}
+#if (NGX_PCRE)
+
+ /* NGX_HTTP_MAX_CAPTURES is 9 */
+
if (sc->source->data[i] >= '1' && sc->source->data[i] <= '9') {
n = sc->source->data[i] - '0';
@@ -130,6 +136,8 @@
continue;
}
+#endif
+
if (sc->source->data[i] == '{') {
bracket = 1;
@@ -519,65 +527,6 @@
size_t
-ngx_http_script_copy_capture_len_code(ngx_http_script_engine_t *e)
-{
- ngx_http_script_copy_capture_code_t *code;
-
- code = (ngx_http_script_copy_capture_code_t *) e->ip;
-
- e->ip += sizeof(ngx_http_script_copy_capture_code_t);
-
- if (code->n < e->ncaptures) {
- if ((e->is_args || e->quote)
- && (e->request->quoted_uri || e->request->plus_in_uri))
- {
- return e->captures[code->n + 1] - e->captures[code->n]
- + 2 * ngx_escape_uri(NULL,
- &e->line.data[e->captures[code->n]],
- e->captures[code->n + 1] -
e->captures[code->n],
- NGX_ESCAPE_ARGS);
- } else {
- return e->captures[code->n + 1] - e->captures[code->n];
- }
- }
-
- return 0;
-}
-
-
-void
-ngx_http_script_copy_capture_code(ngx_http_script_engine_t *e)
-{
- u_char *p;
- ngx_http_script_copy_capture_code_t *code;
-
- code = (ngx_http_script_copy_capture_code_t *) e->ip;
-
- e->ip += sizeof(ngx_http_script_copy_capture_code_t);
-
- p = e->pos;
-
- if (code->n < e->ncaptures) {
- if ((e->is_args || e->quote)
- && (e->request->quoted_uri || e->request->plus_in_uri))
- {
- e->pos = (u_char *) ngx_escape_uri(p,
- &e->line.data[e->captures[code->n]],
- e->captures[code->n + 1] -
e->captures[code->n],
- NGX_ESCAPE_ARGS);
- } else {
- e->pos = ngx_copy(p,
- &e->line.data[e->captures[code->n]],
- e->captures[code->n + 1] - e->captures[code->n]);
- }
- }
-
- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0,
- "http script capture: \"%*s\"", e->pos - p, p);
-}
-
-
-size_t
ngx_http_script_mark_args_code(ngx_http_script_engine_t *e)
{
e->is_args = 1;
@@ -599,7 +548,6 @@
}
-
#if (NGX_PCRE)
void
@@ -628,8 +576,19 @@
e->line.data = e->sp->data;
}
- rc = ngx_regex_exec(code->regex, &e->line, e->captures, code->ncaptures);
+ if (code->ncaptures && r->captures == NULL) {
+ r->captures = ngx_palloc(r->pool,
+ (NGX_HTTP_MAX_CAPTURES + 1) * 3 *
sizeof(int));
+ if (r->captures == NULL) {
+ e->ip = ngx_http_script_exit;
+ e->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
+ return;
+ }
+ }
+
+ rc = ngx_regex_exec(code->regex, &e->line, r->captures, code->ncaptures);
+
if (rc == NGX_REGEX_NO_MATCHED) {
if (e->log || (r->connection->log->log_level & NGX_LOG_DEBUG_HTTP)) {
ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0,
@@ -637,7 +596,7 @@
&code->name, &e->line);
}
- e->ncaptures = 0;
+ r->ncaptures = 0;
if (code->test) {
if (code->negative_test) {
@@ -674,7 +633,8 @@
"\"%V\" matches \"%V\"", &code->name, &e->line);
}
- e->ncaptures = code->ncaptures;
+ r->ncaptures = code->ncaptures;
+ r->captures_data = e->line.data;
if (code->test) {
if (code->negative_test) {
@@ -725,7 +685,7 @@
}
for (n = 1; n < (ngx_uint_t) rc; n++) {
- e->buf.len += e->captures[2 * n + 1] - e->captures[2 * n];
+ e->buf.len += r->captures[2 * n + 1] - r->captures[2 * n];
}
} else {
@@ -734,8 +694,6 @@
le.ip = code->lengths->elts;
le.line = e->line;
le.request = r;
- le.captures = e->captures;
- le.ncaptures = e->ncaptures;
le.quote = code->redirect;
len = 0;
@@ -874,6 +832,84 @@
e->ip += sizeof(ngx_http_script_regex_end_code_t);
}
+
+size_t
+ngx_http_script_copy_capture_len_code(ngx_http_script_engine_t *e)
+{
+ int *cap;
+ u_char *p;
+ ngx_uint_t n;
+ ngx_http_request_t *r;
+ ngx_http_script_copy_capture_code_t *code;
+
+ r = e->request;
+
+ code = (ngx_http_script_copy_capture_code_t *) e->ip;
+
+ e->ip += sizeof(ngx_http_script_copy_capture_code_t);
+
+ n = code->n;
+
+ if (n < r->ncaptures) {
+
+ cap = r->captures;
+
+ if ((e->is_args || e->quote)
+ && (e->request->quoted_uri || e->request->plus_in_uri))
+ {
+ p = r->captures_data;
+
+ return cap[n + 1] - cap[n]
+ + 2 * ngx_escape_uri(NULL, &p[cap[n]], cap[n + 1] - cap[n],
+ NGX_ESCAPE_ARGS);
+ } else {
+ return cap[n + 1] - cap[n];
+ }
+ }
+
+ return 0;
+}
+
+
+void
+ngx_http_script_copy_capture_code(ngx_http_script_engine_t *e)
+{
+ int *cap;
+ u_char *p, *pos;
+ ngx_uint_t n;
+ ngx_http_request_t *r;
+ ngx_http_script_copy_capture_code_t *code;
+
+ r = e->request;
+
+ code = (ngx_http_script_copy_capture_code_t *) e->ip;
+
+ e->ip += sizeof(ngx_http_script_copy_capture_code_t);
+
+ n = code->n;
+
+ pos = e->pos;
+
+ if (n < r->ncaptures) {
+
+ cap = r->captures;
+ p = r->captures_data;
+
+ if ((e->is_args || e->quote)
+ && (e->request->quoted_uri || e->request->plus_in_uri))
+ {
+ e->pos = (u_char *) ngx_escape_uri(pos, &p[cap[n]],
+ cap[n + 1] - cap[n],
+ NGX_ESCAPE_ARGS);
+ } else {
+ e->pos = ngx_copy(pos, &p[cap[n]], cap[n + 1] - cap[n]);
+ }
+ }
+
+ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, e->request->connection->log, 0,
+ "http script capture: \"%*s\"", e->pos - pos, pos);
+}
+
#endif
@@ -1133,8 +1169,6 @@
le.ip = code->lengths->elts;
le.line = e->line;
le.request = e->request;
- le.captures = e->captures;
- le.ncaptures = e->ncaptures;
le.quote = e->quote;
for (len = 0; *(uintptr_t *) le.ip; len += lcode(&le)) {
Index: src/http/ngx_http_script.h
===================================================================
--- src/http/ngx_http_script.h (revision 1866)
+++ src/http/ngx_http_script.h (working copy)
@@ -30,9 +30,6 @@
unsigned is_args:1;
unsigned log:1;
- int *captures;
- ngx_uint_t ncaptures;
-
ngx_int_t status;
ngx_http_request_t *request;
} ngx_http_script_engine_t;
Index: src/http/modules/ngx_http_rewrite_module.c
===================================================================
--- src/http/modules/ngx_http_rewrite_module.c (revision 1866)
+++ src/http/modules/ngx_http_rewrite_module.c (working copy)
@@ -12,7 +12,6 @@
typedef struct {
ngx_array_t *codes; /* uintptr_t */
- ngx_uint_t captures;
ngx_uint_t stack_size;
ngx_flag_t log;
@@ -157,16 +156,6 @@
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
- if (rlcf->captures) {
- e->captures = ngx_palloc(r->pool, rlcf->captures * sizeof(int));
- if (e->captures == NULL) {
- return NGX_HTTP_INTERNAL_SERVER_ERROR;
- }
-
- } else {
- e->captures = NULL;
- }
-
e->ip = rlcf->codes->elts;
e->request = r;
e->quote = 1;
@@ -436,10 +425,6 @@
if (regex->ncaptures) {
regex->ncaptures = (regex->ncaptures + 1) * 3;
-
- if (lcf->captures < regex->ncaptures) {
- lcf->captures = regex->ncaptures;
- }
}
regex_end = ngx_http_script_add_code(lcf->codes,
@@ -618,11 +603,6 @@
}
- if (lcf->captures < nlcf->captures) {
- lcf->captures = nlcf->captures;
- }
-
-
if (elts != lcf->codes->elts) {
if_code = (ngx_http_script_if_code_t *)
((u_char *) if_code + ((u_char *) lcf->codes->elts - elts));
@@ -777,10 +757,6 @@
if (n) {
regex->ncaptures = (n + 1) * 3;
-
- if (lcf->captures < regex->ncaptures) {
- lcf->captures = regex->ncaptures;
- }
}
return NGX_CONF_OK;
|
