Apache-Talk @lexa.ru 

Inet-Admins @info.east.ru 

Filmscanners @halftone.co.uk 

Security-alerts @yandex-team.ru 

nginx-ru @sysoev.ru 


   


   


   















      :: nginx-ru
Nginx-ru mailing list archive (nginx-ru@sysoev.ru)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: DAV + regex + alias


  • To: nginx-ru@xxxxxxxxx
  • Subject: Re: DAV + regex + alias
  • From: Vadim Lazovskiy <vadim.lazovskiy@xxxxxxxxx>
  • Date: Tue, 29 Apr 2014 09:51:27 +0400
  • Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=ls3ekWMoY1hJgZfhF+JnLuDrILyFlFeZ90rqQsXcv/U=; b=opVT/eyqX3jSNeJL4dUe/tgefI0zGehgXqxsKqDpo04IQIiZhQbR9XJ5KqbKMQHgc4 i35iLrVZKySraVKWITDP7wyj2uis6TTmnly8F4p+Qkx4jNf8k7SSg61uVuarxMPiKodL D2WZofiL8yBh8hBwQ74rvAPdjZORVur5MHcm1rFByQW8vKw5kEvxiY8H6dH0k8O5fq54 DN2IoQVQ6BREPrDzjREbjCb6LCQLzkfBMVzGiJsZnH4YOn/HaWiZMu2W71UOYAXg6mxF RUcGk+mEYcIU86YPnlQDYOT7i4Rc/Tdiuwji8I74a46lvvYEzH2yRPnz+8T1o7ws0f7X p/EA==
  • In-reply-to: <20140428183125.GN34696@mdounin.ru>
  • References: <CAL-L5YCaExnfdA_BMzaLG8udsurpW0id=kqsLXTrQhBYdD411g@mail.gmail.com> <20140428183125.GN34696@mdounin.ru>

, .
.
, mainline?


2014-04-28 22:31 GMT+04:00 Maxim Dounin <mdounin@xxxxxxxxxx>:
Hello!

On Mon, Apr 28, 2014 at 01:22:08PM +0400, Vadim Lazovskiy wrote:

> . ?

regex location + alias + limit_except/if.
, if
http://wiki.nginx.org/IfIsEvil.

, , - :

# HG changeset patch
# User Maxim Dounin <mdounin@xxxxxxxxxx>
# Date 1398709755 -14400
# Mon Apr 28 22:29:15 2014 +0400
# Node ID cf4f92f40290c9d3b8a8fb8cf836d3ebd16224f5
# Parent 539635cb8e98063b116555bdfd0c5ccfbfa8f184
Fixed alias in regex locations with limit_except/if.

The ngx_http_map_uri_to_path() function uses clcf->regex to detect if
it's working within a location given by a regular _expression_. Its
behaviour was incorrect due to clcf->regex being false in implicit locations
created by if and limit_except. Fix is to preserve clcf->regex within
implicit locations.

diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
--- a/src/http/modules/ngx_http_rewrite_module.c
+++ b/src/http/modules/ngx_http_rewrite_module.c
@@ -583,6 +583,7 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_
clcf = ctx->loc_conf[ngx_http_core_module.ctx_index];
clcf->loc_conf = ctx->loc_conf;
clcf->name = pclcf->name;
+ clcf->regex = pclcf->regex;
clcf->noname = 1;

if (ngx_http_add_location(cf, &pclcf->locations, clcf) != NGX_OK) {
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -4597,6 +4597,7 @@ ngx_http_core_limit_except(ngx_conf_t *c
pclcf->limit_except_loc_conf = ctx->loc_conf;
clcf->loc_conf = ctx->loc_conf;
clcf->name = pclcf->name;
+ clcf->regex = pclcf->regex;
clcf->noname = 1;
clcf->lmt_excpt = 1;



--
Maxim Dounin
http://nginx.org/

_______________________________________________
nginx-ru mailing list
nginx-ru@xxxxxxxxx
http://mailman.nginx.org/mailman/listinfo/nginx-ru



--
Best Regards,
Vadim Lazovskiy
_______________________________________________
nginx-ru mailing list
nginx-ru@xxxxxxxxx
http://mailman.nginx.org/mailman/listinfo/nginx-ru


 




Copyright © Lexa Software, 1996-2009.