Skip to content

Commit ea7e337

Browse files
committed
Fix rewrite variable name collision
1 parent 2df2160 commit ea7e337

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

templates/http/modules.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,10 @@ real_ip_recursive {{ realip['real_ip_recursive'] | ternary('on', 'off') }};
279279
return {{ rewrite['return'] if (rewrite['return'] is string or rewrite['return'] is number) }}{{ rewrite['return']['code'] if rewrite['return']['code'] is defined }}{{ (' ' + rewrite['return']['text'] | string) if rewrite['return']['text'] is defined }}{{ (' ' + rewrite['return']['url'] | string) if rewrite['return']['url'] is defined }};
280280
{% endif %}
281281
{% if rewrite['rewrites'] is defined %}{# 'rewrite' directive is not available in the 'http' context #}
282-
{% for rewrite in rewrite['rewrites'] if rewrite['rewrites'] is not mapping %}
283-
rewrite {{ rewrite['regex'] }} {{ rewrite['replacement'] }}{{ (' ' + rewrite['flag'] | string) if rewrite['flag'] is defined and rewrite['flag'] in ['last', 'break', 'redirect', 'permanent'] }};
282+
{% for rewrite_item in rewrite['rewrites'] if rewrite['rewrites'] is not mapping %}
283+
rewrite {{ rewrite_item['regex'] }} {{ rewrite_item['replacement'] }}{{ (' ' + rewrite_item['flag'] | string) if rewrite_item['flag'] is defined and rewrite_item['flag'] in ['last', 'break', 'redirect', 'permanent'] }};
284284
{% else %}
285-
rewrite {{ rewrite['rewrites']['regex'] }} {{ rewrite['rewrites']['replacement'] }}{{ (' ' + rewrite['rewrites']['flag'] | string) if rewrite['rewrites']['flag'] is defined and rewrite['rewrites']['flag'] in ['last', 'break', 'redirect', 'permanent'] }};
285+
rewrite {{ rewrite_item['rewrites']['regex'] }} {{ rewrite_item['rewrites']['replacement'] }}{{ (' ' + rewrite_item['rewrites']['flag'] | string) if rewrite_item['rewrites']['flag'] is defined and rewrite_item['rewrites']['flag'] in ['last', 'break', 'redirect', 'permanent'] }};
286286
{% endfor %}
287287
{% endif %}
288288
{% if rewrite['log'] is defined and rewrite['log'] is boolean %}

0 commit comments

Comments
 (0)