mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright

Browse Source
This commit is contained in:
Igor Sysoev 2004-09-29 16:00:49 +00:00
parent 55168f6b6b
commit ff8da91784
250 changed files with 406 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
auto/cc
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CFLAGS="$CFLAGS $CC_OPT" CFLAGS="$CFLAGS $CC_OPT"
case $CC in case $CC in
@ -25,6 +28,12 @@ case $CC in
# optimize for Pentium 4, gcc 3.x # optimize for Pentium 4, gcc 3.x
CPU_OPT="-march=pentium4" CPU_OPT="-march=pentium4"
;; ;;
sparc64)
# build 64-bit binary, sparcv9 only
CPU_OPT="-m64"
;;
esac esac
# STUB for batch builds # STUB for batch builds

5
auto/configure vendored
View File

@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
# Copyright (C) Igor Sysoev
. auto/options . auto/options
. auto/init . auto/init
. auto/sources . auto/sources
@ -43,7 +46,9 @@ have=NGX_PREFIX value="\"$PREFIX/\"" . auto/define
have=NGX_SBIN_PATH value="\"$SBIN_PATH\"" . auto/define have=NGX_SBIN_PATH value="\"$SBIN_PATH\"" . auto/define
have=NGX_CONF_PATH value="\"$CONF_PATH\"" . auto/define have=NGX_CONF_PATH value="\"$CONF_PATH\"" . auto/define
have=NGX_PID_PATH value="\"$PID_PATH\"" . auto/define have=NGX_PID_PATH value="\"$PID_PATH\"" . auto/define
if [ ".$NGX_ERROR_LOG_PATH" != "." ]; then
have=NGX_ERROR_LOG_PATH value="\"$ERROR_LOG_PATH\"" . auto/define have=NGX_ERROR_LOG_PATH value="\"$ERROR_LOG_PATH\"" . auto/define
fi
have=NGX_HTTP_LOG_PATH value="\"$HTTP_LOG_PATH\"" . auto/define have=NGX_HTTP_LOG_PATH value="\"$HTTP_LOG_PATH\"" . auto/define
. auto/summary . auto/summary

3
auto/define
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
cat << END >> $NGX_AUTO_CONFIG_H cat << END >> $NGX_AUTO_CONFIG_H
#ifndef $have #ifndef $have

3
auto/endianess
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
echo $ngx_n "checking for system endianess ..." $ngx_c echo $ngx_n "checking for system endianess ..." $ngx_c
echo >> $NGX_ERR echo >> $NGX_ERR
echo "checking for system endianess" >> $NGX_ERR echo "checking for system endianess" >> $NGX_ERR

3
auto/feature
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
echo $ngx_n "checking for $ngx_feature ..." $ngx_c echo $ngx_n "checking for $ngx_feature ..." $ngx_c
echo >> $NGX_ERR echo >> $NGX_ERR
echo "checking for $ngx_feature" >> $NGX_ERR echo "checking for $ngx_feature" >> $NGX_ERR

3
auto/fmt/fmt
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
echo $ngx_n "checking for $ngx_type printf() format ..." $ngx_c echo $ngx_n "checking for $ngx_type printf() format ..." $ngx_c
echo >> $NGX_ERR echo >> $NGX_ERR
echo "checking for $ngx_type printf() format" >> $NGX_ERR echo "checking for $ngx_type printf() format" >> $NGX_ERR

3
auto/fmt/ptrfmt
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
echo $ngx_n "checking for $ngx_type printf() format ..." $ngx_c echo $ngx_n "checking for $ngx_type printf() format ..." $ngx_c
echo >> $NGX_ERR echo >> $NGX_ERR
echo "checking for $ngx_type printf() format" >> $NGX_ERR echo "checking for $ngx_type printf() format" >> $NGX_ERR

3
auto/fmt/xfmt
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
cat << END | sed -e 's/d"$/x"/' >> $NGX_AUTO_CONFIG_H cat << END | sed -e 's/d"$/x"/' >> $NGX_AUTO_CONFIG_H
#ifndef $ngx_fmt_name #ifndef $ngx_fmt_name

3
auto/func
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
echo $ngx_n "checking for $ngx_func ..." $ngx_c echo $ngx_n "checking for $ngx_func ..." $ngx_c
echo >> $NGX_ERR echo >> $NGX_ERR
echo "checking for $ngx_func" >> $NGX_ERR echo "checking for $ngx_func" >> $NGX_ERR

3
auto/have
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
cat << END >> $NGX_AUTO_CONFIG_H cat << END >> $NGX_AUTO_CONFIG_H
#ifndef $have #ifndef $have

3
auto/headers
View File

@ -1,3 +1,6 @@
# Copyright (C) Igor Sysoev
ngx_inc="unistd.h"; . auto/inc ngx_inc="unistd.h"; . auto/inc
ngx_inc="inttypes.h"; . auto/inc ngx_inc="inttypes.h"; . auto/inc

3
auto/inc
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
echo $ngx_n "checking for $ngx_inc ..." $ngx_c echo $ngx_n "checking for $ngx_inc ..." $ngx_c
echo >> $NGX_ERR echo >> $NGX_ERR
echo "checking for $ngx_inc" >> $NGX_ERR echo "checking for $ngx_inc" >> $NGX_ERR

3
auto/init
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
MAKEFILE=$OBJS/Makefile MAKEFILE=$OBJS/Makefile
NGX_AUTO_CONFIG_H=$OBJS/ngx_auto_config.h NGX_AUTO_CONFIG_H=$OBJS/ngx_auto_config.h

14
auto/install
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
cat << END >> $MAKEFILE cat << END >> $MAKEFILE
install: install:
test -d $PREFIX || mkdir -p $PREFIX test -d $PREFIX || mkdir -p $PREFIX
@ -18,7 +21,7 @@ install:
cp conf/nginx.conf `dirname $CONF_PATH`/nginx.conf.default cp conf/nginx.conf `dirname $CONF_PATH`/nginx.conf.default
test -d `dirname $PID_PATH` || mkdir -p `dirname $PID_PATH` test -d `dirname $PID_PATH` || mkdir -p `dirname $PID_PATH`
test -d `dirname $ERROR_LOG_PATH` || mkdir -p `dirname $ERROR_LOG_PATH`
test -d `dirname $HTTP_LOG_PATH` || mkdir -p `dirname $HTTP_LOG_PATH` test -d `dirname $HTTP_LOG_PATH` || mkdir -p `dirname $HTTP_LOG_PATH`
test -d $PREFIX/html || cp -r html $PREFIX test -d $PREFIX/html || cp -r html $PREFIX
@ -27,6 +30,15 @@ install:
END END
if [ ".$ERROR_LOG_PATH" != "." ]; then
cat << END >> $MAKEFILE
test -d `dirname $ERROR_LOG_PATH` || mkdir -p `dirname $ERROR_LOG_PATH`
END
fi
if test ! -f Makefile; then if test ! -f Makefile; then
cat << END > Makefile cat << END > Makefile

3
auto/lib/conf
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
if [ $USE_PCRE = YES ]; then if [ $USE_PCRE = YES ]; then
. auto/lib/pcre/conf . auto/lib/pcre/conf
fi fi

3
auto/lib/make
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
if [ $PCRE != NONE -a $PCRE != NO -a $PCRE != YES ]; then if [ $PCRE != NONE -a $PCRE != NO -a $PCRE != YES ]; then
. auto/lib/pcre/make . auto/lib/pcre/make
fi fi

3
auto/lib/md5/conf
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
if [ $MD5 != NONE ]; then if [ $MD5 != NONE ]; then
if grep MD5_Init $MD5/md5.h >/dev/null; then if grep MD5_Init $MD5/md5.h >/dev/null; then

3
auto/lib/md5/make
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
case "$CC" in case "$CC" in
cl) cl)

3
auto/lib/md5/makefile.bcc
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
!if "$(MD5_ASM)" == "YES" !if "$(MD5_ASM)" == "YES"

3
auto/lib/md5/makefile.msvc
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CFLAGS = -nologo -MT -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN CFLAGS = -nologo -MT -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
!if "$(MD5_ASM)" == "YES" !if "$(MD5_ASM)" == "YES"

3
auto/lib/md5/makefile.owc
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT) CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
md5.lib: md5.lib:

3
auto/lib/openssl/conf
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
if [ $OPENSSL != NONE ]; then if [ $OPENSSL != NONE ]; then
CORE_INCS="$CORE_INCS $OPENSSL/include" CORE_INCS="$CORE_INCS $OPENSSL/include"
CORE_DEPS="$CORE_DEPS $OPENSSL_DEPS" CORE_DEPS="$CORE_DEPS $OPENSSL_DEPS"

3
auto/lib/openssl/make
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
case $PLATFORM in case $PLATFORM in
*) *)
echo "$OPENSSL/libssl.a:" >> $MAKEFILE echo "$OPENSSL/libssl.a:" >> $MAKEFILE

3
auto/lib/pcre/conf
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
if [ $PCRE != NONE ]; then if [ $PCRE != NONE ]; then
CORE_INCS="$CORE_INCS $PCRE" CORE_INCS="$CORE_INCS $PCRE"
CORE_DEPS="$CORE_DEPS $REGEX_DEPS" CORE_DEPS="$CORE_DEPS $REGEX_DEPS"

3
auto/lib/pcre/make
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
case "$CC" in case "$CC" in
cl) cl)

3
auto/lib/pcre/makefile.bcc
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CFLAGS = -q -O2 -tWM $(CPU_OPT) CFLAGS = -q -O2 -tWM $(CPU_OPT)
PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10

3
auto/lib/pcre/makefile.msvc
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CFLAGS = -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) CFLAGS = -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10

3
auto/lib/pcre/makefile.owc
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT) CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10

3
auto/lib/test
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
echo $ngx_n "checking for $ngx_lib ..." $ngx_c echo $ngx_n "checking for $ngx_lib ..." $ngx_c
echo >> $NGX_ERR echo >> $NGX_ERR
echo "checking for $ngx_lib library" >> $NGX_ERR echo "checking for $ngx_lib library" >> $NGX_ERR

3
auto/lib/zlib/conf
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
if [ $ZLIB != NONE ]; then if [ $ZLIB != NONE ]; then
CORE_INCS="$CORE_INCS $ZLIB" CORE_INCS="$CORE_INCS $ZLIB"

3
auto/lib/zlib/make
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
case "$CC" in case "$CC" in
cl) cl)

3
auto/lib/zlib/makefile.bcc
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CFLAGS = -q -O2 -tWM $(CPU_OPT) CFLAGS = -q -O2 -tWM $(CPU_OPT)
zlib.lib: zlib.lib:

3
auto/lib/zlib/makefile.msvc
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
zlib.lib: zlib.lib:

3
auto/lib/zlib/makefile.owc
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CFLAGS = -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT) CFLAGS = -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
zlib.lib: zlib.lib:

3
auto/make
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
mkdir -p $OBJS/src/core $OBJS/src/event $OBJS/src/event/modules \ mkdir -p $OBJS/src/core $OBJS/src/event $OBJS/src/event/modules \
$OBJS/src/os/unix $OBJS/src/os/win32 \ $OBJS/src/os/unix $OBJS/src/os/win32 \
$OBJS/src/http $OBJS/src/http/modules $OBJS/src/http/modules/proxy \ $OBJS/src/http $OBJS/src/http/modules $OBJS/src/http/modules/proxy \

3
auto/modules
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
if [ $EVENT_SELECT = NO -a $EVENT_FOUND = NO ]; then if [ $EVENT_SELECT = NO -a $EVENT_FOUND = NO ]; then
EVENT_SELECT=YES EVENT_SELECT=YES
fi fi

3
auto/nohave
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
cat << END >> $NGX_AUTO_CONFIG_H cat << END >> $NGX_AUTO_CONFIG_H
#ifndef $have #ifndef $have

6
auto/options
View File

@ -1,4 +1,6 @@
# Copyright (C) Igor Sysoev
help=no help=no
PREFIX= PREFIX=
@ -234,6 +236,10 @@ case ".$ERROR_LOG_PATH" in
ERROR_LOG_PATH=$PREFIX/logs/error.log ERROR_LOG_PATH=$PREFIX/logs/error.log
;; ;;
.stderr)
ERROR_LOG_PATH=
;;
*) *)
ERROR_LOG_PATH=$PREFIX/$ERROR_LOG_PATH ERROR_LOG_PATH=$PREFIX/$ERROR_LOG_PATH
;; ;;

3
auto/os/conf
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
if [ ".$PLATFORM" = "." ]; then if [ ".$PLATFORM" = "." ]; then
echo "checking for OS" echo "checking for OS"

27
auto/os/freebsd
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CORE_INCS="$UNIX_INCS" CORE_INCS="$UNIX_INCS"
CORE_DEPS="$UNIX_DEPS $FREEBSD_DEPS" CORE_DEPS="$UNIX_DEPS $FREEBSD_DEPS"
CORE_SRCS="$UNIX_SRCS $FREEBSD_SRCS" CORE_SRCS="$UNIX_SRCS $FREEBSD_SRCS"
@ -62,18 +65,18 @@ if [ $USE_THREADS = "rfork" ]; then
echo " + using rfork()" echo " + using rfork()"
# kqueue's EVFILT_SIGNAL is safe # # kqueue's EVFILT_SIGNAL is safe
#
if [ $version -gt 460101 ]; then # if [ $version -gt 460101 ]; then
echo " + kqueue's EVFILT_SIGNAL is safe" # echo " + kqueue's EVFILT_SIGNAL is safe"
have=HAVE_SAFE_EVFILT_SIGNAL . auto/have # have=HAVE_SAFE_EVFILT_SIGNAL . auto/have
else # else
echo "$0: error: the kqueue's EVFILT_SIGNAL is unsafe on this" # echo "$0: error: the kqueue's EVFILT_SIGNAL is unsafe on this"
echo "FreeBSD version, so --with-threads=rfork could not be used" # echo "FreeBSD version, so --with-threads=rfork could not be used"
echo # echo
#
exit 1 # exit 1
fi # fi
fi fi

5
auto/os/linux
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CORE_INCS="$UNIX_INCS" CORE_INCS="$UNIX_INCS"
CORE_DEPS="$UNIX_DEPS $LINUX_DEPS" CORE_DEPS="$UNIX_DEPS $LINUX_DEPS"
CORE_SRCS="$UNIX_SRCS $LINUX_SRCS" CORE_SRCS="$UNIX_SRCS $LINUX_SRCS"
@ -15,7 +18,7 @@ version=`grep "#define LINUX_VERSION_CODE" /usr/include/linux/version.h \
| sed -e 's/^.* \(.*\)$/\1/'` | sed -e 's/^.* \(.*\)$/\1/'`
# enable rt signals on Linux 2.2.19 and onward # enable the rt signals on Linux 2.2.19 and onward
if [ $version -ge 131609 -o $EVENT_RTSIG = YES ]; then if [ $version -ge 131609 -o $EVENT_RTSIG = YES ]; then
echo " + using rt signals" echo " + using rt signals"

3
auto/os/solaris
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CORE_INCS="$UNIX_INCS" CORE_INCS="$UNIX_INCS"
CORE_DEPS="$UNIX_DEPS $SOLARIS_DEPS" CORE_DEPS="$UNIX_DEPS $SOLARIS_DEPS"
CORE_SRCS="$UNIX_SRCS $SOLARIS_SRCS " CORE_SRCS="$UNIX_SRCS $SOLARIS_SRCS "

3
auto/sources
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CORE_MODULES="ngx_core_module ngx_errlog_module ngx_conf_module" CORE_MODULES="ngx_core_module ngx_errlog_module ngx_conf_module"
CORE_INCS="src/core" CORE_INCS="src/core"

7
auto/summary
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
echo echo
echo "Configuration summary" echo "Configuration summary"
@ -69,6 +72,10 @@ echo " nginx path prefix: $PREFIX"
echo " nginx binary file: $SBIN_PATH" echo " nginx binary file: $SBIN_PATH"
echo " nginx configuration file: $CONF_PATH" echo " nginx configuration file: $CONF_PATH"
echo " nginx pid file: $PID_PATH" echo " nginx pid file: $PID_PATH"
if [ ".$ERROR_LOG_PATH" != "." ]; then
echo " nginx error log file: $ERROR_LOG_PATH" echo " nginx error log file: $ERROR_LOG_PATH"
else
echo " nginx logs errors to stderr"
fi
echo " nginx http access log file: $HTTP_LOG_PATH" echo " nginx http access log file: $HTTP_LOG_PATH"
echo echo

3
auto/threads
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
case $USE_THREADS in case $USE_THREADS in
rfork) rfork)
have=NGX_THREADS . auto/have have=NGX_THREADS . auto/have

3
auto/types/sizeof
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
echo $ngx_n "checking for $ngx_type size ..." $ngx_c echo $ngx_n "checking for $ngx_type size ..." $ngx_c
echo >> $NGX_ERR echo >> $NGX_ERR
echo "checking for $ngx_type size" >> $NGX_ERR echo "checking for $ngx_type size" >> $NGX_ERR

3
auto/types/typedef
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
echo $ngx_n "checking for $ngx_type ..." $ngx_c echo $ngx_n "checking for $ngx_type ..." $ngx_c
echo >> $NGX_ERR echo >> $NGX_ERR
echo "checking for $ngx_type" >> $NGX_ERR echo "checking for $ngx_type" >> $NGX_ERR

3
auto/types/uintptr_t
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
echo $ngx_n "checking for uintptr_t ... " $ngx_c echo $ngx_n "checking for uintptr_t ... " $ngx_c
echo >> $NGX_ERR echo >> $NGX_ERR
echo "checking for uintptr_t" >> $NGX_ERR echo "checking for uintptr_t" >> $NGX_ERR

3
auto/types/value
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
cat << END >> $NGX_AUTO_CONFIG_H cat << END >> $NGX_AUTO_CONFIG_H
#ifndef $ngx_param #ifndef $ngx_param

3
auto/unix
View File

@ -1,4 +1,7 @@
# Copyright (C) Igor Sysoev
CC_WARN=$CC CC_WARN=$CC
ngx_fmt_collect=yes ngx_fmt_collect=yes

16
src/core/nginx.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */
@ -95,8 +95,6 @@ ngx_module_t ngx_core_module = {
ngx_uint_t ngx_max_module; ngx_uint_t ngx_max_module;
ngx_uint_t ngx_use_stderr;
int main(int argc, char *const *argv) int main(int argc, char *const *argv)
{ {
@ -120,7 +118,9 @@ int main(int argc, char *const *argv)
ngx_pid = ngx_getpid(); ngx_pid = ngx_getpid();
log = ngx_log_init_errlog(); if (!(log = ngx_log_init_errlog())) {
return 1;
}
#if (NGX_OPENSSL) #if (NGX_OPENSSL)
ngx_ssl_init(log); ngx_ssl_init(log);
@ -144,10 +144,6 @@ int main(int argc, char *const *argv)
return 1; return 1;
} }
if (ngx_use_stderr) {
log = ngx_log_init_errlog();
}
if (ngx_os_init(log) == NGX_ERROR) { if (ngx_os_init(log) == NGX_ERROR) {
return 1; return 1;
} }
@ -326,10 +322,6 @@ static ngx_int_t ngx_getopt(ngx_master_ctx_t *ctx, ngx_cycle_t *cycle)
ngx_test_config = 1; ngx_test_config = 1;
break; break;
case 's':
ngx_use_stderr = 1;
break;
case 'c': case 'c':
if (ctx->argv[i + 1] == NULL) { if (ctx->argv[i + 1] == NULL) {
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,

2
src/core/nginx.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_array.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_array.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_buf.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_buf.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_conf_file.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_conf_file.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_config.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_connection.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_connection.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_core.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_crc.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

6
src/core/ngx_cycle.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */
@ -29,7 +29,11 @@ ngx_tls_key_t ngx_core_tls_key;
static ngx_connection_t dumb; static ngx_connection_t dumb;
/* STUB */ /* STUB */
#ifdef NGX_ERROR_LOG_PATH
static ngx_str_t error_log = ngx_string(NGX_ERROR_LOG_PATH); static ngx_str_t error_log = ngx_string(NGX_ERROR_LOG_PATH);
#else
static ngx_str_t error_log = ngx_null_string;
#endif
ngx_cycle_t *ngx_init_cycle(ngx_cycle_t *old_cycle) ngx_cycle_t *ngx_init_cycle(ngx_cycle_t *old_cycle)

2
src/core/ngx_cycle.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_file.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_file.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_garbage_collector.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_garbage_collector.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_inet.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_inet.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_list.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_list.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

49
src/core/ngx_log.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */
@ -112,7 +112,9 @@ void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
if (err) { if (err) {
if (len > max - 50) { if (len > max - 50) {
/* leave a space for an error code */ /* leave a space for an error code */
len = max - 50; len = max - 50;
errstr[len++] = '.'; errstr[len++] = '.';
errstr[len++] = '.'; errstr[len++] = '.';
@ -222,40 +224,6 @@ void ngx_assert_core(ngx_log_t *log, const char *fmt, ...)
#endif #endif
#if 0
void ngx_log_stderr(ngx_event_t *ev)
{
char errstr[MAX_ERROR_STR];
ssize_t n;
ngx_err_t err;
for ( ;; ) {
n = read((ngx_fd_t) ev->data, errstr, sizeof(errstr - 1));
if (n == -1) {
err = ngx_errno;
if (err == NGX_EAGAIN) {
return;
}
ngx_log_error(NGX_LOG_ALERT, &ngx_log, err, "read() failed");
return;
}
if (n == 0) {
ngx_log_error(NGX_LOG_ALERT, &ngx_log, 0, "stderr clolsed");
return;
}
errstr[n] = '\0';
ngx_log_error(NGX_LOG_STDERR, &ngx_log, 0, "%s", errstr);
}
}
#endif
ngx_log_t *ngx_log_init_errlog() ngx_log_t *ngx_log_init_errlog()
{ {
@ -287,7 +255,8 @@ ngx_log_t *ngx_log_init_errlog()
ngx_log.file = &ngx_stderr; ngx_log.file = &ngx_stderr;
ngx_log.log_level = NGX_LOG_ERR; ngx_log.log_level = NGX_LOG_ERR;
#if 0 #ifdef NGX_ERROR_LOG_PATH
fd = ngx_open_file(NGX_ERROR_LOG_PATH, NGX_FILE_RDWR, fd = ngx_open_file(NGX_ERROR_LOG_PATH, NGX_FILE_RDWR,
NGX_FILE_CREATE_OR_OPEN|NGX_FILE_APPEND); NGX_FILE_CREATE_OR_OPEN|NGX_FILE_APPEND);
@ -315,6 +284,7 @@ ngx_log_t *ngx_log_init_errlog()
} }
#endif #endif
#endif #endif
return &ngx_log; return &ngx_log;
@ -405,12 +375,6 @@ static char *ngx_set_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
value = cf->args->elts; value = cf->args->elts;
if (value[1].len == 6 && ngx_strcmp(value[1].data, "stderr") == 0) {
cf->cycle->new_log->file->fd = ngx_stderr.fd;
cf->cycle->new_log->file->name.len = 0;
cf->cycle->new_log->file->name.data = NULL;
} else {
cf->cycle->new_log->file->name = value[1]; cf->cycle->new_log->file->name = value[1];
if (ngx_conf_full_name(cf->cycle, &cf->cycle->new_log->file->name) if (ngx_conf_full_name(cf->cycle, &cf->cycle->new_log->file->name)
@ -418,7 +382,6 @@ static char *ngx_set_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
}
return ngx_set_error_log_levels(cf, cf->cycle->new_log); return ngx_set_error_log_levels(cf, cf->cycle->new_log);
} }

2
src/core/ngx_log.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_output_chain.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_palloc.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_palloc.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_parse.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_parse.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_radix_tree.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_radix_tree.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_rbtree.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_rbtree.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_regex.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_regex.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_slab.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_slab.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_spinlock.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_string.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_string.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_table.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_times.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/core/ngx_times.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/event/modules/ngx_aio_module.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/event/modules/ngx_aio_module.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/event/modules/ngx_devpoll_module.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/event/modules/ngx_epoll_module.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/event/modules/ngx_iocp_module.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

2
src/event/modules/ngx_iocp_module.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Igor Sysoev * Copyright (C) Igor Sysoev
*/ */

Some files were not shown because too many files have changed in this diff Show More