Mercurial > hg > nginx-vendor-current

comparison src/core/nginx.c @ 328:390b8f8309d6 NGINX_0_6_8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.8 *) Change: now nginx tries to set the "worker_priority", "worker_rlimit_nofile", "worker_rlimit_core", and "worker_rlimit_sigpending" without super-user privileges. *) Change: now nginx escapes space and "%" in request to a mail proxy authentication server. *) Change: now nginx escapes "%" in $memcached_key variable. *) Bugfix: nginx used path relative to configuration prefix for non-absolute configuration file path specified in the "-c" key; bug appeared in 0.6.6. *) Bugfix: nginx did not work on FreeBSD/sparc64.
author Igor Sysoev <http://sysoev.ru>
date Mon, 20 Aug 2007 00:00:00 +0400
parents f7cd062ee035
children b743d290eb3b
comparison
equal deleted inserted replaced
327:be18d26e067c 328:390b8f8309d6
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, 1) == NGX_ERROR) {
660 return NGX_ERROR;
661 }
662
663 return NGX_OK; 659 return NGX_OK;
664 } 660 }
665 661
666 662
667 static ngx_int_t 663 static ngx_int_t