comparison src/http/ngx_http.c @ 416:b9bd635011de

nginx-0.0.10-2004-09-06-22:45:00 import
author Igor Sysoev <igor@sysoev.ru>
date Mon, 06 Sep 2004 18:45:00 +0000
parents 4765ded59eaa
children 0526206251f6
comparison
equal deleted inserted replaced
415:3c56e834be46 416:b9bd635011de
498 } 498 }
499 499
500 in_addr = in_port[p].addrs.elts; 500 in_addr = in_port[p].addrs.elts;
501 while (a < in_port[p].addrs.nelts) { 501 while (a < in_port[p].addrs.nelts) {
502 502
503 ngx_test_null(ls, ngx_push_array(&cf->cycle->listening), 503 if (!(ls = ngx_push_array(&cf->cycle->listening))) {
504 NGX_CONF_ERROR); 504 return NGX_CONF_ERROR;
505 }
506
505 ngx_memzero(ls, sizeof(ngx_listening_t)); 507 ngx_memzero(ls, sizeof(ngx_listening_t));
506 508
507 ngx_test_null(addr_in, 509 addr_in = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in));
508 ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in)), 510 if (addr_in == NULL) {
509 NGX_CONF_ERROR); 511 return NGX_CONF_ERROR;
512 }
510 513
511 #if (HAVE_SIN_LEN) 514 #if (HAVE_SIN_LEN)
512 addr_in->sin_len = sizeof(struct sockaddr_in); 515 addr_in->sin_len = sizeof(struct sockaddr_in);
513 #endif 516 #endif
514 addr_in->sin_family = AF_INET; 517 addr_in->sin_family = AF_INET;
515 addr_in->sin_addr.s_addr = in_addr[a].addr; 518 addr_in->sin_addr.s_addr = in_addr[a].addr;
516 addr_in->sin_port = htons((u_short) in_port[p].port); 519 addr_in->sin_port = htons((u_short) in_port[p].port);
517 520
518 ngx_test_null(ls->addr_text.data, 521 ls->addr_text.data = ngx_palloc(cf->pool, INET_ADDRSTRLEN + 6);
519 ngx_palloc(cf->pool, INET_ADDRSTRLEN + 6), 522 if (ls->addr_text.data == NULL) {
520 NGX_CONF_ERROR); 523 return NGX_CONF_ERROR;
521 524 }
522 ls->addr_text.len = 525
523 ngx_snprintf((char *) ls->addr_text.data 526 ls->addr_text.len = ngx_inet_ntop(AF_INET, &in_addr[a].addr,
524 + ngx_inet_ntop(AF_INET, 527 ls->addr_text.data,
525 &in_addr[a].addr, 528 INET_ADDRSTRLEN),
526 ls->addr_text.data, 529
527 INET_ADDRSTRLEN), 530 ls->addr_text.len += ngx_snprintf((char *) ls->addr_text.data
528 6, ":%d", in_port[p].port); 531 + ls->addr_text.len,
532 6, ":%d", in_port[p].port);
529 533
530 ls->fd = (ngx_socket_t) -1; 534 ls->fd = (ngx_socket_t) -1;
531 ls->family = AF_INET; 535 ls->family = AF_INET;
532 ls->type = SOCK_STREAM; 536 ls->type = SOCK_STREAM;
533 ls->protocol = IPPROTO_IP; 537 ls->protocol = IPPROTO_IP;