Mercurial > hg > nginx-vendor-current
comparison src/core/nginx.c @ 324:f7cd062ee035 NGINX_0_6_6
nginx 0.6.6
*) Feature: the --sysconfdir=PATH option in configure.
*) Feature: named locations.
*) Feature: the $args variable can be set with the "set" directive.
*) Feature: the $is_args variable.
*) Bugfix: fair big weight upstream balancer.
*) Bugfix: if a client has closed connection to mail proxy then nginx
might not close connection to backend.
*) Bugfix: if the same host without specified port was used as backend
for HTTP and HTTPS, then nginx used only one port - 80 or 443.
*) Bugfix: fix building on Solaris/amd64 by Sun Studio 11 and early
versions; bug appeared in 0.6.4.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 30 Jul 2007 00:00:00 +0400 |
parents | d16d691432c9 |
children | 390b8f8309d6 |
comparison
equal
deleted
inserted
replaced
323:7e977a664d91 | 324:f7cd062ee035 |
---|---|
654 if (cycle->conf_file.data == NULL) { | 654 if (cycle->conf_file.data == NULL) { |
655 cycle->conf_file.len = sizeof(NGX_CONF_PATH) - 1; | 655 cycle->conf_file.len = sizeof(NGX_CONF_PATH) - 1; |
656 cycle->conf_file.data = (u_char *) NGX_CONF_PATH; | 656 cycle->conf_file.data = (u_char *) NGX_CONF_PATH; |
657 } | 657 } |
658 | 658 |
659 if (ngx_conf_full_name(cycle, &cycle->conf_file) == NGX_ERROR) { | 659 if (ngx_conf_full_name(cycle, &cycle->conf_file, 1) == NGX_ERROR) { |
660 return NGX_ERROR; | 660 return NGX_ERROR; |
661 } | 661 } |
662 | 662 |
663 return NGX_OK; | 663 return NGX_OK; |
664 } | 664 } |
824 if (ccf->pid.len == 0) { | 824 if (ccf->pid.len == 0) { |
825 ccf->pid.len = sizeof(NGX_PID_PATH) - 1; | 825 ccf->pid.len = sizeof(NGX_PID_PATH) - 1; |
826 ccf->pid.data = (u_char *) NGX_PID_PATH; | 826 ccf->pid.data = (u_char *) NGX_PID_PATH; |
827 } | 827 } |
828 | 828 |
829 if (ngx_conf_full_name(cycle, &ccf->pid) == NGX_ERROR) { | 829 if (ngx_conf_full_name(cycle, &ccf->pid, 0) == NGX_ERROR) { |
830 return NGX_CONF_ERROR; | 830 return NGX_CONF_ERROR; |
831 } | 831 } |
832 | 832 |
833 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT); | 833 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT); |
834 | 834 |
844 if (ccf->lock_file.len == 0) { | 844 if (ccf->lock_file.len == 0) { |
845 ccf->lock_file.len = sizeof(NGX_LOCK_PATH) - 1; | 845 ccf->lock_file.len = sizeof(NGX_LOCK_PATH) - 1; |
846 ccf->lock_file.data = (u_char *) NGX_LOCK_PATH; | 846 ccf->lock_file.data = (u_char *) NGX_LOCK_PATH; |
847 } | 847 } |
848 | 848 |
849 if (ngx_conf_full_name(cycle, &ccf->lock_file) == NGX_ERROR) { | 849 if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) == NGX_ERROR) { |
850 return NGX_CONF_ERROR; | 850 return NGX_CONF_ERROR; |
851 } | 851 } |
852 | 852 |
853 lock_file = cycle->old_cycle->lock_file; | 853 lock_file = cycle->old_cycle->lock_file; |
854 | 854 |