mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-25 06:37:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

captures support in location and alias

Browse Source
This commit is contained in:
Igor Sysoev 2009-03-06 12:49:22 +00:00
parent 1d05de49a3
commit 925baa0f95
2 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/http/ngx_http_core_module.c
View File

@ -1337,7 +1337,7 @@ ngx_http_core_find_location(ngx_http_request_t *r)
ngx_int_t rc; ngx_int_t rc;
ngx_http_core_loc_conf_t *pclcf; ngx_http_core_loc_conf_t *pclcf;
#if (NGX_PCRE) #if (NGX_PCRE)
ngx_int_t n; ngx_int_t n, len;
ngx_uint_t noregex; ngx_uint_t noregex;
ngx_http_core_loc_conf_t *clcf, **clcfp; ngx_http_core_loc_conf_t *clcf, **clcfp;
@ -1371,12 +1371,24 @@ ngx_http_core_find_location(ngx_http_request_t *r)
if (noregex == 0 && pclcf->regex_locations) { if (noregex == 0 && pclcf->regex_locations) {
len = 0;
for (clcfp = pclcf->regex_locations; *clcfp; clcfp++) { for (clcfp = pclcf->regex_locations; *clcfp; clcfp++) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"test location: ~ \"%V\"", &(*clcfp)->name); "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) { if (n == NGX_REGEX_NO_MATCHED) {
continue; continue;
@ -1394,6 +1406,9 @@ ngx_http_core_find_location(ngx_http_request_t *r)
r->loc_conf = (*clcfp)->loc_conf; r->loc_conf = (*clcfp)->loc_conf;
r->ncaptures = len;
r->captures_data = r->uri.data;
/* look up nested locations */ /* look up nested locations */
rc = ngx_http_core_find_location(r); rc = ngx_http_core_find_location(r);
@ -1686,6 +1701,11 @@ ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *path,
*root_length = path->len - reserved; *root_length = path->len - reserved;
last = path->data + *root_length; last = path->data + *root_length;
if (alias) {
*last = '\0';
return last;
}
} }
last = ngx_cpystrn(last, r->uri.data + alias, r->uri.len - alias + 1); last = ngx_cpystrn(last, r->uri.data + alias, r->uri.len - alias + 1);
@ -2534,6 +2554,7 @@ ngx_http_core_regex_location(ngx_conf_t *cf, ngx_http_core_loc_conf_t *clcf,
} }
clcf->name = *regex; clcf->name = *regex;
clcf->captures = (ngx_regex_capture_count(clcf->regex) > 0);
return NGX_OK; return NGX_OK;
@ -3477,18 +3498,6 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR; 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; value = cf->args->elts;
if (ngx_strstr(value[1].data, "$document_root") if (ngx_strstr(value[1].data, "$document_root")
@ -3528,24 +3537,36 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
n = ngx_http_script_variables_count(&lcf->root); n = ngx_http_script_variables_count(&lcf->root);
if (n == 0) {
return NGX_CONF_OK;
}
ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
sc.cf = cf; if (n) {
sc.source = &lcf->root; sc.cf = cf;
sc.lengths = &lcf->root_lengths; sc.source = &lcf->root;
sc.values = &lcf->root_values; sc.lengths = &lcf->root_lengths;
sc.variables = n; sc.values = &lcf->root_values;
sc.complete_lengths = 1; sc.variables = n;
sc.complete_values = 1; sc.complete_lengths = 1;
sc.complete_values = 1;
if (ngx_http_script_compile(&sc) != NGX_OK) {
return NGX_CONF_ERROR;
}
}
#if (NGX_PCRE)
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; return NGX_CONF_ERROR;
} }
#endif
return NGX_CONF_OK; return NGX_CONF_OK;
} }

2
src/http/ngx_http_core_module.h
View File

@ -274,6 +274,8 @@ struct ngx_http_core_loc_conf_s {
#if (NGX_PCRE) #if (NGX_PCRE)
ngx_regex_t *regex; ngx_regex_t *regex;
unsigned captures:1;
#endif #endif
unsigned noname:1; /* "if () {}" block or limit_except */ unsigned noname:1; /* "if () {}" block or limit_except */