Mercurial > hg > nginx

comparison src/http/ngx_http_variables.c @ 7147:0800444254e8 stable-1.12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed handling of unix sockets in $binary_remote_addr. Previously, unix sockets were treated as AF_INET ones, and this may result in buffer overread on Linux, where unbound unix sockets have 2-byte addresses. Note that it is not correct to use just sun_path as a binary representation for unix sockets. This will result in an empty string for unbound unix sockets, and thus behaviour of limit_req and limit_conn will change when switching from $remote_addr to $binary_remote_addr. As such, normal text representation is used. Reported by Stephan Dollberg.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 04 Oct 2017 21:19:42 +0300
parents d2b2ff157da5
children
comparison
equal deleted inserted replaced
7146:5c25f01bbd52 7147:0800444254e8
1223 v->data = sin6->sin6_addr.s6_addr; 1223 v->data = sin6->sin6_addr.s6_addr;
1224 1224
1225 break; 1225 break;
1226 #endif 1226 #endif
1227 1227
1228 #if (NGX_HAVE_UNIX_DOMAIN)
1229 case AF_UNIX:
1230
1231 v->len = r->connection->addr_text.len;
1232 v->valid = 1;
1233 v->no_cacheable = 0;
1234 v->not_found = 0;
1235 v->data = r->connection->addr_text.data;
1236
1237 break;
1238 #endif
1239
1228 default: /* AF_INET */ 1240 default: /* AF_INET */
1229 sin = (struct sockaddr_in *) r->connection->sockaddr; 1241 sin = (struct sockaddr_in *) r->connection->sockaddr;
1230 1242
1231 v->len = sizeof(in_addr_t); 1243 v->len = sizeof(in_addr_t);
1232 v->valid = 1; 1244 v->valid = 1;