comparison src/http/ngx_http.c @ 158:2d15b82126ed NGINX_0_3_26

nginx 0.3.26 *) Change: the "optimize_host_names" directive was renamed to the "optimize_server_names". *) Bugfix: if in the "proxy_pass" directive was no the URI part, then the main request URI was transferred to a backend while proxying the SSI subrequest.
author Igor Sysoev <http://sysoev.ru>
date Fri, 03 Feb 2006 00:00:00 +0300
parents 396dbbc06dd7
children 6be073125f2e
comparison
equal deleted inserted replaced
157:10bd259db2a7 158:2d15b82126ed
533 533
534 /* 534 /*
535 * check whether all name-based servers have the same configuraiton 535 * check whether all name-based servers have the same configuraiton
536 * as the default server, 536 * as the default server,
537 * or some servers restrict the host names, 537 * or some servers restrict the host names,
538 * or some servers disable optimizing the host names 538 * or some servers disable optimizing the server names
539 */ 539 */
540 540
541 in_addr = in_port[p].addrs.elts; 541 in_addr = in_port[p].addrs.elts;
542 for (a = 0; a < in_port[p].addrs.nelts; a++) { 542 for (a = 0; a < in_port[p].addrs.nelts; a++) {
543 543
544 name = in_addr[a].names.elts; 544 name = in_addr[a].names.elts;
545 for (s = 0; s < in_addr[a].names.nelts; s++) { 545 for (s = 0; s < in_addr[a].names.nelts; s++) {
546 546
547 if (in_addr[a].core_srv_conf != name[s].core_srv_conf 547 if (in_addr[a].core_srv_conf != name[s].core_srv_conf
548 || name[s].core_srv_conf->optimize_host_names == 0 548 || name[s].core_srv_conf->optimize_server_names == 0
549 || name[s].core_srv_conf->restrict_host_names 549 || name[s].core_srv_conf->restrict_host_names
550 != NGX_HTTP_RESTRICT_HOST_OFF) 550 != NGX_HTTP_RESTRICT_HOST_OFF)
551 { 551 {
552 goto virtual_names; 552 goto virtual_names;
553 } 553 }
555 555
556 /* 556 /*
557 * if all name-based servers have the same configuration 557 * if all name-based servers have the same configuration
558 * as the default server, 558 * as the default server,
559 * and no servers restrict the host names, 559 * and no servers restrict the host names,
560 * and no servers disable optimizing the host names 560 * and no servers disable optimizing the server names
561 * then we do not need to check them at run-time at all 561 * then we do not need to check them at run-time at all
562 */ 562 */
563 563
564 in_addr[a].names.nelts = 0; 564 in_addr[a].names.nelts = 0;
565 565