Mercurial > hg > nginx-quic
view src/core/ngx_syslog.h @ 6227:bd55d75a1410
Fixed wrong URI after try_files in nested location (ticket #97).
The following configuration with alias, nested location and try_files
resulted in wrong file being used. Request "/foo/test.gif" tried to
use "/tmp//foo/test.gif" instead of "/tmp/test.gif":
location /foo/ {
alias /tmp/;
location ~ gif {
try_files $uri =405;
}
}
Additionally, rev. c985d90a8d1f introduced a regression if
the "/tmp//foo/test.gif" file was found (ticket #768). Resulting URI
was set to "gif?/foo/test.gif", as the code used clcf->name of current
location ("location ~ gif") instead of parent one ("location /foo/").
Fix is to use r->uri instead of clcf->name in all cases in the
ngx_http_core_try_files_phase() function. It is expected to be
already matched and identical to the clcf->name of the right
location.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sun, 16 Aug 2015 10:51:34 +0300 |
parents | 2cb5275bf5e7 |
children | a6a2016b8e31 |
line wrap: on
line source
/* * Copyright (C) Nginx, Inc. */ #ifndef _NGX_SYSLOG_H_INCLUDED_ #define _NGX_SYSLOG_H_INCLUDED_ typedef struct { ngx_pool_t *pool; ngx_uint_t facility; ngx_uint_t severity; ngx_str_t tag; ngx_addr_t server; ngx_connection_t conn; ngx_uint_t busy; /* unsigned busy:1; */ } ngx_syslog_peer_t; char *ngx_syslog_process_conf(ngx_conf_t *cf, ngx_syslog_peer_t *peer); u_char *ngx_syslog_add_header(ngx_syslog_peer_t *peer, u_char *buf); void ngx_syslog_writer(ngx_log_t *log, ngx_uint_t level, u_char *buf, size_t len); ssize_t ngx_syslog_send(ngx_syslog_peer_t *peer, u_char *buf, size_t len); #endif /* _NGX_SYSLOG_H_INCLUDED_ */