Mercurial > hg > nginx-vendor-current
comparison src/mail/ngx_mail.c @ 684:660139fd80ca NGINX_1_3_5
nginx 1.3.5
*) Change: the ngx_http_mp4_module module no longer skips tracks in
formats other than H.264 and AAC.
*) Bugfix: a segmentation fault might occur in a worker process if the
"map" directive was used with variables as values.
*) Bugfix: a segmentation fault might occur in a worker process if the
"geo" directive was used with the "ranges" parameter but without the
"default" parameter; the bug had appeared in 0.8.43.
Thanks to Zhen Chen and Weibin Yao.
*) Bugfix: in the -p command-line parameter handling.
*) Bugfix: in the mail proxy server.
*) Bugfix: of minor potential bugs.
Thanks to Coverity.
*) Bugfix: nginx/Windows could not be built with Visual Studio 2005
Express.
Thanks to HAYASHI Kentaro.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 21 Aug 2012 00:00:00 +0400 |
parents | d0f7a625f27c |
children |
comparison
equal
deleted
inserted
replaced
683:28cc2a208803 | 684:660139fd80ca |
---|---|
261 sin6 = (struct sockaddr_in6 *) sa; | 261 sin6 = (struct sockaddr_in6 *) sa; |
262 p = sin6->sin6_port; | 262 p = sin6->sin6_port; |
263 break; | 263 break; |
264 #endif | 264 #endif |
265 | 265 |
266 #if (NGX_HAVE_UNIX_DOMAIN) | |
267 case AF_UNIX: | |
268 p = 0; | |
269 break; | |
270 #endif | |
271 | |
266 default: /* AF_INET */ | 272 default: /* AF_INET */ |
267 sin = (struct sockaddr_in *) sa; | 273 sin = (struct sockaddr_in *) sa; |
268 p = sin->sin_port; | 274 p = sin->sin_port; |
269 break; | 275 break; |
270 } | 276 } |
537 if (first->wildcard) { | 543 if (first->wildcard) { |
538 /* a wildcard must be the last resort, shift it to the end */ | 544 /* a wildcard must be the last resort, shift it to the end */ |
539 return 1; | 545 return 1; |
540 } | 546 } |
541 | 547 |
548 if (second->wildcard) { | |
549 /* a wildcard must be the last resort, shift it to the end */ | |
550 return -1; | |
551 } | |
552 | |
542 if (first->bind && !second->bind) { | 553 if (first->bind && !second->bind) { |
543 /* shift explicit bind()ed addresses to the start */ | 554 /* shift explicit bind()ed addresses to the start */ |
544 return -1; | 555 return -1; |
545 } | 556 } |
546 | 557 |