comparison src/core/ngx_inet.c @ 501:98143f74eb3d NGINX_0_7_58

nginx 0.7.58 *) Feature: a "listen" directive of the mail proxy module supports IPv6. *) Feature: the "image_filter_jpeg_quality" directive. *) Feature: the "client_body_in_single_buffer" directive. *) Feature: the $request_body variable. *) Bugfix: in ngx_http_autoindex_module in file name links having a ":" symbol in the name. *) Bugfix: "make upgrade" procedure did not work; the bug had appeared in 0.7.53. Thanks to Denis F. Latypoff.
author Igor Sysoev <http://sysoev.ru>
date Mon, 18 May 2009 00:00:00 +0400
parents 829f9a66a659
children 1dcf6adad484
comparison
equal deleted inserted replaced
500:bb2281a3edb6 501:98143f74eb3d
516 return NGX_ERROR; 516 return NGX_ERROR;
517 } 517 }
518 518
519 (void) ngx_cpystrn(p, host, len); 519 (void) ngx_cpystrn(p, host, len);
520 520
521 u->addr.in_addr = inet_addr((const char *) p);
522 sin->sin_addr.s_addr = inet_addr((const char *) p); 521 sin->sin_addr.s_addr = inet_addr((const char *) p);
523 522
524 if (sin->sin_addr.s_addr == INADDR_NONE) { 523 if (sin->sin_addr.s_addr == INADDR_NONE) {
525 h = gethostbyname((const char *) p); 524 h = gethostbyname((const char *) p);
526 525
528 ngx_free(p); 527 ngx_free(p);
529 u->err = "host not found"; 528 u->err = "host not found";
530 return NGX_ERROR; 529 return NGX_ERROR;
531 } 530 }
532 531
533 u->addr.in_addr = *(in_addr_t *) (h->h_addr_list[0]);
534 sin->sin_addr.s_addr = *(in_addr_t *) (h->h_addr_list[0]); 532 sin->sin_addr.s_addr = *(in_addr_t *) (h->h_addr_list[0]);
535 } 533 }
536 534
537 if (sin->sin_addr.s_addr == INADDR_ANY) { 535 if (sin->sin_addr.s_addr == INADDR_ANY) {
538 u->wildcard = 1; 536 u->wildcard = 1;
539 } 537 }
540 538
541 ngx_free(p); 539 ngx_free(p);
542 540
543 } else { 541 } else {
544 u->addr.in_addr = INADDR_ANY;
545 sin->sin_addr.s_addr = INADDR_ANY; 542 sin->sin_addr.s_addr = INADDR_ANY;
546 u->wildcard = 1; 543 u->wildcard = 1;
547 } 544 }
548 545
549 if (u->no_port) { 546 if (u->no_port) {