Mercurial > hg > nginx

comparison src/core/nginx.c @ 639:715d24327080 release-0.3.41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.3.41-RELEASE import *) Feature: the -v switch. *) Bugfix: the segmentation fault may occurred if the SSI page has remote subrequests. *) Bugfix: in FastCGI handling. *) Bugfix: if the perl modules path was not set using --with-perl_modules_path=PATH or the "perl_modules", then the segmentation fault was occurred.
author Igor Sysoev <igor@sysoev.ru>
date Fri, 21 Apr 2006 12:06:44 +0000
parents f971949ffb58
children 5e8fb59c18c1
comparison
equal deleted inserted replaced
638:76bf795b5a02 639:715d24327080
173 }; 173 };
174 174
175 175
176 ngx_uint_t ngx_max_module; 176 ngx_uint_t ngx_max_module;
177 177
178 static char *ngx_null_environ = NULL; 178 static ngx_uint_t ngx_show_version;
179
180 static char *ngx_null_environ = NULL;
179 181
180 182
181 int ngx_cdecl 183 int ngx_cdecl
182 main(int argc, char *const *argv) 184 main(int argc, char *const *argv)
183 { 185 {
225 return 1; 227 return 1;
226 } 228 }
227 229
228 if (ngx_getopt(&init_cycle, argc, ngx_argv) != NGX_OK) { 230 if (ngx_getopt(&init_cycle, argc, ngx_argv) != NGX_OK) {
229 return 1; 231 return 1;
232 }
233
234 if (ngx_show_version) {
235 ngx_write_fd(ngx_stderr_fileno, "nginx version: " NGINX_VER CRLF,
236 sizeof("nginx version: " NGINX_VER CRLF) - 1);
237
238 #ifdef NGX_COMPILER
239 ngx_write_fd(ngx_stderr_fileno, "built by " NGX_COMPILER CRLF,
240 sizeof("built by " NGX_COMPILER CRLF) - 1);
241 #endif
242 return 0;
230 } 243 }
231 244
232 if (ngx_test_config) { 245 if (ngx_test_config) {
233 log->log_level = NGX_LOG_INFO; 246 log->log_level = NGX_LOG_INFO;
234 } 247 }
470 return NGX_ERROR; 483 return NGX_ERROR;
471 } 484 }
472 485
473 switch (argv[i][1]) { 486 switch (argv[i][1]) {
474 487
488 case 'v':
489 ngx_show_version = 1;
490 break;
491
475 case 't': 492 case 't':
476 ngx_test_config = 1; 493 ngx_test_config = 1;
477 break; 494 break;
478 495
479 case 'c': 496 case 'c':