Mercurial > hg > nginx
comparison src/core/nginx.c @ 337:4feff829a849
nginx-0.0.3-2004-05-19-00:28:54 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 18 May 2004 20:28:54 +0000 |
parents | 8733703a37f3 |
children | e411b1482ee3 |
comparison
equal
deleted
inserted
replaced
336:ca9a7f8c86da | 337:4feff829a849 |
---|---|
313 return NGX_ERROR; | 313 return NGX_ERROR; |
314 } | 314 } |
315 } | 315 } |
316 | 316 |
317 if (cycle->conf_file.data == NULL) { | 317 if (cycle->conf_file.data == NULL) { |
318 cycle->conf_file.len = sizeof(NGINX_CONF) - 1; | 318 cycle->conf_file.len = sizeof(NGX_CONF_PATH) - 1; |
319 cycle->conf_file.data = NGINX_CONF; | 319 cycle->conf_file.data = (u_char *) NGX_CONF_PATH; |
320 } | 320 } |
321 | 321 |
322 return NGX_OK; | 322 return NGX_OK; |
323 } | 323 } |
324 | 324 |
356 #if !(WIN32) | 356 #if !(WIN32) |
357 | 357 |
358 /* TODO: default "nobody" user */ | 358 /* TODO: default "nobody" user */ |
359 | 359 |
360 if (ccf->pid.len == 0) { | 360 if (ccf->pid.len == 0) { |
361 ccf->pid.len = sizeof(NGINX_PID) - 1; | 361 ccf->pid.len = sizeof(NGX_PID_PATH) - 1; |
362 ccf->pid.data = NGINX_PID; | 362 ccf->pid.data = NGX_PID_PATH; |
363 ccf->newpid.len = sizeof(NGINX_NEWPID) - 1; | 363 ccf->newpid.len = sizeof(NGX_PID_PATH NGX_NEWPID_EXT) - 1; |
364 ccf->newpid.data = NGINX_NEWPID; | 364 ccf->newpid.data = NGX_PID_PATH NGX_NEWPID_EXT; |
365 | 365 |
366 } else { | 366 } else { |
367 ccf->newpid.len = ccf->pid.len + sizeof(NGINX_NEWPID_EXT); | 367 ccf->newpid.len = ccf->pid.len + sizeof(NGX_NEWPID_EXT); |
368 | 368 |
369 if (!(ccf->newpid.data = ngx_palloc(cycle->pool, ccf->newpid.len))) { | 369 if (!(ccf->newpid.data = ngx_palloc(cycle->pool, ccf->newpid.len))) { |
370 return NGX_CONF_ERROR; | 370 return NGX_CONF_ERROR; |
371 } | 371 } |
372 | 372 |
373 ngx_memcpy(ngx_cpymem(ccf->newpid.data, ccf->pid.data, ccf->pid.len), | 373 ngx_memcpy(ngx_cpymem(ccf->newpid.data, ccf->pid.data, ccf->pid.len), |
374 NGINX_NEWPID_EXT, sizeof(NGINX_NEWPID_EXT)); | 374 NGX_NEWPID_EXT, sizeof(NGX_NEWPID_EXT)); |
375 } | 375 } |
376 #endif | 376 #endif |
377 | 377 |
378 return NGX_CONF_OK; | 378 return NGX_CONF_OK; |
379 } | 379 } |