IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

nginx-0.1.14-RELEASE import

Browse Source 
*) Feature: the autoconfiguration directives:
       --http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
       --http-fastcgi-temp-path=PATH

    *) Change: the directory name for the temporary files with the client
       request body is specified by directive client_body_temp_path, by
       default it is <prefix>/client_body_temp.

    *) Feature: the ngx_http_fastcgi_module and the directives:
       fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
       fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
       fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
       fastcgi_busy_buffers_size, fastcgi_temp_path,
       fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
       fastcgi_next_upstream, and fastcgi_x_powered_by.

    *) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
       0.1.3.

    *) Change: the URI must be specified after the host name in the
       proxy_pass directive.

    *) Change: the %3F symbol in the URI was considered as the argument
       string start.

    *) Feature: the unix domain sockets support in the
       ngx_http_proxy_module.

    *) Feature: the ssl_engine and ssl_ciphers directives.
       Thanks to Sergey Skvortsov for SSL-accelerator.
This commit is contained in:
Igor Sysoev 2005-01-18 13:03:58 +00:00
parent 543d02a442
commit 02025fd6bd
73 changed files with 5514 additions and 1290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
auto/cc/icc
View File

@ -57,6 +57,12 @@ fi
CFLAGS="$CFLAGS -w1"
#CFLAGS="$CFLAGS -w2"
# disable the ICC 8.0 errors:
# error #181: argument is incompatible with corresponding format
# string conversion
# error #269: invalid format string conversion
CFLAGS="$CFLAGS -wd181 -wd269"
# stop on warning
CFLAGS="$CFLAGS -Werror"

7
auto/configure vendored
View File

@ -51,7 +51,14 @@ have=NGX_PID_PATH value="\"$NGX_PID_PATH\"" . auto/define
if test -n "$NGX_ERROR_LOG_PATH"; then
have=NGX_ERROR_LOG_PATH value="\"$NGX_ERROR_LOG_PATH\"" . auto/define
fi
have=NGX_HTTP_LOG_PATH value="\"$NGX_HTTP_LOG_PATH\"" . auto/define
have=NGX_HTTP_CLIENT_TEMP_PATH value="\"$NGX_HTTP_CLIENT_TEMP_PATH\""
. auto/define
have=NGX_HTTP_PROXY_TEMP_PATH value="\"$NGX_HTTP_PROXY_TEMP_PATH\""
. auto/define
have=NGX_HTTP_FASTCGI_TEMP_PATH value="\"$NGX_HTTP_FASTCGI_TEMP_PATH\""
. auto/define
have=NGX_USER value="\"$NGX_USER\"" . auto/define
have=NGX_GROUP value="\"$NGX_GROUP\"" . auto/define

8
auto/lib/openssl/conf
View File

@ -13,9 +13,15 @@ if [ $OPENSSL != NONE ]; then
LINK_DEPS="$LINK_DEPS $OPENSSL/libssl.a $OPENSSL/libcrypto.a"
CORE_LIBS="$CORE_LIBS $OPENSSL/libssl.a $OPENSSL/libcrypto.a"
;;
esac
case "$NGX_SYSTEM" in
SunOS|Linux)
CORE_LIBS="$CORE_LIBS -ldl"
;;
esac
else
if [ $NGX_PLATFORM != win32 ]; then

1
auto/lib/openssl/make
View File

@ -6,6 +6,7 @@ case $NGX_PLATFORM in
*)
echo "$OPENSSL/libssl.a:" >> $MAKEFILE
echo " cd $OPENSSL \\" >> $MAKEFILE
echo " && \$(MAKE) clean \\" >> $MAKEFILE
echo " && CC=\"\$(CC)\" \\" >> $MAKEFILE
echo " ./config threads no-shared \\" >> $MAKEFILE
echo " && \$(MAKE)" >> $MAKEFILE

6
auto/lib/zlib/make
View File

@ -54,7 +54,7 @@ END
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& make clean \\
&& \$(MAKE) clean \\
&& cp contrib/asm586/match.S . \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
./configure \\
@ -71,7 +71,7 @@ END
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& make clean \\
&& \$(MAKE) clean \\
&& cp contrib/asm686/match.S . \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
./configure \\
@ -104,7 +104,7 @@ if [ $done = NO ]; then
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& make clean \\
&& \$(MAKE) clean \\
&& CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
./configure \\
&& \$(MAKE) libz.a

5
auto/modules
View File

@ -140,6 +140,11 @@ if [ $HTTP_PROXY = YES ]; then
HTTP_SRCS="$HTTP_SRCS $HTTP_PROXY_SRCS"
fi
if [ $HTTP_FASTCGI = YES ]; then
HTTP_MODULES="$HTTP_MODULES $HTTP_FASTCGI_MODULE"
HTTP_SRCS="$HTTP_SRCS $HTTP_FASTCGI_SRCS"
fi
# STUB
#USE_MD5=YES
#HTTP_SRCS="$HTTP_SRCS $HTPP_CACHE_SRCS"

132
auto/options
View File

@ -11,7 +11,6 @@ NGX_ERROR_LOG_PATH=
NGX_PID_PATH=
NGX_USER=
NGX_GROUP=
NGX_HTTP_LOG_PATH=
CC=${CC:-gcc}
CPP=
@ -40,6 +39,12 @@ EVENT_AIO=NO
USE_THREADS=NO
HTTP=YES
NGX_HTTP_LOG_PATH=
NGX_HTTP_CLIENT_TEMP_PATH=
NGX_HTTP_PROXY_TEMP_PATH=
NGX_HTTP_FASTCGI_TEMP_PATH=
HTTP_CHARSET=YES
HTTP_GZIP=YES
HTTP_SSL=NO
@ -50,6 +55,7 @@ HTTP_AUTOINDEX=YES
HTTP_STATUS=NO
HTTP_REWRITE=YES
HTTP_PROXY=YES
HTTP_FASTCGI=YES
IMAP=NO
@ -107,6 +113,9 @@ do
--without-http) HTTP=NO ;;
--http-log-path=*) NGX_HTTP_LOG_PATH="$value" ;;
--http-client-body-temp-path=*) NGX_HTTP_CLIENT_TEMP_PATH="$value" ;;
--http-proxy-temp-path=*) NGX_HTTP_PROXY_TEMP_PATH="$value" ;;
--http-fastcgi-temp-path=*) NGX_HTTP_FASTCGI_TEMP_PATH="$value" ;;
--with-http_ssl_module) HTTP_SSL=YES ;;
--without-http_charset_module) HTTP_CHARSET=NO ;;
@ -118,6 +127,7 @@ do
--without-http_status_module) HTTP_STATUS=NO ;;
--without-http_rewrite_module) HTTP_REWRITE=NO ;;
--without-http_proxy_module) HTTP_PROXY=NO ;;
--without-http_fastcgi_module) HTTP_FASTCGI=NO ;;
--with-imap) IMAP=YES ;;
@ -161,30 +171,69 @@ if [ $help = yes ]; then
cat << END
--help this message
--help this message
--user=USER set non-privilege user
for the worker processes
--group=GROUP set non-privilege group
for the worker processes
--prefix=PATH set the installation prefix
--sbin-path=PATH set path to the nginx binary file
--conf-path=PATH set path to the nginx.conf file
--error-log-path=PATH set path to the error log
--pid-path=PATH set path to nginx.pid file
--with-select_module enable select module
--without-select_module disable select module
--with-poll_module enable poll module
--without-poll_module disable poll module
--user=USER set non-privilege user
for the worker processes
--group=GROUP set non-privilege group
for the worker processes
--without-http_charset_module disable ngx_http_charset_module
--without-http_rewrite_module disable ngx_http_rewrite_module
--without-http_gzip_module disable ngx_http_gzip_module
--without-http_proxy_module disable ngx_http_proxy_module
--builddir=DIR set the build directory
--with-cc-opt=OPTIONS additional options for compiler
--with-ld-opt=OPTIONS additional options for linker
--with-rtsig_module enable rtsig module
--with-select_module enable select module
--without-select_module disable select module
--with-poll_module enable poll module
--without-poll_module disable poll module
--with-pcre=DIR path to PCRE library
--with-md5=DIR path to md5 library
--with-zlib=DIR path to zlib library
--with-openssl=DIR path to OpenSSL library
--with-http_ssl_module enable ngx_http_ssl_module
--without-http_charset_module disable ngx_http_charset_module
--without-http_gzip_module disable ngx_http_gzip_module
--without-http_userid_module disable ngx_http_userid_module
--without-http_access_module disable ngx_http_access_module
--without-http_autoindex_module disable ngx_http_autoindex_module
--without-http_rewrite_module disable ngx_http_rewrite_module
--without-http_proxy_module disable ngx_http_proxy_module
--without-http_fastcgi_module disable ngx_http_fastcgi_module
--http-log-path=PATH set path to the http access log
--http-client-body-temp-path=PATH set path to the http client request body
temporary files path
--http-proxy-temp-path=PATH set path to the http proxy temporary
files path
--http-fastcgi-temp-path=PATH set path to the http fastcgi temporary
files path
--with-cc=PATH set path to C compiler
--with-cpp=PATH set path to C preprocessor
--with-cc-opt=OPTIONS set additional options for C compiler
--with-ld-opt=OPTIONS set additional options for linker
--with-cpu-opt=CPU build for specified CPU, the valid values:
pentium, pentiumpro, pentium4, sparc64
--without-pcre disable PCRE libarary usage
--with-pcre=DIR set path to PCRE library sources
--with-pcre-opt=OPTIONS set additional options for PCRE building
--with-md5=DIR set path to md5 library sources
--with-md5-opt=OPTIONS set additional options for md5 building
--with-md5-asm use md5 assembler sources
--with-zlib=DIR set path to zlib library sources
--with-zlib-opt=OPTIONS set additional options for zlib building
--with-zlib-asm=CPU use zlib assembler sources optimized
for specified CPU, the valid values:
pentium, pentiumpro
--with-openssl=DIR set path to OpenSSL library sources
--with-debug enable the debugging logging
END
@ -201,6 +250,7 @@ if [ $HTTP = NO ]; then
HTTP_STATUS=NO
HTTP_REWRITE=NO
HTTP_PROXY=NO
HTTP_FASTCGI=NO
fi
@ -284,3 +334,45 @@ case ".$NGX_HTTP_LOG_PATH" in
NGX_HTTP_LOG_PATH=$NGX_PREFIX/$NGX_HTTP_LOG_PATH
;;
esac
case ".$NGX_HTTP_CLIENT_TEMP_PATH" in
./*)
;;
.)
NGX_HTTP_CLIENT_TEMP_PATH=$NGX_PREFIX/client_body_temp
;;
*)
NGX_HTTP_CLIENT_TEMP_PATH=$NGX_PREFIX/$NGX_HTTP_CLIENT_TEMP_PATH
;;
esac
case ".$NGX_HTTP_PROXY_TEMP_PATH" in
./*)
;;
.)
NGX_HTTP_PROXY_TEMP_PATH=$NGX_PREFIX/proxy_temp
;;
*)
NGX_HTTP_PROXY_TEMP_PATH=$NGX_PREFIX/$NGX_HTTP_PROXY_TEMP_PATH
;;
esac
case ".$NGX_HTTP_FASTCGI_TEMP_PATH" in
./*)
;;
.)
NGX_HTTP_FASTCGI_TEMP_PATH=$NGX_PREFIX/fastcgi_temp
;;
*)
NGX_HTTP_FASTCGI_TEMP_PATH=$NGX_PREFIX/$NGX_HTTP_FASTCGI_TEMP_PATH
;;
esac

19
auto/os/conf
View File

@ -5,13 +5,13 @@
if test -z "$NGX_PLATFORM"; then
echo "checking for OS"
SYSTEM=`uname -s 2>/dev/null`
RELEASE=`uname -r 2>/dev/null`
MACHINE=`uname -m 2>/dev/null`
NGX_SYSTEM=`uname -s 2>/dev/null`
NGX_RELEASE=`uname -r 2>/dev/null`
NGX_MACHINE=`uname -m 2>/dev/null`
echo " + $SYSTEM $RELEASE $MACHINE"
echo " + $NGX_SYSTEM $NGX_RELEASE $NGX_MACHINE"
NGX_PLATFORM="$SYSTEM:$RELEASE:$MACHINE";
NGX_PLATFORM="$NGX_SYSTEM:$NGX_RELEASE:$NGX_MACHINE";
else
echo "building for $NGX_PLATFORM"
fi
@ -43,6 +43,15 @@ case $NGX_PLATFORM in
esac
case $NGX_MACHINE in
i386|i686|i86pc|amd64)
have=NGX_HAVE_NONALIGNED . auto/have
;;
esac
if [ $NGX_PLATFORM != win32 ]; then
NGX_USER=${NGX_USER:-nobody}

14
auto/sources
View File

@ -110,6 +110,7 @@ OPENSSL_SRCS=src/event/ngx_event_openssl.c
UNIX_INCS="$CORE_INCS $EVENT_INCS src/os/unix"
UNIX_DEPS="$CORE_DEPS $EVENT_DEPS \
src/core/ngx_unix_domain.h \
src/os/unix/ngx_time.h \
src/os/unix/ngx_types.h \
src/os/unix/ngx_errno.h \
@ -125,6 +126,7 @@ UNIX_DEPS="$CORE_DEPS $EVENT_DEPS \
src/os/unix/ngx_process_cycle.h"
UNIX_SRCS="$CORE_SRCS $EVENT_SRCS \
src/core/ngx_unix_domain.c \
src/os/unix/ngx_time.c \
src/os/unix/ngx_errno.c \
src/os/unix/ngx_alloc.c \
@ -203,9 +205,13 @@ NGX_WIN32_ICONS="src/os/win32/nginx.ico src/os/win32/tray.ico"
NGX_WIN32_RC="src/os/win32/nginx.rc"
# the http modules that have their logging formats
# must be after ngx_http_log_module
HTTP_MODULES="ngx_http_module \
ngx_http_core_module \
ngx_http_log_module"
ngx_http_log_module \
ngx_http_upstream_module"
HTTP_CACHE_MODULE=ngx_http_cache_module
@ -231,6 +237,7 @@ HTTP_DEPS="src/http/ngx_http.h \
src/http/ngx_http_config.h \
src/http/ngx_http_core_module.h \
src/http/ngx_http_cache.h \
src/http/ngx_http_upstream.h \
src/http/ngx_http_busy_lock.h \
src/http/ngx_http_log_handler.h"
@ -244,6 +251,7 @@ HTTP_SRCS="src/http/ngx_http.c \
src/http/ngx_http_copy_filter.c \
src/http/ngx_http_log_handler.c \
src/http/ngx_http_request_body.c \
src/http/ngx_http_upstream.c \
src/http/ngx_http_parse_time.c \
src/http/modules/ngx_http_static_handler.c \
src/http/modules/ngx_http_index_handler.c \
@ -308,6 +316,10 @@ HTTP_PROXY_SRCS="src/http/modules/proxy/ngx_http_proxy_handler.c \
# src/http/modules/proxy/ngx_http_proxy_cache.c \
HTTP_FASTCGI_MODULE=ngx_http_fastcgi_module
HTTP_FASTCGI_SRCS=src/http/modules/ngx_http_fastcgi_handler.c
IMAP_INCS="src/imap"
IMAP_DEPS="src/imap/ngx_imap.h"

37
auto/summary
View File

@ -101,14 +101,39 @@ END
fi
echo " nginx path prefix: $NGX_PREFIX"
echo " nginx binary file: $NGX_SBIN_PATH"
echo " nginx configuration file: $NGX_CONF_PATH"
echo " nginx pid file: $NGX_PID_PATH"
if [ $HTTP_SSL = YES ]; then
if [ $OPENSSL = NONE -o $OPENSSL = NO ]; then
cat << END
$0: error: the HTTP SSL module requires the OpenSSL library.
You can either do not enable the module, or install the OpenSSL library
into the system, or build the OpenSSL library statically from the source
with nginx by using --with-openssl=<path> option.
END
exit 1
fi
fi
cat << END
nginx path prefix: $NGX_PREFIX
nginx binary file: $NGX_SBIN_PATH
nginx configuration file: $NGX_CONF_PATH
nginx pid file: $NGX_PID_PATH
END
if test -n "$NGX_ERROR_LOG_PATH"; then
echo " nginx error log file: $NGX_ERROR_LOG_PATH"
else
echo " nginx logs errors to stderr"
fi
echo " nginx http access log file: $NGX_HTTP_LOG_PATH"
echo
cat << END
nginx http access log file: $NGX_HTTP_LOG_PATH
nginx http client request body temporary files: $NGX_HTTP_CLIENT_TEMP_PATH
nginx http proxy temporary files: $NGX_HTTP_PROXY_TEMP_PATH
nginx http fastcgi temporary files: $NGX_HTTP_FASTCGI_TEMP_PATH
END

3
auto/unix
View File

@ -2,6 +2,9 @@
# Copyright (C) Igor Sysoev
have=NGX_HAVE_UNIX_DOMAIN . auto/have
CC_WARN=
ngx_fmt_collect=yes

2
docs/text/LICENSE
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002-2004 Igor Sysoev
* Copyright (C) 2002-2005 Igor Sysoev
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions

124
docs/xml/nginx/changes.xml
View File

@ -6,6 +6,130 @@
title="nginx">
<changes ver="0.1.14" date="18.01.2005">
<change type="feature">
<para lang="ru">
ÐÁÒÁÍÅÔÒÙ Á×ÔÏËÏÎÆÉÇÕÒÁÃÉÉ
--http-client-body-temp-path=PATH,
--http-proxy-temp-path=PATH
É --http-fastcgi-temp-path=PATH
</para>
<para lang="en">
the autoconfiguration directives:
--http-client-body-temp-path=PATH,
--http-proxy-temp-path=PATH,
and --http-fastcgi-temp-path=PATH
</para>
</change>
<change type="change">
<para lang="ru">
ÉÍÑ ËÁÔÁÌÏÇÁ Ó ×ÒÅÍÅÎÎÙÍÉ ÆÁÊÌÁÍÉ, ÓÏÄÅÒÖÁÝÉÅ ÔÅÌÏ ÚÁÐÒÏÓÁ ËÌÉÅÎÔÁ,
ÚÁÄÁ£ÔÓÑ ÄÉÒÅËÔÉ×ÏÊ client_body_temp_path,
ÐÏ ÕÍÏÌÞÁÎÉÀ &lt;prefix&gt;/client_body_temp.
</para>
<para lang="en">
the directory name for the temporary files with the client request body
is specified by directive client_body_temp_path,
by default it is &lt;prefix&gt;/client_body_temp.
</para>
</change>
<change type="feature">
<para lang="ru">
ÍÏÄÕÌØ ngx_http_fastcgi_module É ÄÉÒÅËÔÉ×Ù
fastcgi_pass,
fastcgi_root,
fastcgi_index,
fastcgi_params,
fastcgi_connect_timeout,
fastcgi_send_timeout,
fastcgi_read_timeout,
fastcgi_send_lowat,
fastcgi_header_buffer_size,
fastcgi_buffers,
fastcgi_busy_buffers_size,
fastcgi_temp_path,
fastcgi_max_temp_file_size,
fastcgi_temp_file_write_size,
fastcgi_next_upstream
É fastcgi_x_powered_by.
</para>
<para lang="en">
the ngx_http_fastcgi_module and the directives:
fastcgi_pass,
fastcgi_root,
fastcgi_index,
fastcgi_params,
fastcgi_connect_timeout,
fastcgi_send_timeout,
fastcgi_read_timeout,
fastcgi_send_lowat,
fastcgi_header_buffer_size,
fastcgi_buffers,
fastcgi_busy_buffers_size,
fastcgi_temp_path,
fastcgi_max_temp_file_size,
fastcgi_temp_file_write_size,
fastcgi_next_upstream,
and fastcgi_x_powered_by.
</para>
</change>
<change type="bugfix">
<para lang="ru">
ÏÛÉÂËÁ "[alert] zero size buf";
ÏÛÉÂËÁ ÐÏÑ×ÉÌÁÓØ × 0.1.3.
</para>
<para lang="en">
the "[alert] zero size buf" error;
bug appeared in 0.1.3.
</para>
</change>
<change type="change">
<para lang="ru">
× ÄÉÒÅËÔÉ×Å proxy_pass ÎÕÖÎÏ ÏÂÑÚÁÔÅÌØÎÏ ÕËÁÚÙ×ÁÔØ URI ÐÏÓÌÅ ÉÍÅÎÉ ÈÏÓÔÁ.
</para>
<para lang="en">
the URI must be specified after the host name in the proxy_pass directive.
</para>
</change>
<change type="change">
<para lang="ru">
ÅÓÌÉ × URI ×ÓÔÒÅÞÁÌÓÑ ÓÉÍ×ÏÌ %3F, ÔÏ ÏÎ ÓÞÉÔÁÌÓÑ ÎÁÞÁÌÏÍ ÓÔÒÏËÉ ÁÒÇÕÍÅÎÔÏ×.
</para>
<para lang="en">
the %3F symbol in the URI was considered as the argument string start.
</para>
</change>
<change type="feature">
<para lang="ru">
ÐÏÄÄÅÒÖËÁ unix domain ÓoËÅÔÏ× × ÍÏÄÕÌÅ ngx_http_proxy_module.
</para>
<para lang="en">
the unix domain sockets support in the ngx_http_proxy_module.
</para>
</change>
<change type="feature">
<para lang="ru">
ÄÉÒÅËÔÉ×Ù ssl_engine É ssl_ciphers.<br/>
óÐÁÓÉÂÏ óÅÒÇÅÀ óË×ÏÒÃÏ×Õ ÚÁ SSL-ÁËÓÅÌÅÒÁÔÏÒ.
</para>
<para lang="en">
the ssl_engine and ssl_ciphers directives.<br/>
Thanks to Sergey Skvortsov for SSL-accelerator.
</para>
</change>
</changes>
<changes ver="0.1.13" date="21.12.2004">
<change type="feature">

11
src/core/nginx.c
View File

@ -451,12 +451,15 @@ static void *ngx_core_module_create_conf(ngx_cycle_t *cycle)
if (!(ccf = ngx_pcalloc(cycle->pool, sizeof(ngx_core_conf_t)))) {
return NULL;
}
/* set by pcalloc()
/*
* set by pcalloc()
*
* ccf->pid = NULL;
* ccf->newpid = NULL;
* ccf->priority = 0;
* ccf->pid = NULL;
* ccf->newpid = NULL;
* ccf->priority = 0;
*/
ccf->daemon = NGX_CONF_UNSET;
ccf->master = NGX_CONF_UNSET;
ccf->worker_processes = NGX_CONF_UNSET;

2
src/core/nginx.h
View File

@ -8,7 +8,7 @@
#define _NGINX_H_INCLUDED_
#define NGINX_VER "nginx/0.1.13"
#define NGINX_VER "nginx/0.1.14"
#define NGINX_VAR "NGINX"
#define NGX_NEWPID_EXT ".newbin"

4
src/core/ngx_buf.h
View File

@ -69,7 +69,7 @@ typedef struct {
} ngx_bufs_t;
typedef int (*ngx_output_chain_filter_pt)(void *ctx, ngx_chain_t *out);
typedef ngx_int_t (*ngx_output_chain_filter_pt)(void *ctx, ngx_chain_t *in);
typedef struct {
ngx_buf_t *buf;
@ -141,7 +141,7 @@ ngx_chain_t *ngx_create_chain_of_bufs(ngx_pool_t *pool, ngx_bufs_t *bufs);
ngx_int_t ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in);
ngx_int_t ngx_chain_writer(void *data, ngx_chain_t *in);
ngx_int_t ngx_chain_writer(void *ctx, ngx_chain_t *in);
ngx_int_t ngx_chain_add_copy(ngx_pool_t *pool, ngx_chain_t **chain,
ngx_chain_t *in);

4
src/core/ngx_conf_file.h
View File

@ -239,8 +239,8 @@ char *ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data);
}
#define ngx_conf_merge_str_value(conf, prev, default) \
if (conf.len == 0) { \
if (prev.len) { \
if (conf.data == NULL) { \
if (prev.data) { \
conf.len = prev.len; \
conf.data = prev.data; \
} else { \

29
src/core/ngx_connection.c
View File

@ -18,7 +18,7 @@ ngx_listening_t *ngx_listening_inet_stream_socket(ngx_conf_t *cf,
{
size_t len;
ngx_listening_t *ls;
struct sockaddr_in *addr_in;
struct sockaddr_in *sin;
if (!(ls = ngx_array_push(&cf->cycle->listening))) {
return NULL;
@ -26,13 +26,13 @@ ngx_listening_t *ngx_listening_inet_stream_socket(ngx_conf_t *cf,
ngx_memzero(ls, sizeof(ngx_listening_t));
if (!(addr_in = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in)))) {
if (!(sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in)))) {
return NULL;
}
addr_in->sin_family = AF_INET;
addr_in->sin_addr.s_addr = addr;
addr_in->sin_port = htons(port);
sin->sin_family = AF_INET;
sin->sin_addr.s_addr = addr;
sin->sin_port = htons(port);
ls->addr_text.data = ngx_palloc(cf->pool,
@ -50,8 +50,7 @@ ngx_listening_t *ngx_listening_inet_stream_socket(ngx_conf_t *cf,
ls->fd = (ngx_socket_t) -1;
ls->family = AF_INET;
ls->type = SOCK_STREAM;
ls->protocol = IPPROTO_IP;
ls->sockaddr = (struct sockaddr *) addr_in;
ls->sockaddr = (struct sockaddr *) sin;
ls->socklen = sizeof(struct sockaddr_in);
ls->addr = offsetof(struct sockaddr_in, sin_addr);
ls->addr_text_max_len = INET_ADDRSTRLEN;
@ -65,7 +64,7 @@ ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle)
size_t len;
ngx_uint_t i;
ngx_listening_t *ls;
struct sockaddr_in *addr_in;
struct sockaddr_in *sin;
ls = cycle->listening.elts;
for (i = 0; i < cycle->listening.nelts; i++) {
@ -86,9 +85,9 @@ ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle)
continue;
}
addr_in = (struct sockaddr_in *) ls[i].sockaddr;
sin = (struct sockaddr_in *) ls[i].sockaddr;
if (addr_in->sin_family != AF_INET) {
if (sin->sin_family != AF_INET) {
ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno,
"the inherited socket #%d has "
"unsupported family", ls[i].fd);
@ -105,7 +104,7 @@ ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle)
return NGX_ERROR;
}
ls[i].family = addr_in->sin_family;
ls[i].family = sin->sin_family;
len = ngx_sock_ntop(ls[i].family, ls[i].sockaddr,
ls[i].addr_text.data, INET_ADDRSTRLEN);
if (len == 0) {
@ -113,7 +112,7 @@ ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle)
}
ls[i].addr_text.len = ngx_sprintf(ls[i].addr_text.data + len, ":%d",
ntohs(addr_in->sin_port))
ntohs(sin->sin_port))
- ls[i].addr_text.data;
}
@ -163,7 +162,7 @@ ngx_int_t ngx_open_listening_sockets(ngx_cycle_t *cycle)
continue;
}
s = ngx_socket(ls[i].family, ls[i].type, ls[i].protocol);
s = ngx_socket(ls[i].family, ls[i].type, 0);
if (s == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
@ -313,7 +312,7 @@ void ngx_close_connection(ngx_connection_t *c)
{
ngx_socket_t fd;
if (c->pool == NULL) {
if (c->fd == -1) {
ngx_log_error(NGX_LOG_ALERT, c->log, 0, "connection already closed");
return;
}
@ -388,8 +387,6 @@ void ngx_close_connection(ngx_connection_t *c)
c->fd = (ngx_socket_t) -1;
c->data = NULL;
ngx_destroy_pool(c->pool);
if (ngx_close_socket(fd) == -1) {
/* we use ngx_cycle->log because c->log was in c->pool */

1
src/core/ngx_connection.h
View File

@ -23,7 +23,6 @@ typedef struct {
int family;
int type;
int protocol;
void (*handler)(ngx_connection_t *c); /* handler of accepted
connection */

4
src/core/ngx_core.h
View File

@ -18,6 +18,7 @@ typedef struct ngx_open_file_s ngx_open_file_t;
typedef struct ngx_command_s ngx_command_t;
typedef struct ngx_file_s ngx_file_t;
typedef struct ngx_event_s ngx_event_t;
typedef struct ngx_peers_s ngx_peers_t;
typedef struct ngx_connection_s ngx_connection_t;
typedef void (*ngx_event_handler_pt)(ngx_event_t *ev);
@ -60,6 +61,9 @@ typedef void (*ngx_event_handler_pt)(ngx_event_t *ev);
#include <ngx_rbtree.h>
#include <ngx_times.h>
#include <ngx_inet.h>
#if (NGX_HAVE_UNIX_DOMAIN)
#include <ngx_unix_domain.h>
#endif
#include <ngx_cycle.h>
#include <ngx_process_cycle.h>
#include <ngx_conf_file.h>

10
src/core/ngx_cycle.c
View File

@ -9,7 +9,7 @@
#include <ngx_event.h>
static ngx_int_t ngx_cmp_sockaddr(struct sockaddr *s1, struct sockaddr *s2);
static ngx_int_t ngx_cmp_sockaddr(struct sockaddr *sa1, struct sockaddr *sa2);
static void ngx_clean_old_cycles(ngx_event_t *ev);
@ -531,18 +531,18 @@ ngx_cycle_t *ngx_init_cycle(ngx_cycle_t *old_cycle)
}
static ngx_int_t ngx_cmp_sockaddr(struct sockaddr *s1, struct sockaddr *s2)
static ngx_int_t ngx_cmp_sockaddr(struct sockaddr *sa1, struct sockaddr *sa2)
{
struct sockaddr_in *sin1, *sin2;
/* AF_INET only */
if (s1->sa_family != AF_INET || s2->sa_family != AF_INET) {
if (sa1->sa_family != AF_INET || sa2->sa_family != AF_INET) {
return NGX_DECLINED;
}
sin1 = (struct sockaddr_in *) s1;
sin2 = (struct sockaddr_in *) s2;
sin1 = (struct sockaddr_in *) sa1;
sin2 = (struct sockaddr_in *) sa2;
if (sin1->sin_addr.s_addr != sin2->sin_addr.s_addr) {
return NGX_DECLINED;

63
src/core/ngx_file.c
View File

@ -193,7 +193,7 @@ char *ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ssize_t level;
ngx_uint_t i, n;
ngx_str_t *value;
ngx_path_t *path, **pp, **slot;
ngx_path_t *path, **slot;
slot = (ngx_path_t **) (p + cmd->offset);
@ -209,7 +209,7 @@ char *ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
path->name = value[1];
path->len = 0;
path->gc_handler = (ngx_gc_handler_pt) cmd->post;
path->cleaner = (ngx_gc_handler_pt) cmd->post;
path->conf_file = cf->conf_file->file.name.data;
path->line = cf->conf_file->line;
@ -227,42 +227,65 @@ char *ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
path->level[i++] = 0;
}
*slot = path;
pp = cf->cycle->pathes.elts;
if (ngx_add_path(cf, slot) == NGX_ERROR) {
return NGX_CONF_ERROR;
}
return NGX_CONF_OK;
}
ngx_int_t ngx_add_path(ngx_conf_t *cf, ngx_path_t **slot)
{
ngx_uint_t i, n;
ngx_path_t *path, **p;
path = *slot;
p = cf->cycle->pathes.elts;
for (i = 0; i < cf->cycle->pathes.nelts; i++) {
if (pp[i]->name.len == path->name.len
&& ngx_strcmp(pp[i]->name.data, path->name.data) == 0)
if (p[i]->name.len == path->name.len
&& ngx_strcmp(p[i]->name.data, path->name.data) == 0)
{
for (n = 0; n < 3; n++) {
if (pp[i]->level[n] != path->level[n]) {
if (p[i]->level[n] != path->level[n]) {
if (path->conf_file == NULL) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"the path name \"%V\" in %s:%ui has "
"the same name as default path but "
"the different levels, you need to "
"define default path in http section",
&p[i]->name, p[i]->conf_file, p[i]->line);
return NGX_ERROR;
}
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"the same \"%V\" path name in %s:%ui "
"has the different levels than",
&pp[i]->name, pp[i]->conf_file, pp[i]->line);
return NGX_CONF_ERROR;
"the same path name \"%V\" in %s:%ui "
"has the different levels than",
&p[i]->name, p[i]->conf_file, p[i]->line);
return NGX_ERROR;
}
if (pp[i]->level[n] == 0) {
if (p[i]->level[n] == 0) {
break;
}
}
*slot = pp[i];
*slot = p[i];
return NGX_CONF_OK;
return NGX_OK;
}
}
*slot = path;
if (!(pp = ngx_array_push(&cf->cycle->pathes))) {
return NGX_CONF_ERROR;
if (!(p = ngx_array_push(&cf->cycle->pathes))) {
return NGX_ERROR;
}
*pp = path;
*p = path;
return NGX_CONF_OK;
return NGX_OK;
}

44
src/core/ngx_file.h
View File

@ -35,7 +35,7 @@ struct ngx_path_s {
ngx_str_t name;
ngx_uint_t len;
ngx_uint_t level[3];
ngx_gc_handler_pt gc_handler;
ngx_gc_handler_pt cleaner;
u_char *conf_file;
ngx_uint_t line;
@ -58,6 +58,7 @@ ngx_int_t ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path,
ngx_pool_t *pool, int persistent);
void ngx_create_hashed_filename(ngx_file_t *file, ngx_path_t *path);
ngx_int_t ngx_create_path(ngx_file_t *file, ngx_path_t *path);
ngx_int_t ngx_add_path(ngx_conf_t *cf, ngx_path_t **slot);
ngx_int_t ngx_create_pathes(ngx_cycle_t *cycle, ngx_uid_t user);
void ngx_init_temp_number();
@ -66,19 +67,34 @@ ngx_uint_t ngx_next_temp_number(ngx_uint_t collision);
char *ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
#define ngx_conf_merge_path_value(conf, prev, path, l1, l2, l3, pool) \
if (conf == NULL) { \
if (prev == NULL) { \
ngx_test_null(conf, ngx_palloc(pool, sizeof(ngx_path_t)), NULL); \
conf->name.len = sizeof(path) - 1; \
conf->name.data = (u_char *) path; \
conf->level[0] = l1; \
conf->level[1] = l2; \
conf->level[2] = l3; \
conf->len = l1 + l2 + l3 + (l1 ? 1:0) + (l2 ? 1:0) + (l3 ? 1:0); \
} else { \
conf = prev; \
} \
#define ngx_conf_merge_path_value(curr, prev, path, l1, l2, l3, clean, cf) \
if (curr == NULL) { \
if (prev == NULL) { \
if (!(curr = ngx_palloc(cf->pool, sizeof(ngx_path_t)))) { \
return NGX_CONF_ERROR; \
} \
\
curr->name.len = sizeof(path) - 1; \
curr->name.data = (u_char *) path; \
\
if (ngx_conf_full_name(cf->cycle, &curr->name) == NGX_ERROR) { \
return NGX_CONF_ERROR; \
} \
\
curr->level[0] = l1; \
curr->level[1] = l2; \
curr->level[2] = l3; \
curr->len = l1 + l2 + l3 + (l1 ? 1:0) + (l2 ? 1:0) + (l3 ? 1:0); \
curr->cleaner = clean; \
curr->conf_file = NULL; \
\
if (ngx_add_path(cf, &curr) == NGX_ERROR) { \
return NGX_CONF_ERROR; \
} \
\
} else { \
curr = prev; \
} \
}

302
src/core/ngx_inet.c
View File

@ -4,9 +4,10 @@
*/
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_event.h>
#include <ngx_event_connect.h>
/*
@ -16,7 +17,7 @@
* and they are faster by 1.5-2.5 times, so it is worth to keep them.
*
* By the way, the implementation using ngx_sprintf() is faster by 2.5-3 times
* than using FreeBSD libc's snrpintf().
* than using FreeBSD libc's snprintf().
*/
@ -64,13 +65,13 @@ static ngx_inline size_t ngx_sprint_uchar(u_char *text, u_char c, size_t len)
/* AF_INET only */
size_t ngx_sock_ntop(int family, struct sockaddr *addr, u_char *text,
size_t ngx_sock_ntop(int family, struct sockaddr *sa, u_char *text,
size_t len)
{
u_char *p;
size_t n;
ngx_uint_t i;
struct sockaddr_in *addr_in;
struct sockaddr_in *sin;
if (len == 0) {
return 0;
@ -80,8 +81,8 @@ size_t ngx_sock_ntop(int family, struct sockaddr *addr, u_char *text,
return 0;
}
addr_in = (struct sockaddr_in *) addr;
p = (u_char *) &addr_in->sin_addr;
sin = (struct sockaddr_in *) sa;
p = (u_char *) &sin->sin_addr;
if (len > INET_ADDRSTRLEN) {
len = INET_ADDRSTRLEN;
@ -216,56 +217,259 @@ ngx_int_t ngx_ptocidr(ngx_str_t *text, void *cidr)
}
#if 0
ngx_int_t ngx_inet_addr_port(ngx_conf_t *cf, ngx_command_t *cmd,
ngx_str_t *addr_port)
ngx_peers_t *ngx_inet_upstream_parse(ngx_conf_t *cf, ngx_inet_upstream_t *u)
{
u_char *host;
ngx_int_t port;
ngx_uint_t p;
struct hostent *h;
char *err;
u_char *host;
in_addr_t in_addr;
ngx_uint_t i, len;
ngx_peers_t *peers;
struct hostent *h;
struct sockaddr_in *sin;
err = ngx_inet_parse_host_port(u);
if (err) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"%s in upstream \"%V\"", err, &u->name);
return NULL;
}
if (u->default_port) {
if (u->default_port_value == 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"no port in upstream \"%V\"", &u->name);
return NULL;
}
u->port = u->default_port_value;
if (!(u->port_text.data = ngx_palloc(cf->pool, sizeof("65536") - 1))) {
return NULL;
}
u->port_text.len = ngx_sprintf(u->port_text.data, "%d",
u->default_port_value)
- u->port_text.data;
} else if (u->port) {
if (u->port == u->default_port_value) {
u->default_port = 1;
}
} else {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"no port in upstream \"%V\"", &u->name);
return NULL;
}
if (u->host.len == 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"no host in upstream \"%V\"", &u->name);
return NULL;
}
u->port = htons(u->port);
if (!(host = ngx_palloc(cf->pool, u->host.len + 1))) {
return NULL;
}
ngx_cpystrn(host, u->host.data, u->host.len + 1);
/* AF_INET only */
in_addr = inet_addr((char *) host);
if (in_addr == INADDR_NONE) {
h = gethostbyname((char *) host);
if (h == NULL || h->h_addr_list[0] == NULL) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"host %s is not found in upstream \"%V\"",
host, &u->name);
return NULL;
}
for (i = 0; h->h_addr_list[i] != NULL; i++) { /* void */ }
/* MP: ngx_shared_palloc() */
peers = ngx_pcalloc(cf->pool,
sizeof(ngx_peers_t) + sizeof(ngx_peer_t) * (i - 1));
if (peers == NULL) {
return NULL;
}
peers->number = i;
peers->weight = 1;
for (i = 0; h->h_addr_list[i] != NULL; i++) {
if (!(sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in)))) {
return NULL;
}
sin->sin_family = AF_INET;
sin->sin_port = u->port;
sin->sin_addr.s_addr = *(in_addr_t *)(h->h_addr_list[i]);
peers->peer[i].sockaddr = (struct sockaddr *) sin;
peers->peer[i].socklen = sizeof(struct sockaddr_in);
len = INET_ADDRSTRLEN - 1 + 1 + u->port_text.len;
if (!(peers->peer[i].name.data = ngx_palloc(cf->pool, len))) {
return NULL;
}
len = ngx_sock_ntop(AF_INET, (struct sockaddr *) sin,
peers->peer[i].name.data, len);
peers->peer[i].name.data[len++] = ':';
ngx_memcpy(peers->peer[i].name.data + len,
u->port_text.data, u->port_text.len);
peers->peer[i].name.len = len + u->port_text.len;
peers->peer[i].uri_separator = "";
peers->peer[i].weight = 1;
peers->peer[i].max_fails = 1;
peers->peer[i].fail_timeout = 60;
}
} else {
/* MP: ngx_shared_palloc() */
if (!(peers = ngx_pcalloc(cf->pool, sizeof(ngx_peers_t)))) {
return NULL;
}
if (!(sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in)))) {
return NULL;
}
peers->number = 1;
sin->sin_family = AF_INET;
sin->sin_port = u->port;
sin->sin_addr.s_addr = in_addr;
peers->peer[0].sockaddr = (struct sockaddr *) sin;
peers->peer[0].socklen = sizeof(struct sockaddr_in);
len = u->host.len + 1 + u->port_text.len;
peers->peer[0].name.len = len;
if (!(peers->peer[0].name.data = ngx_palloc(cf->pool, len))) {
return NULL;
}
len = u->host.len;
ngx_memcpy(peers->peer[0].name.data, u->host.data, len);
peers->peer[0].name.data[len++] = ':';
ngx_memcpy(peers->peer[0].name.data + len,
u->port_text.data, u->port_text.len);
peers->peer[0].uri_separator = "";
}
return peers;
}
char *ngx_inet_parse_host_port(ngx_inet_upstream_t *u)
{
size_t i;
ngx_int_t port;
ngx_str_t *url;
url = &u->url;
if (u->port_only) {
i = 0;
} else {
if (url->data[0] == ':' || url->data[0] == '/') {
return "invalid host";
}
i = 1;
}
u->host.data = url->data;
u->host_header = *url;
for (/* void */; i < url->len; i++) {
if (url->data[i] == ':') {
u->port_text.data = &url->data[i] + 1;
u->host.len = i;
if (!u->uri_part) {
u->port_text.len = &url->data[url->len] - u->port_text.data;
break;
}
}
if (url->data[i] == '/') {
u->uri.data = &url->data[i];
u->uri.len = url->len - i;
u->host_header.len = i;
if (u->host.len == 0) {
u->host.len = i;
}
if (u->port_text.data == NULL) {
u->default_port = 1;
return NULL;
}
u->port_text.len = &url->data[i] - u->port_text.data;
if (u->port_text.len == 0) {
return "invalid port";
}
for (p = 0; p < addr_port->len; p++) {
if (addr_port->data[p] == ':') {
break;
}
}
in_addr->host.len = p;
if (!(in_addr->host.data = ngx_palloc(pool, p + 1))) {
return NGX_ERROR;
if (u->port_text.data == NULL) {
port = ngx_atoi(url->data, url->len);
if (port == NGX_ERROR) {
u->default_port = 1;
u->host.len = url->len;
return NULL;
}
u->port_text = *url;
u->wildcard = 1;
} else {
if (u->port_text.len == 0) {
return "no URI";
}
port = ngx_atoi(u->port_text.data, u->port_text.len);
if (port == NGX_ERROR || port < 1 || port > 65536) {
return "invalid port";
}
}
ngx_cpystrn(in_addr->host.data, addr_port->data, p + 1);
u->port = (in_port_t) port;
if (p == addr_port->len) {
p = 0;
}
port = ngx_atoi(&addr[p], args[1].len - p);
if (port == NGX_ERROR && p == 0) {
/* default port */
iap->port = 0;
} else if ((port == NGX_ERROR && p != 0) /* "listen host:NONNUMBER" */
|| (port < 1 || port > 65536)) { /* "listen 99999" */
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid port \"%s\" in \"%s\" directive, "
"it must be a number between 1 and 65535",
&addr[p], cmd->name.data);
return NGX_CONF_ERROR;
} else if (p == 0) {
ls->addr = INADDR_ANY;
ls->port = (in_port_t) port;
return NGX_CONF_OK;
}
return NGX_OK;
return NULL;
}
#endif

29
src/core/ngx_inet.h
View File

@ -8,17 +8,44 @@
#define _NGX_INET_H_INCLUDED_
#include <ngx_config.h>
#include <ngx_core.h>
typedef struct {
in_addr_t addr;
in_addr_t mask;
} ngx_inet_cidr_t;
size_t ngx_sock_ntop(int family, struct sockaddr *addr, u_char *text,
typedef struct {
ngx_str_t name; /* "schema:host:port/uri" */
ngx_str_t url; /* "host:port/uri" */
ngx_str_t host;
ngx_str_t uri;
ngx_str_t host_header; /* "host:port" */
ngx_str_t port_text; /* "port" */
in_port_t port;
in_port_t default_port_value;
unsigned default_port:1;
unsigned wildcard:1;
unsigned uri_part:1;
unsigned port_only:1;
} ngx_inet_upstream_t;
size_t ngx_sock_ntop(int family, struct sockaddr *sa, u_char *text,
size_t len);
size_t ngx_inet_ntop(int family, void *addr, u_char *text, size_t len);
ngx_int_t ngx_ptocidr(ngx_str_t *text, void *cidr);
ngx_peers_t *ngx_inet_upstream_parse(ngx_conf_t *cf, ngx_inet_upstream_t *u);
char *ngx_inet_parse_host_port(ngx_inet_upstream_t *u);
#endif /* _NGX_INET_H_INCLUDED_ */

2
src/core/ngx_output_chain.c
View File

@ -80,7 +80,7 @@ ngx_int_t ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
if (bsize == 0 && !ngx_buf_special(ctx->in->buf)) {
ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0,
"zero size buf");
"zero size buf in output");
ngx_debug_point();

4
src/core/ngx_regex.c
View File

@ -54,11 +54,11 @@ ngx_regex_t *ngx_regex_compile(ngx_str_t *pattern, ngx_int_t options,
if (re == NULL) {
if ((size_t) erroff == pattern->len) {
ngx_snprintf(err->data, err->len - 1,
"pcre_compile() failed: %s in \"%s\"",
"pcre_compile() failed: %s in \"%s\"%Z",
errstr, pattern->data);
} else {
ngx_snprintf(err->data, err->len - 1,
"pcre_compile() failed: %s in \"%s\" at \"%s\"",
"pcre_compile() failed: %s in \"%s\" at \"%s\"%Z",
errstr, pattern->data, pattern->data + erroff);
}
}

6
src/core/ngx_string.c
View File

@ -86,7 +86,11 @@ u_char *ngx_snprintf(u_char *buf, size_t max, const char *fmt, ...)
u_char *ngx_vsnprintf(u_char *buf, size_t max, const char *fmt, va_list args)
{
u_char *p, zero, *last, temp[NGX_INT64_LEN];
u_char *p, zero, *last, temp[NGX_INT64_LEN + 1];
/*
* really we need temp[NGX_INT64_LEN] only,
* but icc shows the warning
*/
int d;
size_t len;
uint32_t ui32;

2
src/core/ngx_string.h
View File

@ -64,7 +64,7 @@ typedef struct {
/* msvc and icc compile memcpy() to the inline "rep movs" */
#define ngx_memcpy(dst, src, n) memcpy(dst, src, n)
#define ngx_cpymem(dst, src, n) ((u_char *) memcpy(dst, src, n)) + n
#define ngx_cpymem(dst, src, n) ((u_char *) memcpy(dst, src, n)) + (n)
/* msvc and icc compile memcmp() to the inline loop */

84
src/core/ngx_unix_domain.c Normal file
View File

@ -0,0 +1,84 @@
/*
* Copyright (C) Igor Sysoev
*/
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_event.h>
#include <ngx_event_connect.h>
/* Solaris has predefined "#define sun 1" */
#undef sun
ngx_peers_t *ngx_unix_upstream_parse(ngx_conf_t *cf,
ngx_unix_domain_upstream_t *u)
{
size_t len;
ngx_uint_t i;
ngx_peers_t *peers;
struct sockaddr_un *sun;
len = u->url.len - 5;
if (u->uri_part) {
for (i = 5; i < u->url.len; i++) {
if (u->url.data[i] == ':') {
len = i - 5;
u->uri.len = u->url.len - 5 - len - 1;
u->uri.data = u->url.data + 5 + len + 1;
break;
}
}
if (u->uri.len == 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"the unix domain upstream \"%V\" has no URI",
&u->name);
return NULL;
}
}
if (len == 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"the unix domain socket \"%V\" has no path",
&u->name);
return NULL;
}
if (len + 1 > sizeof(sun->sun_path)) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"the unix domain socket path \"%V\" is too long",
&u->name);
return NULL;
}
/* MP: ngx_shared_palloc() */
if (!(peers = ngx_pcalloc(cf->pool, sizeof(ngx_peers_t)))) {
return NULL;
}
if (!(sun = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_un)))) {
return NULL;
}
peers->number = 1;
sun->sun_family = AF_UNIX;
ngx_cpystrn((u_char *) sun->sun_path, u->url.data + 5, len + 1);
peers->peer[0].sockaddr = (struct sockaddr *) sun;
peers->peer[0].socklen = sizeof(struct sockaddr_un);
peers->peer[0].name.len = 5 + len;
peers->peer[0].name.data = u->url.data;
peers->peer[0].uri_separator = ":";
return peers;
}

29
src/core/ngx_unix_domain.h Normal file
View File

@ -0,0 +1,29 @@
/*
* Copyright (C) Igor Sysoev
*/
#ifndef _NGX_UNIX_DOMAIN_H_INCLUDED_
#define _NGX_UNIX_DOMAIN_H_INCLUDED_
#include <ngx_config.h>
#include <ngx_core.h>
typedef struct {
ngx_str_t name; /* "schema:unix:path:/uri" */
ngx_str_t url; /* "unix:path:/uri" */
ngx_str_t uri;
ngx_uint_t uri_part; /* unsigned uri_part:1; */
} ngx_unix_domain_upstream_t;
ngx_peers_t *ngx_unix_upstream_parse(ngx_conf_t *cf,
ngx_unix_domain_upstream_t *u);
#endif /* _NGX_UNIX_DOMAIN_H_INCLUDED_ */

6
src/event/ngx_event_accept.c
View File

@ -313,12 +313,12 @@ void ngx_event_accept(ngx_event_t *ev)
uint32_t *addr;
in_addr_t i;
struct sockaddr_in *addr_in;
struct sockaddr_in *sin;
addr_in = (struct sockaddr_in *) sa;
sin = (struct sockaddr_in *) sa;
addr = ecf->debug_connection.elts;
for (i = 0; i < ecf->debug_connection.nelts; i++) {
if (addr[i] == addr_in->sin_addr.s_addr) {
if (addr[i] == sin->sin_addr.s_addr) {
log->log_level = NGX_LOG_DEBUG_CONNECTION|NGX_LOG_DEBUG_ALL;
break;
}

2
src/event/ngx_event_acceptex.c
View File

@ -92,7 +92,7 @@ int ngx_event_post_acceptex(ngx_listening_t *ls, int n)
/* TODO: look up reused sockets */
s = ngx_socket(ls->family, ls->type, ls->protocol);
s = ngx_socket(ls->family, ls->type, 0);
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ls->log, 0,
ngx_socket_n " s:%d", s);

73
src/event/ngx_event_connect.c
View File

@ -25,7 +25,6 @@ ngx_int_t ngx_event_connect_peer(ngx_peer_connection_t *pc)
ngx_event_t *rev, *wev;
ngx_connection_t *c;
ngx_event_conf_t *ecf;
struct sockaddr_in addr;
now = ngx_time();
@ -54,7 +53,7 @@ ngx_int_t ngx_event_connect_peer(ngx_peer_connection_t *pc)
pc->connection = NULL;
if (pc->peers->number == 1) {
peer = &pc->peers->peers[0];
peer = &pc->peers->peer[0];
} else {
@ -64,45 +63,47 @@ ngx_int_t ngx_event_connect_peer(ngx_peer_connection_t *pc)
/* it's a first try - get a current peer */
pc->cur_peer = pc->peers->current++;
pc->cur_peer = pc->peers->current;
pc->peers->weight--;
if (pc->peers->weight == 0) {
pc->peers->current++;
}
if (pc->peers->current >= pc->peers->number) {
pc->peers->current = 0;
}
if (pc->peers->weight == 0) {
pc->peers->weight = pc->peers->peer[pc->peers->current].weight;
}
}
if (pc->peers->max_fails == 0) {
peer = &pc->peers->peers[pc->cur_peer];
for ( ;; ) {
peer = &pc->peers->peer[pc->cur_peer];
} else {
if (peer->fails <= peer->max_fails) {
break;
}
/* the peers support a fault tolerance */
if (now - peer->accessed > peer->fail_timeout) {
peer->fails = 0;
break;
}
for ( ;; ) {
peer = &pc->peers->peers[pc->cur_peer];
pc->cur_peer++;
if (peer->fails <= pc->peers->max_fails) {
break;
}
if (pc->cur_peer >= pc->peers->number) {
pc->cur_peer = 0;
}
if (now - peer->accessed > pc->peers->fail_timeout) {
peer->fails = 0;
break;
}
pc->tries--;
pc->cur_peer++;
if (pc->tries == 0) {
/* ngx_unlock_mutex(pc->peers->mutex); */
if (pc->cur_peer >= pc->peers->number) {
pc->cur_peer = 0;
}
pc->tries--;
if (pc->tries == 0) {
/* ngx_unlock_mutex(pc->peers->mutex); */
return NGX_ERROR;
}
return NGX_ERROR;
}
}
}
@ -110,7 +111,7 @@ ngx_int_t ngx_event_connect_peer(ngx_peer_connection_t *pc)
/* ngx_unlock_mutex(pc->peers->mutex); */
s = ngx_socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
s = ngx_socket(peer->sockaddr->sa_family, SOCK_STREAM, 0);
if (s == -1) {
ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
@ -257,16 +258,10 @@ ngx_int_t ngx_event_connect_peer(ngx_peer_connection_t *pc)
}
}
ngx_memzero(&addr, sizeof(struct sockaddr_in));
addr.sin_family = AF_INET;
addr.sin_port = peer->port;
addr.sin_addr.s_addr = peer->addr;
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0,
"connect to %V, #%d", &peer->addr_port_text, c->number);
"connect to %V, #%d", &peer->name, c->number);
rc = connect(s, (struct sockaddr *) &addr, sizeof(struct sockaddr_in));
rc = connect(s, peer->sockaddr, peer->socklen);
if (rc == -1) {
err = ngx_socket_errno;
@ -367,8 +362,8 @@ void ngx_event_connect_peer_failed(ngx_peer_connection_t *pc)
/* ngx_lock_mutex(pc->peers->mutex); */
pc->peers->peers[pc->cur_peer].fails++;
pc->peers->peers[pc->cur_peer].accessed = now;
pc->peers->peer[pc->cur_peer].fails++;
pc->peers->peer[pc->cur_peer].accessed = now;
/* ngx_unlock_mutex(pc->peers->mutex); */

38
src/event/ngx_event_connect.h
View File

@ -17,34 +17,40 @@
typedef struct {
in_addr_t addr;
ngx_str_t host;
in_port_t port;
ngx_str_t addr_port_text;
struct sockaddr *sockaddr;
socklen_t socklen;
ngx_int_t fails;
time_t accessed;
ngx_str_t name;
char *uri_separator;
ngx_uint_t weight;
ngx_uint_t fails;
time_t accessed;
ngx_uint_t max_fails;
time_t fail_timeout;
} ngx_peer_t;
typedef struct {
ngx_int_t current;
ngx_int_t number;
ngx_int_t max_fails;
time_t fail_timeout;
ngx_int_t last_cached;
struct ngx_peers_s {
ngx_uint_t current;
ngx_uint_t weight;
ngx_uint_t number;
ngx_uint_t last_cached;
/* ngx_mutex_t *mutex; */
ngx_connection_t **cached;
ngx_peer_t peers[1];
} ngx_peers_t;
ngx_peer_t peer[1];
};
typedef struct {
ngx_peers_t *peers;
ngx_int_t cur_peer;
ngx_int_t tries;
ngx_uint_t cur_peer;
ngx_uint_t tries;
ngx_connection_t *connection;
#if (NGX_THREADS)

47
src/event/ngx_event_openssl.c
View File

@ -8,6 +8,8 @@
#include <ngx_core.h>
#include <ngx_event.h>
#include <openssl/engine.h>
static void ngx_ssl_write_handler(ngx_event_t *wev);
static ssize_t ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size);
@ -16,8 +18,11 @@ static void ngx_ssl_read_handler(ngx_event_t *rev);
ngx_int_t ngx_ssl_init(ngx_log_t *log)
{
ENGINE *engine;
SSL_library_init();
SSL_load_error_strings();
ENGINE_load_builtin_engines();
return NGX_OK;
}
@ -71,6 +76,48 @@ ssize_t ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_read: %d", n);
if (n > 0) {
#if (NGX_DEBUG)
if (!c->ssl->handshaked && SSL_is_init_finished(c->ssl->ssl)) {
char buf[129], *s, *d;
SSL_CIPHER *cipher;
c->ssl->handshaked = 1;
cipher = SSL_get_current_cipher(c->ssl->ssl);
if (cipher) {
SSL_CIPHER_description(cipher, &buf[1], 128);
for (s = &buf[1], d = buf; *s; s++) {
if (*s == ' ' && *d == ' ') {
continue;
}
if (*s == '\n' || *s == '\r') {
continue;
}
*++d = *s;
}
if (*d != ' ') {
d++;
}
*d = '\0';
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
"SSL cipher: \"%s\"", &buf[1]);
} else {
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
"SSL no shared ciphers");
}
}
#endif
if (c->ssl->saved_write_handler) {
c->write->event_handler = c->ssl->saved_write_handler;

4
src/event/ngx_event_openssl.h
View File

@ -25,6 +25,10 @@ typedef struct {
unsigned no_rcv_shut:1;
unsigned no_send_shut:1;
unsigned shutdown_set:1;
#if (NGX_DEBUG)
unsigned handshaked:1;
#endif
} ngx_ssl_t;

40
src/event/ngx_event_pipe.c
View File

@ -379,7 +379,7 @@ ngx_int_t ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
ngx_int_t ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
{
off_t bsize;
size_t bsize;
ngx_uint_t flush;
ngx_buf_t *b;
ngx_chain_t *out, **ll, *cl, *tl;
@ -433,16 +433,18 @@ ngx_int_t ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
break;
}
/* bsize is the size of the busy bufs */
/* bsize is the size of the busy recycled bufs */
bsize = 0;
for (cl = p->busy; cl; cl = cl->next) {
bsize += cl->buf->end - cl->buf->start;
if (cl->buf->recycled) {
bsize += cl->buf->end - cl->buf->start;
}
}
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
"pipe write busy: %O", bsize);
"pipe write busy: %uz", bsize);
out = NULL;
ll = NULL;
@ -452,19 +454,23 @@ ngx_int_t ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
if (p->out) {
cl = p->out;
if (bsize + ngx_buf_size(cl->buf) > p->busy_size) {
if (cl->buf->recycled
&& bsize + cl->buf->last - cl->buf->pos > p->busy_size)
{
flush = 1;
break;
}
p->out = p->out->next;
ngx_event_pipe_free_shadow_raw_buf(&p->free_raw_bufs,
cl->buf);
ngx_event_pipe_free_shadow_raw_buf(&p->free_raw_bufs, cl->buf);
} else if (!p->cachable && p->in) {
cl = p->in;
if (bsize + ngx_buf_size(cl->buf) > p->busy_size) {
if (cl->buf->recycled
&& bsize + cl->buf->last - cl->buf->pos > p->busy_size)
{
flush = 1;
break;
}
@ -475,7 +481,10 @@ ngx_int_t ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
break;
}
bsize += ngx_buf_size(cl->buf);
if (cl->buf->recycled) {
bsize += cl->buf->last - cl->buf->pos;
}
cl->next = NULL;
ngx_chain_add_link(out, ll, cl);
}
@ -618,8 +627,6 @@ static ngx_int_t ngx_event_pipe_write_chain_to_temp_file(ngx_event_pipe_t *p)
b->in_file = 1;
b->temp_file = 1;
b->temporary = 0;
b->recycled = 0;
ngx_chain_add_link(p->out, p->last_out, cl);
@ -668,7 +675,7 @@ ngx_int_t ngx_event_pipe_copy_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
ngx_alloc_link_and_set_buf(cl, b, p->pool, NGX_ERROR);
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0, "buf #%d", b->num);
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0, "input buf #%d", b->num);
ngx_chain_add_link(p->in, p->last_in, cl);
@ -781,7 +788,14 @@ static ngx_int_t ngx_event_pipe_drain_chains(ngx_event_pipe_t *p)
b = cl->buf->shadow;
b->pos = b->last = b->start;
b->shadow = NULL;
ngx_alloc_link_and_set_buf(tl, b, p->pool, NGX_ABORT);
if (!(tl = ngx_alloc_chain_link(p->pool))) {
return NGX_ABORT;
}
tl->buf = b;
tl->next = NULL;
ngx_event_pipe_add_free_buf(&p->free_raw_bufs, tl);
cl->buf->last_shadow = 0;

8
src/http/modules/ngx_http_access_handler.c
View File

@ -80,7 +80,7 @@ ngx_module_t ngx_http_access_module = {
static ngx_int_t ngx_http_access_handler(ngx_http_request_t *r)
{
ngx_uint_t i;
struct sockaddr_in *addr_in;
struct sockaddr_in *sin;
ngx_http_access_rule_t *rule;
ngx_http_access_loc_conf_t *alcf;
@ -92,16 +92,16 @@ static ngx_int_t ngx_http_access_handler(ngx_http_request_t *r)
/* AF_INET only */
addr_in = (struct sockaddr_in *) r->connection->sockaddr;
sin = (struct sockaddr_in *) r->connection->sockaddr;
rule = alcf->rules->elts;
for (i = 0; i < alcf->rules->nelts; i++) {
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"%08XD %08XD %08XD",
addr_in->sin_addr.s_addr, rule[i].mask, rule[i].addr);
sin->sin_addr.s_addr, rule[i].mask, rule[i].addr);
if ((addr_in->sin_addr.s_addr & rule[i].mask) == rule[i].addr) {
if ((sin->sin_addr.s_addr & rule[i].mask) == rule[i].addr) {
if (rule[i].deny) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"access forbidden by rule");

1968
src/http/modules/ngx_http_fastcgi_handler.c Normal file
View File

File diff suppressed because it is too large Load Diff

116
src/http/modules/ngx_http_gzip_filter.c
View File

@ -80,12 +80,13 @@ static ngx_int_t ngx_http_gzip_proxied(ngx_http_request_t *r,
static void *ngx_http_gzip_filter_alloc(void *opaque, u_int items,
u_int size);
static void ngx_http_gzip_filter_free(void *opaque, void *address);
static int ngx_http_gzip_error(ngx_http_gzip_ctx_t *ctx);
static void ngx_http_gzip_error(ngx_http_gzip_ctx_t *ctx);
static u_char *ngx_http_gzip_log_ratio(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static ngx_int_t ngx_http_gzip_add_log_formats(ngx_conf_t *cf);
static ngx_int_t ngx_http_gzip_pre_conf(ngx_conf_t *cf);
static ngx_int_t ngx_http_gzip_filter_init(ngx_cycle_t *cycle);
static void *ngx_http_gzip_create_conf(ngx_conf_t *cf);
static char *ngx_http_gzip_merge_conf(ngx_conf_t *cf,
@ -205,7 +206,7 @@ static ngx_command_t ngx_http_gzip_filter_commands[] = {
static ngx_http_module_t ngx_http_gzip_filter_module_ctx = {
ngx_http_gzip_pre_conf, /* pre conf */
ngx_http_gzip_add_log_formats, /* pre conf */
NULL, /* create main configuration */
NULL, /* init main configuration */
@ -229,22 +230,23 @@ ngx_module_t ngx_http_gzip_filter_module = {
static ngx_http_log_op_name_t ngx_http_gzip_log_fmt_ops[] = {
{ ngx_string("gzip_ratio"), NGX_INT32_LEN + 3, ngx_http_gzip_log_ratio },
{ ngx_null_string, 0, NULL }
{ ngx_string("gzip_ratio"), NGX_INT32_LEN + 3,
NULL, NULL, ngx_http_gzip_log_ratio },
{ ngx_null_string, 0, NULL, NULL, NULL }
};
static u_char gzheader[10] = { 0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0, 3 };
#if (NGX_HAVE_LITTLE_ENDIAN)
#if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
struct gztrailer {
uint32_t crc32;
uint32_t zlen;
};
#else /* NGX_HAVE_BIG_ENDIAN */
#else /* NGX_HAVE_BIG_ENDIAN || !NGX_HAVE_NONALIGNED */
struct gztrailer {
u_char crc32[4];
@ -497,11 +499,13 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
if (rc != Z_OK) {
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
"deflateInit2() failed: %d", rc);
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
if (!(b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)))) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
b->memory = 1;
@ -509,7 +513,8 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
b->last = b->pos + 10;
if (!(cl = ngx_alloc_chain_link(r->pool))) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
cl->buf = b;
cl->next = NULL;
@ -522,7 +527,8 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
*/
if (ngx_http_next_body_filter(r, cl) == NGX_ERROR) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
ctx->last_out = &ctx->out;
@ -533,7 +539,8 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
if (in) {
if (ngx_chain_add_copy(r->pool, &ctx->in, in) == NGX_ERROR) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
}
@ -607,7 +614,8 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ctx->out_buf = ngx_create_temp_buf(r->pool,
conf->bufs.size);
if (ctx->out_buf == NULL) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
ctx->out_buf->tag = (ngx_buf_tag_t)
@ -634,7 +642,8 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
if (rc != Z_OK && rc != Z_STREAM_END) {
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
"deflate() failed: %d, %d", ctx->flush, rc);
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@ -663,7 +672,8 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
/* zlib wants to output some more gzipped data */
if (!(cl = ngx_alloc_chain_link(r->pool))) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
cl->buf = ctx->out_buf;
cl->next = NULL;
@ -683,7 +693,8 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ctx->flush = Z_NO_FLUSH;
if (!(cl = ngx_alloc_chain_link(r->pool))) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
cl->buf = ctx->out_buf;
cl->next = NULL;
@ -703,13 +714,15 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
if (rc != Z_OK) {
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
"deflateEnd() failed: %d", rc);
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
ngx_pfree(r->pool, ctx->preallocated);
if (!(cl = ngx_alloc_chain_link(r->pool))) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
cl->buf = ctx->out_buf;
cl->next = NULL;
@ -723,13 +736,15 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
} else {
if (!(b = ngx_create_temp_buf(r->pool, 8))) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
b->last_buf = 1;
if (!(cl = ngx_alloc_chain_link(r->pool))) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
cl->buf = b;
cl->next = NULL;
@ -739,19 +754,21 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
b->last += 8;
}
#if (NGX_HAVE_LITTLE_ENDIAN)
#if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
trailer->crc32 = ctx->crc32;
trailer->zlen = ctx->zin;
#else
trailer->crc32[0] = ctx->crc32 & 0xff;
trailer->crc32[1] = (ctx->crc32 >> 8) & 0xff;
trailer->crc32[2] = (ctx->crc32 >> 16) & 0xff;
trailer->crc32[3] = (ctx->crc32 >> 24) & 0xff;
trailer->zlen[0] = ctx->zin & 0xff;
trailer->zlen[1] = (ctx->zin >> 8) & 0xff;
trailer->zlen[2] = (ctx->zin >> 16) & 0xff;
trailer->zlen[3] = (ctx->zin >> 24) & 0xff;
#else
trailer->crc32[0] = (u_char) (ctx->crc32 & 0xff);
trailer->crc32[1] = (u_char) ((ctx->crc32 >> 8) & 0xff);
trailer->crc32[2] = (u_char) ((ctx->crc32 >> 16) & 0xff);
trailer->crc32[3] = (u_char) ((ctx->crc32 >> 24) & 0xff);
trailer->zlen[0] = (u_char) (ctx->zin & 0xff);
trailer->zlen[1] = (u_char) ((ctx->zin >> 8) & 0xff);
trailer->zlen[2] = (u_char) ((ctx->zin >> 16) & 0xff);
trailer->zlen[3] = (u_char) ((ctx->zin >> 24) & 0xff);
#endif
ctx->zstream.avail_in = 0;
@ -764,7 +781,8 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
if (conf->no_buffer && ctx->in == NULL) {
if (!(cl = ngx_alloc_chain_link(r->pool))) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
cl->buf = ctx->out_buf;
cl->next = NULL;
@ -791,7 +809,8 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
*/
if (last == NGX_ERROR) {
return ngx_http_gzip_error(ctx);
ngx_http_gzip_error(ctx);
return NGX_ERROR;
}
ngx_chain_update_chains(&ctx->free, &ctx->busy, &ctx->out,
@ -858,7 +877,7 @@ static void ngx_http_gzip_filter_free(void *opaque, void *address)
static u_char *ngx_http_gzip_log_ratio(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
ngx_http_log_op_t *op)
{
ngx_uint_t zint, zfrac;
ngx_http_gzip_ctx_t *ctx;
@ -889,7 +908,7 @@ static u_char *ngx_http_gzip_log_ratio(ngx_http_request_t *r, u_char *buf,
}
static int ngx_http_gzip_error(ngx_http_gzip_ctx_t *ctx)
static void ngx_http_gzip_error(ngx_http_gzip_ctx_t *ctx)
{
deflateEnd(&ctx->zstream);
@ -902,26 +921,24 @@ static int ngx_http_gzip_error(ngx_http_gzip_ctx_t *ctx)
ctx->done = 1;
return NGX_ERROR;
return;
}
static ngx_int_t ngx_http_gzip_pre_conf(ngx_conf_t *cf)
static ngx_int_t ngx_http_gzip_add_log_formats(ngx_conf_t *cf)
{
ngx_http_log_op_name_t *op;
for (op = ngx_http_gzip_log_fmt_ops; op->name.len; op++) { /* void */ }
op->op = NULL;
op->run = NULL;
op = ngx_http_log_fmt_ops;
for (op = ngx_http_log_fmt_ops; op->op; op++) {
for (op = ngx_http_log_fmt_ops; op->run; op++) {
if (op->name.len == 0) {
op = (ngx_http_log_op_name_t *) op->op;
op = (ngx_http_log_op_name_t *) op->run;
}
}
op->op = (ngx_http_log_op_pt) ngx_http_gzip_log_fmt_ops;
op->run = (ngx_http_log_op_run_pt) ngx_http_gzip_log_fmt_ops;
return NGX_OK;
}
@ -948,14 +965,11 @@ static void *ngx_http_gzip_create_conf(ngx_conf_t *cf)
}
/*
set by ngx_pcalloc():
conf->bufs.num = 0;
conf->proxied = 0;
conf->types = NULL;
* set by ngx_pcalloc():
*
* conf->bufs.num = 0;
* conf->proxied = 0;
* conf->types = NULL;
*/
conf->enable = NGX_CONF_UNSET;

96
src/http/modules/ngx_http_ssl_module.c
View File

@ -8,11 +8,15 @@
#include <ngx_core.h>
#include <ngx_http.h>
#include <openssl/engine.h>
#define NGX_DEFLAUT_CERTIFICATE "cert.pem"
#define NGX_DEFLAUT_CERTIFICATE_KEY "cert.pem"
static void *ngx_http_ssl_create_main_conf(ngx_conf_t *cf);
static char *ngx_http_ssl_init_main_conf(ngx_conf_t *cf, void *conf);
static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf);
static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf,
void *parent, void *child);
@ -20,6 +24,13 @@ static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf,
static ngx_command_t ngx_http_ssl_commands[] = {
{ ngx_string("ssl_engine"),
NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
ngx_conf_set_str_slot,
NGX_HTTP_MAIN_CONF_OFFSET,
offsetof(ngx_http_ssl_main_conf_t, engine),
NULL },
{ ngx_string("ssl"),
NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
@ -41,6 +52,13 @@ static ngx_command_t ngx_http_ssl_commands[] = {
offsetof(ngx_http_ssl_srv_conf_t, certificate_key),
NULL },
{ ngx_string("ssl_ciphers"),
NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
ngx_conf_set_str_slot,
NGX_HTTP_SRV_CONF_OFFSET,
offsetof(ngx_http_ssl_srv_conf_t, ciphers),
NULL },
ngx_null_command
};
@ -48,8 +66,8 @@ static ngx_command_t ngx_http_ssl_commands[] = {
static ngx_http_module_t ngx_http_ssl_module_ctx = {
NULL, /* pre conf */
NULL, /* create main configuration */
NULL, /* init main configuration */
ngx_http_ssl_create_main_conf, /* create main configuration */
ngx_http_ssl_init_main_conf, /* init main configuration */
ngx_http_ssl_create_srv_conf, /* create server configuration */
ngx_http_ssl_merge_srv_conf, /* merge server configuration */
@ -69,6 +87,56 @@ ngx_module_t ngx_http_ssl_module = {
};
static void *ngx_http_ssl_create_main_conf(ngx_conf_t *cf)
{
ngx_http_ssl_main_conf_t *mcf;
if (!(mcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_main_conf_t)))) {
return NGX_CONF_ERROR;
}
/*
* set by ngx_pcalloc():
*
* mcf->engine.len = 0;
* mcf->engine.data = NULL;
*/
return mcf;
}
static char *ngx_http_ssl_init_main_conf(ngx_conf_t *cf, void *conf)
{
ngx_http_ssl_main_conf_t *mcf = conf;
ENGINE *engine;
if (mcf->engine.len == 0) {
return NGX_CONF_OK;
}
engine = ENGINE_by_id((const char *) mcf->engine.data);
if (engine == NULL) {
ngx_ssl_error(NGX_LOG_WARN, cf->log, 0,
"ENGINE_by_id(\"%V\") failed", &mcf->engine);
return NGX_CONF_ERROR;
}
if (ENGINE_set_default(engine, ENGINE_METHOD_ALL) == 0) {
ngx_ssl_error(NGX_LOG_WARN, cf->log, 0,
"ENGINE_set_default(\"%V\", ENGINE_METHOD_ALL) failed",
&mcf->engine);
return NGX_CONF_ERROR;
}
ENGINE_free(engine);
return NGX_CONF_OK;
}
static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
{
ngx_http_ssl_srv_conf_t *scf;
@ -77,6 +145,17 @@ static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
return NGX_CONF_ERROR;
}
/*
* set by ngx_pcalloc():
*
* scf->certificate.len = 0;
* scf->certificate.data = NULL;
* scf->certificate_key.len = 0;
* scf->certificate_key.data = NULL;
* scf->ciphers.len = 0;
* scf->ciphers.data = NULL;
*/
scf->enable = NGX_CONF_UNSET;
return scf;
@ -101,6 +180,9 @@ static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf,
ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key,
NGX_DEFLAUT_CERTIFICATE_KEY);
ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, "");
/* TODO: configure methods */
conf->ssl_ctx = SSL_CTX_new(SSLv23_server_method());
@ -110,6 +192,16 @@ static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf,
return NGX_CONF_ERROR;
}
if (conf->ciphers.len) {
if (SSL_CTX_set_cipher_list(conf->ssl_ctx,
(const char *) conf->ciphers.data) == 0)
{
ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
"SSL_CTX_set_cipher_list(\"%V\") failed",
&conf->ciphers);
}
}
if (SSL_CTX_use_certificate_file(conf->ssl_ctx,
(char *) conf->certificate.data,
SSL_FILETYPE_PEM) == 0) {

7
src/http/modules/ngx_http_ssl_module.h
View File

@ -13,11 +13,18 @@
#include <ngx_http.h>
typedef struct {
ngx_str_t engine;
} ngx_http_ssl_main_conf_t;
typedef struct {
ngx_flag_t enable;
ngx_str_t certificate;
ngx_str_t certificate_key;
ngx_str_t ciphers;
ngx_ssl_ctx_t *ssl_ctx;
} ngx_http_ssl_srv_conf_t;

163
src/http/modules/ngx_http_userid_filter.c
View File

@ -44,13 +44,17 @@ static ngx_int_t ngx_http_userid_set_uid(ngx_http_request_t *r,
ngx_http_userid_ctx_t *ctx,
ngx_http_userid_conf_t *conf);
static size_t ngx_http_userid_log_uid_got_getlen(ngx_http_request_t *r,
uintptr_t data);
static u_char *ngx_http_userid_log_uid_got(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static size_t ngx_http_userid_log_uid_set_getlen(ngx_http_request_t *r,
uintptr_t data);
static u_char *ngx_http_userid_log_uid_set(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static ngx_int_t ngx_http_userid_add_log_formats(ngx_conf_t *cf);
static ngx_int_t ngx_http_userid_init(ngx_cycle_t *cycle);
static ngx_int_t ngx_http_userid_pre_conf(ngx_conf_t *cf);
static void *ngx_http_userid_create_conf(ngx_conf_t *cf);
static char *ngx_http_userid_merge_conf(ngx_conf_t *cf, void *parent,
void *child);
@ -142,7 +146,7 @@ static ngx_command_t ngx_http_userid_commands[] = {
ngx_http_module_t ngx_http_userid_filter_module_ctx = {
ngx_http_userid_pre_conf, /* pre conf */
ngx_http_userid_add_log_formats, /* pre conf */
NULL, /* create main configuration */
NULL, /* init main configuration */
@ -166,9 +170,13 @@ ngx_module_t ngx_http_userid_filter_module = {
static ngx_http_log_op_name_t ngx_http_userid_log_fmt_ops[] = {
{ ngx_string("uid_got"), 0, ngx_http_userid_log_uid_got },
{ ngx_string("uid_set"), 0, ngx_http_userid_log_uid_set },
{ ngx_null_string, 0, NULL }
{ ngx_string("uid_got"), 0, NULL,
ngx_http_userid_log_uid_got_getlen,
ngx_http_userid_log_uid_got },
{ ngx_string("uid_set"), 0, NULL,
ngx_http_userid_log_uid_set_getlen,
ngx_http_userid_log_uid_set },
{ ngx_null_string, 0, NULL, NULL, NULL }
};
@ -298,7 +306,7 @@ static ngx_int_t ngx_http_userid_set_uid(ngx_http_request_t *r,
u_char *cookie, *p;
size_t len;
socklen_t slen;
struct sockaddr_in addr_in;
struct sockaddr_in sin;
ngx_str_t src, dst;
ngx_table_elt_t *set_cookie, *p3p;
@ -321,14 +329,13 @@ static ngx_int_t ngx_http_userid_set_uid(ngx_http_request_t *r,
if (r->in_addr == 0) {
slen = sizeof(struct sockaddr_in);
if (getsockname(r->connection->fd,
(struct sockaddr *) &addr_in, &slen) == -1)
(struct sockaddr *) &sin, &slen) == -1)
{
ngx_log_error(NGX_LOG_CRIT, r->connection->log,
ngx_socket_errno,
"getsockname() failed");
ngx_socket_errno, "getsockname() failed");
}
r->in_addr = addr_in.sin_addr.s_addr;
r->in_addr = sin.sin_addr.s_addr;
}
ctx->uid_set[0] = htonl(r->in_addr);
@ -352,7 +359,7 @@ static ngx_int_t ngx_http_userid_set_uid(ngx_http_request_t *r,
len += sizeof(expires) - 1 + 2;
}
if (conf->domain.len > 1) {
if (conf->domain.len) {
len += conf->domain.len;
}
@ -379,7 +386,7 @@ static ngx_int_t ngx_http_userid_set_uid(ngx_http_request_t *r,
p = ngx_http_cookie_time(p, ngx_time() + conf->expires);
}
if (conf->domain.len > 1) {
if (conf->domain.len) {
p = ngx_cpymem(p, conf->domain.data, conf->domain.len);
}
@ -397,7 +404,7 @@ static ngx_int_t ngx_http_userid_set_uid(ngx_http_request_t *r,
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"uid cookie: \"%V\"", &set_cookie->value);
if (conf->p3p.len == 1) {
if (conf->p3p.len == 0) {
return NGX_OK;
}
@ -413,8 +420,8 @@ static ngx_int_t ngx_http_userid_set_uid(ngx_http_request_t *r,
}
static u_char *ngx_http_userid_log_uid_got(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
static size_t ngx_http_userid_log_uid_got_getlen(ngx_http_request_t *r,
uintptr_t data)
{
ngx_http_userid_ctx_t *ctx;
ngx_http_userid_conf_t *conf;
@ -422,20 +429,30 @@ static u_char *ngx_http_userid_log_uid_got(ngx_http_request_t *r, u_char *buf,
ctx = ngx_http_get_module_ctx(r, ngx_http_userid_filter_module);
if (ctx == NULL || ctx->uid_got[3] == 0) {
if (buf == NULL) {
return (u_char *) 1;
}
return 1;
}
conf = ngx_http_get_module_loc_conf(r, ngx_http_userid_filter_module);
return conf->name.len + 1 + 32;
}
static u_char *ngx_http_userid_log_uid_got(ngx_http_request_t *r, u_char *buf,
ngx_http_log_op_t *op)
{
ngx_http_userid_ctx_t *ctx;
ngx_http_userid_conf_t *conf;
ctx = ngx_http_get_module_ctx(r, ngx_http_userid_filter_module);
if (ctx == NULL || ctx->uid_got[3] == 0) {
*buf = '-';
return buf + 1;
}
conf = ngx_http_get_module_loc_conf(r, ngx_http_userid_filter_module);
if (buf == NULL) {
return (u_char *) (conf->name.len + 1 + 32);
}
buf = ngx_cpymem(buf, conf->name.data, conf->name.len);
*buf++ = '=';
@ -446,8 +463,8 @@ static u_char *ngx_http_userid_log_uid_got(ngx_http_request_t *r, u_char *buf,
}
static u_char *ngx_http_userid_log_uid_set(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
static size_t ngx_http_userid_log_uid_set_getlen(ngx_http_request_t *r,
uintptr_t data)
{
ngx_http_userid_ctx_t *ctx;
ngx_http_userid_conf_t *conf;
@ -455,20 +472,30 @@ static u_char *ngx_http_userid_log_uid_set(ngx_http_request_t *r, u_char *buf,
ctx = ngx_http_get_module_ctx(r, ngx_http_userid_filter_module);
if (ctx == NULL || ctx->uid_set[3] == 0) {
if (buf == NULL) {
return (u_char *) 1;
}
return 1;
}
conf = ngx_http_get_module_loc_conf(r, ngx_http_userid_filter_module);
return conf->name.len + 1 + 32;
}
static u_char *ngx_http_userid_log_uid_set(ngx_http_request_t *r, u_char *buf,
ngx_http_log_op_t *op)
{
ngx_http_userid_ctx_t *ctx;
ngx_http_userid_conf_t *conf;
ctx = ngx_http_get_module_ctx(r, ngx_http_userid_filter_module);
if (ctx == NULL || ctx->uid_set[3] == 0) {
*buf = '-';
return buf + 1;
}
conf = ngx_http_get_module_loc_conf(r, ngx_http_userid_filter_module);
if (buf == NULL) {
return (u_char *) (conf->name.len + 1 + 32);
}
buf = ngx_cpymem(buf, conf->name.data, conf->name.len);
*buf++ = '=';
@ -479,31 +506,29 @@ static u_char *ngx_http_userid_log_uid_set(ngx_http_request_t *r, u_char *buf,
}
static ngx_int_t ngx_http_userid_init(ngx_cycle_t *cycle)
static ngx_int_t ngx_http_userid_add_log_formats(ngx_conf_t *cf)
{
ngx_http_next_header_filter = ngx_http_top_header_filter;
ngx_http_top_header_filter = ngx_http_userid_filter;
ngx_http_log_op_name_t *op;
for (op = ngx_http_userid_log_fmt_ops; op->name.len; op++) { /* void */ }
op->run = NULL;
for (op = ngx_http_log_fmt_ops; op->run; op++) {
if (op->name.len == 0) {
op = (ngx_http_log_op_name_t *) op->run;
}
}
op->run = (ngx_http_log_op_run_pt) ngx_http_userid_log_fmt_ops;
return NGX_OK;
}
static ngx_int_t ngx_http_userid_pre_conf(ngx_conf_t *cf)
static ngx_int_t ngx_http_userid_init(ngx_cycle_t *cycle)
{
ngx_http_log_op_name_t *op;
for (op = ngx_http_userid_log_fmt_ops; op->name.len; op++) { /* void */ }
op->op = NULL;
op = ngx_http_log_fmt_ops;
for (op = ngx_http_log_fmt_ops; op->op; op++) {
if (op->name.len == 0) {
op = (ngx_http_log_op_name_t *) op->op;
}
}
op->op = (ngx_http_log_op_pt) ngx_http_userid_log_fmt_ops;
ngx_http_next_header_filter = ngx_http_top_header_filter;
ngx_http_top_header_filter = ngx_http_userid_filter;
return NGX_OK;
}
@ -517,18 +542,18 @@ static void *ngx_http_userid_create_conf(ngx_conf_t *cf)
return NGX_CONF_ERROR;
}
/* set by ngx_pcalloc():
conf->name.len = 0;
conf->name.date = NULL;
conf->domain.len = 0;
conf->domain.date = NULL;
conf->path.len = 0;
conf->path.date = NULL;
conf->p3p.len = 0;
conf->p3p.date = NULL;
*/
/*
* set by ngx_pcalloc():
*
* conf->name.len = 0;
* conf->name.date = NULL;
* conf->domain.len = 0;
* conf->domain.date = NULL;
* conf->path.len = 0;
* conf->path.date = NULL;
* conf->p3p.len = 0;
* conf->p3p.date = NULL;
*/
conf->enable = NGX_CONF_UNSET;
conf->service = NGX_CONF_UNSET;
@ -547,9 +572,9 @@ static char *ngx_http_userid_merge_conf(ngx_conf_t *cf, void *parent,
ngx_conf_merge_value(conf->enable, prev->enable, NGX_HTTP_USERID_OFF);
ngx_conf_merge_str_value(conf->name, prev->name, "uid");
ngx_conf_merge_str_value(conf->domain, prev->domain, ".");
ngx_conf_merge_str_value(conf->domain, prev->domain, "");
ngx_conf_merge_str_value(conf->path, prev->path, "; path=/");
ngx_conf_merge_str_value(conf->p3p, prev->p3p, ".");
ngx_conf_merge_str_value(conf->p3p, prev->p3p, "");
ngx_conf_merge_value(conf->service, prev->service, NGX_CONF_UNSET);
ngx_conf_merge_sec_value(conf->expires, prev->expires, 0);
@ -565,8 +590,8 @@ char *ngx_http_userid_domain(ngx_conf_t *cf, void *post, void *data)
u_char *p, *new;
if (domain->len == 4 && ngx_strcmp(domain->data, "none") == 0) {
domain->len = 1;
domain->data = (u_char *) ".";
domain->len = 0;
domain->data = (u_char *) "";
return NGX_CONF_OK;
}
@ -645,8 +670,8 @@ char *ngx_http_userid_p3p(ngx_conf_t *cf, void *post, void *data)
ngx_str_t *p3p = data;
if (p3p->len == 4 && ngx_strcmp(p3p->data, "none") == 0) {
p3p->len = 1;
p3p->data = (u_char *) ".";
p3p->len = 0;
p3p->data = (u_char *) "";
}
return NGX_CONF_OK;

354
src/http/modules/proxy/ngx_http_proxy_handler.c
View File

@ -13,14 +13,20 @@
static ngx_int_t ngx_http_proxy_handler(ngx_http_request_t *r);
static ngx_int_t ngx_http_proxy_cache_get(ngx_http_proxy_ctx_t *p);
static size_t ngx_http_proxy_log_proxy_state_getlen(ngx_http_request_t *r,
uintptr_t data);
static u_char *ngx_http_proxy_log_proxy_state(ngx_http_request_t *r,
u_char *buf, uintptr_t data);
u_char *buf,
ngx_http_log_op_t *op);
#if 0
static u_char *ngx_http_proxy_log_cache_state(ngx_http_request_t *r,
u_char *buf, uintptr_t data);
static u_char *ngx_http_proxy_log_reason(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
#endif
static ngx_int_t ngx_http_proxy_pre_conf(ngx_conf_t *cf);
static ngx_int_t ngx_http_proxy_add_log_formats(ngx_conf_t *cf);
static void *ngx_http_proxy_create_loc_conf(ngx_conf_t *cf);
static char *ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf,
void *parent, void *child);
@ -231,7 +237,6 @@ static ngx_command_t ngx_http_proxy_commands[] = {
offsetof(ngx_http_proxy_loc_conf_t, default_expires),
NULL },
{ ngx_string("proxy_next_upstream"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_ANY,
ngx_conf_set_bitmask_slot,
@ -251,7 +256,7 @@ static ngx_command_t ngx_http_proxy_commands[] = {
ngx_http_module_t ngx_http_proxy_module_ctx = {
ngx_http_proxy_pre_conf, /* pre conf */
ngx_http_proxy_add_log_formats, /* pre conf */
NULL, /* create main configuration */
NULL, /* init main configuration */
@ -270,16 +275,22 @@ ngx_module_t ngx_http_proxy_module = {
ngx_http_proxy_commands, /* module directives */
NGX_HTTP_MODULE, /* module type */
NULL, /* init module */
NULL /* init child */
NULL /* init process */
};
static ngx_http_log_op_name_t ngx_http_proxy_log_fmt_ops[] = {
{ ngx_string("proxy"), 0, ngx_http_proxy_log_proxy_state },
{ ngx_string("proxy"), 0, NULL,
ngx_http_proxy_log_proxy_state_getlen,
ngx_http_proxy_log_proxy_state },
#if 0
{ ngx_string("proxy_cache_state"), 0, ngx_http_proxy_log_cache_state },
{ ngx_string("proxy_reason"), 0, ngx_http_proxy_log_reason },
{ ngx_null_string, 0, NULL }
#endif
{ ngx_null_string, 0, NULL, NULL, NULL }
};
@ -301,8 +312,12 @@ ngx_http_header_t ngx_http_proxy_headers_in[] = {
offsetof(ngx_http_proxy_headers_in_t, content_type) },
{ ngx_string("Content-Length"),
offsetof(ngx_http_proxy_headers_in_t, content_length) },
#if (NGX_HTTP_GZIP)
{ ngx_string("Content-Encoding"),
offsetof(ngx_http_proxy_headers_in_t, content_encoding) },
#endif
{ ngx_string("Last-Modified"),
offsetof(ngx_http_proxy_headers_in_t, last_modified) },
{ ngx_string("Location"),
@ -779,11 +794,12 @@ u_char *ngx_http_proxy_log_error(void *data, u_char *buf, size_t len)
peer = &ctx->proxy->upstream->peer;
p = ngx_snprintf(buf, len,
" while %s, client: %V, URL: %V, upstream: %V%V",
" while %s, client: %V, URL: %V, upstream: http://%V%s%V",
ctx->proxy->action,
&r->connection->addr_text,
&r->unparsed_uri,
&peer->peers->peers[peer->cur_peer].addr_port_text,
&peer->peers->peer[peer->cur_peer].name,
ctx->proxy->lcf->upstream->uri_separator,
&ctx->proxy->lcf->upstream->uri);
len -= p - buf;
buf = p;
@ -835,8 +851,24 @@ u_char *ngx_http_proxy_log_error(void *data, u_char *buf, size_t len)
}
static size_t ngx_http_proxy_log_proxy_state_getlen(ngx_http_request_t *r,
uintptr_t data)
{
ngx_http_proxy_ctx_t *p;
p = ngx_http_get_module_err_ctx(r, ngx_http_proxy_module);
if (p == NULL) {
return 1;
}
return p->states.nelts * /* STUB */ 100;
}
static u_char *ngx_http_proxy_log_proxy_state(ngx_http_request_t *r,
u_char *buf, uintptr_t data)
u_char *buf,
ngx_http_log_op_t *op)
{
ngx_uint_t i;
ngx_http_proxy_ctx_t *p;
@ -845,21 +877,10 @@ static u_char *ngx_http_proxy_log_proxy_state(ngx_http_request_t *r,
p = ngx_http_get_module_err_ctx(r, ngx_http_proxy_module);
if (p == NULL) {
if (buf == NULL) {
return (u_char *) 1;
}
*buf = '-';
return buf + 1;
}
if (buf == NULL) {
/* find the request line length */
return (u_char *) (uintptr_t) (p->states.nelts * /* STUB */ 100);
}
i = 0;
state = p->states.elts;
@ -935,6 +956,8 @@ static u_char *ngx_http_proxy_log_proxy_state(ngx_http_request_t *r,
}
#if 0
static u_char *ngx_http_proxy_log_cache_state(ngx_http_request_t *r,
u_char *buf, uintptr_t data)
{
@ -1014,23 +1037,23 @@ static u_char *ngx_http_proxy_log_reason(ngx_http_request_t *r, u_char *buf,
}
}
#endif
static ngx_int_t ngx_http_proxy_pre_conf(ngx_conf_t *cf)
static ngx_int_t ngx_http_proxy_add_log_formats(ngx_conf_t *cf)
{
ngx_http_log_op_name_t *op;
for (op = ngx_http_proxy_log_fmt_ops; op->name.len; op++) { /* void */ }
op->op = NULL;
op->run = NULL;
op = ngx_http_log_fmt_ops;
for (op = ngx_http_log_fmt_ops; op->op; op++) {
for (op = ngx_http_log_fmt_ops; op->run; op++) {
if (op->name.len == 0) {
op = (ngx_http_log_op_name_t *) op->op;
op = (ngx_http_log_op_name_t *) op->run;
}
}
op->op = (ngx_http_log_op_pt) ngx_http_proxy_log_fmt_ops;
op->run = (ngx_http_log_op_run_pt) ngx_http_proxy_log_fmt_ops;
return NGX_OK;
}
@ -1044,24 +1067,19 @@ static void *ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
ngx_pcalloc(cf->pool, sizeof(ngx_http_proxy_loc_conf_t)),
NGX_CONF_ERROR);
/* set by ngx_pcalloc():
conf->bufs.num = 0;
conf->path = NULL;
conf->next_upstream = 0;
conf->use_stale = 0;
conf->upstreams = NULL;
conf->peers = NULL;
conf->cache_path = NULL;
conf->temp_path = NULL;
conf->busy_lock = NULL;
*/
/*
* set by ngx_pcalloc():
*
* conf->bufs.num = 0;
* conf->path = NULL;
* conf->next_upstream = 0;
* conf->use_stale = 0;
* conf->upstreams = NULL;
* conf->peers = NULL;
* conf->cache_path = NULL;
* conf->temp_path = NULL;
* conf->busy_lock = NULL;
*/
conf->connect_timeout = NGX_CONF_UNSET_MSEC;
conf->send_timeout = NGX_CONF_UNSET_MSEC;
@ -1210,11 +1228,15 @@ static char *ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf,
ngx_conf_merge_bitmask_value(conf->use_stale, prev->use_stale,
NGX_CONF_BITMASK_SET);
#if 0
ngx_conf_merge_path_value(conf->cache_path, prev->cache_path,
"cache", 1, 2, 0, cf->pool);
NGX_HTTP_PROXY_CACHE_PATH, 1, 2, 0,
ngx_garbage_collector_temp_handler, cf);
#endif
ngx_conf_merge_path_value(conf->temp_path, prev->temp_path,
"temp", 1, 2, 0, cf->pool);
NGX_HTTP_PROXY_TEMP_PATH, 1, 2, 0,
ngx_garbage_collector_temp_handler, cf);
ngx_conf_merge_value(conf->cache, prev->cache, 0);
@ -1256,24 +1278,23 @@ static char *ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf,
}
static char *ngx_http_proxy_set_pass(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf)
{
ngx_http_proxy_loc_conf_t *lcf = conf;
ngx_uint_t i, len;
char *err;
u_char *host;
in_addr_t addr;
ngx_str_t *value;
struct hostent *h;
ngx_http_core_loc_conf_t *clcf;
ngx_str_t *value, *url;
ngx_inet_upstream_t inet_upstream;
ngx_http_core_loc_conf_t *clcf;
#if (NGX_HAVE_UNIX_DOMAIN)
ngx_unix_domain_upstream_t unix_upstream;
#endif
value = cf->args->elts;
if (ngx_strncasecmp(value[1].data, "http://", 7) != 0) {
url = &value[1];
if (ngx_strncasecmp(url->data, "http://", 7) != 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid URL prefix");
return NGX_CONF_ERROR;
}
@ -1284,121 +1305,52 @@ static char *ngx_http_proxy_set_pass(ngx_conf_t *cf, ngx_command_t *cmd,
return NGX_CONF_ERROR;
}
lcf->upstream->url.len = value[1].len;
if (!(lcf->upstream->url.data = ngx_palloc(cf->pool, value[1].len + 1))) {
return NGX_CONF_ERROR;
}
if (ngx_strncasecmp(url->data + 7, "unix:", 5) == 0) {
ngx_cpystrn(lcf->upstream->url.data, value[1].data, value[1].len + 1);
#if (NGX_HAVE_UNIX_DOMAIN)
value[1].data += 7;
value[1].len -= 7;
ngx_memzero(&unix_upstream, sizeof(ngx_unix_domain_upstream_t));
err = ngx_http_proxy_parse_upstream(&value[1], lcf->upstream);
unix_upstream.name = *url;
unix_upstream.url.len = url->len - 7;
unix_upstream.url.data = url->data + 7;
unix_upstream.uri_part = 1;
if (err) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, err);
return NGX_CONF_ERROR;
}
if (!(host = ngx_palloc(cf->pool, lcf->upstream->host.len + 1))) {
return NGX_CONF_ERROR;
}
ngx_cpystrn(host, lcf->upstream->host.data, lcf->upstream->host.len + 1);
/* AF_INET only */
addr = inet_addr((char *) host);
if (addr == INADDR_NONE) {
h = gethostbyname((char *) host);
if (h == NULL || h->h_addr_list[0] == NULL) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "host %s not found", host);
if (!(lcf->peers = ngx_unix_upstream_parse(cf, &unix_upstream))) {
return NGX_CONF_ERROR;
}
for (i = 0; h->h_addr_list[i] != NULL; i++) { /* void */ }
lcf->upstream->host_header.len = sizeof("localhost") - 1;
lcf->upstream->host_header.data = (u_char *) "localhost";
lcf->upstream->uri = unix_upstream.uri;
lcf->upstream->uri_separator = ":";
lcf->upstream->default_port = 1;
/* MP: ngx_shared_palloc() */
#else
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"the unix domain sockets are not supported "
"on this platform");
return NGX_CONF_ERROR;
lcf->peers = ngx_pcalloc(cf->pool,
sizeof(ngx_peers_t) + sizeof(ngx_peer_t) * (i - 1));
if (lcf->peers == NULL) {
return NGX_CONF_ERROR;
}
lcf->peers->number = i;
/* STUB */
lcf->peers->max_fails = 1;
lcf->peers->fail_timeout = 60;
for (i = 0; h->h_addr_list[i] != NULL; i++) {
lcf->peers->peers[i].host.data = host;
lcf->peers->peers[i].host.len = lcf->upstream->host.len;
lcf->peers->peers[i].addr = *(in_addr_t *)(h->h_addr_list[i]);
lcf->peers->peers[i].port = lcf->upstream->port;
len = INET_ADDRSTRLEN - 1 + 1 + lcf->upstream->port_text.len;
lcf->peers->peers[i].addr_port_text.data =
ngx_palloc(cf->pool, len);
if (lcf->peers->peers[i].addr_port_text.data == NULL) {
return NGX_CONF_ERROR;
}
len = ngx_inet_ntop(AF_INET,
&lcf->peers->peers[i].addr,
lcf->peers->peers[i].addr_port_text.data,
len);
lcf->peers->peers[i].addr_port_text.data[len++] = ':';
ngx_memcpy(lcf->peers->peers[i].addr_port_text.data + len,
lcf->upstream->port_text.data,
lcf->upstream->port_text.len);
lcf->peers->peers[i].addr_port_text.len =
len + lcf->upstream->port_text.len;
}
#endif
} else {
ngx_memzero(&inet_upstream, sizeof(ngx_inet_upstream_t));
/* MP: ngx_shared_palloc() */
inet_upstream.name = *url;
inet_upstream.url.len = url->len - 7;
inet_upstream.url.data = url->data + 7;
inet_upstream.default_port_value = 80;
inet_upstream.uri_part = 1;
if (!(lcf->peers = ngx_pcalloc(cf->pool, sizeof(ngx_peers_t)))) {
if (!(lcf->peers = ngx_inet_upstream_parse(cf, &inet_upstream))) {
return NGX_CONF_ERROR;
}
lcf->peers->number = 1;
lcf->peers->peers[0].host.data = host;
lcf->peers->peers[0].host.len = lcf->upstream->host.len;
lcf->peers->peers[0].addr = addr;
lcf->peers->peers[0].port = lcf->upstream->port;
len = lcf->upstream->host.len + 1 + lcf->upstream->port_text.len;
lcf->peers->peers[0].addr_port_text.len = len;
lcf->peers->peers[0].addr_port_text.data = ngx_palloc(cf->pool, len);
if (lcf->peers->peers[0].addr_port_text.data == NULL) {
return NGX_CONF_ERROR;
}
len = lcf->upstream->host.len;
ngx_memcpy(lcf->peers->peers[0].addr_port_text.data,
lcf->upstream->host.data, len);
lcf->peers->peers[0].addr_port_text.data[len++] = ':';
ngx_memcpy(lcf->peers->peers[0].addr_port_text.data + len,
lcf->upstream->port_text.data,
lcf->upstream->port_text.len);
lcf->upstream->host_header = inet_upstream.host_header;
lcf->upstream->port_text = inet_upstream.port_text;
lcf->upstream->uri = inet_upstream.uri;
lcf->upstream->uri_separator = "";
}
clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
@ -1410,93 +1362,7 @@ static char *ngx_http_proxy_set_pass(ngx_conf_t *cf, ngx_command_t *cmd,
clcf->auto_redirect = 1;
}
return NULL;
}
static char *ngx_http_proxy_parse_upstream(ngx_str_t *url,
ngx_http_proxy_upstream_conf_t *u)
{
size_t i;
if (url->data[0] == ':' || url->data[0] == '/') {
return "invalid upstream URL";
}
u->host.data = url->data;
u->host_header.data = url->data;
for (i = 1; i < url->len; i++) {
if (url->data[i] == ':') {
u->port_text.data = &url->data[i] + 1;
u->host.len = i;
}
if (url->data[i] == '/') {
u->uri.data = &url->data[i];
u->uri.len = url->len - i;
u->host_header.len = i;
if (u->host.len == 0) {
u->host.len = i;
}
if (u->port_text.data == NULL) {
u->default_port = 1;
u->port = htons(80);
u->port_text.len = 2;
u->port_text.data = (u_char *) "80";
return NULL;
}
u->port_text.len = &url->data[i] - u->port_text.data;
if (u->port_text.len > 0) {
u->port = (in_port_t) ngx_atoi(u->port_text.data,
u->port_text.len);
if (u->port > 0) {
if (u->port == 80) {
u->default_port = 1;
}
u->port = htons(u->port);
return NULL;
}
}
return "invalid port in upstream URL";
}
}
if (u->host.len == 0) {
u->host.len = i;
}
u->host_header.len = i;
u->uri.data = (u_char *) "/";
u->uri.len = 1;
if (u->port_text.data == NULL) {
u->default_port = 1;
u->port = htons(80);
u->port_text.len = 2;
u->port_text.data = (u_char *) "80";
return NULL;
}
u->port_text.len = &url->data[i] - u->port_text.data;
if (u->port_text.len > 0) {
u->port = (in_port_t) ngx_atoi(u->port_text.data, u->port_text.len);
if (u->port > 0) {
u->port = htons(u->port);
return NULL;
}
}
return "invalid port in upstream URL";
return NGX_CONF_OK;
}

6
src/http/modules/proxy/ngx_http_proxy_handler.h
View File

@ -47,6 +47,8 @@ typedef struct {
ngx_str_t port_text;
ngx_str_t *location;
char *uri_separator;
in_port_t port;
unsigned default_port:1;
@ -131,7 +133,11 @@ typedef struct {
ngx_table_elt_t *connection;
ngx_table_elt_t *content_type;
ngx_table_elt_t *content_length;
#if (NGX_HTTP_GZIP)
ngx_table_elt_t *content_encoding;
#endif
ngx_table_elt_t *last_modified;
ngx_table_elt_t *location;
ngx_table_elt_t *accept_ranges;

12
src/http/modules/proxy/ngx_http_proxy_header.c
View File

@ -26,12 +26,7 @@ int ngx_http_proxy_copy_header(ngx_http_proxy_ctx_t *p,
part = &headers_in->headers.part;
h = part->elts;
#if 0
h = headers_in->headers.elts;
for (i = 0; i < headers_in->headers.nelts; i++) {
#endif
for (i = 0 ; /* void */; i++) {
for (i = 0; /* void */; i++) {
if (i >= part->nelts) {
if (part->next == NULL) {
@ -113,10 +108,12 @@ int ngx_http_proxy_copy_header(ngx_http_proxy_ctx_t *p,
continue;
}
#if (NGX_HTTP_GZIP)
if (&h[i] == headers_in->content_encoding) {
r->headers_out.content_encoding = ho;
continue;
}
#endif
if (&h[i] == headers_in->last_modified) {
r->headers_out.last_modified = ho;
@ -169,7 +166,8 @@ static int ngx_http_proxy_rewrite_location_header(ngx_http_proxy_ctx_t *p,
return NGX_ERROR;
}
if (uc->url.len > loc->value.len
if (p->lcf->preserve_host
|| uc->url.len > loc->value.len
|| ngx_rstrncmp(loc->value.data, uc->url.data, uc->url.len) != 0)
{

49
src/http/modules/proxy/ngx_http_proxy_upstream.c
View File

@ -14,7 +14,7 @@
static ngx_chain_t *ngx_http_proxy_create_request(ngx_http_proxy_ctx_t *p);
static void ngx_http_proxy_init_upstream(void *data);
static void ngx_http_proxy_init_upstream(ngx_http_request_t *r);
static void ngx_http_proxy_reinit_upstream(ngx_http_proxy_ctx_t *p);
static void ngx_http_proxy_connect(ngx_http_proxy_ctx_t *p);
static void ngx_http_proxy_send_request(ngx_http_proxy_ctx_t *p);
@ -53,9 +53,7 @@ static char connection_close_header[] = "Connection: close" CRLF;
int ngx_http_proxy_request_upstream(ngx_http_proxy_ctx_t *p)
{
int rc;
ngx_temp_file_t *tf;
ngx_http_request_t *r;
ngx_http_request_body_t *rb;
ngx_http_proxy_upstream_t *u;
r = p->request;
@ -75,36 +73,7 @@ int ngx_http_proxy_request_upstream(ngx_http_proxy_ctx_t *p)
u->method = r->method;
if (!(rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t)))) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
r->request_body = rb;
if (r->headers_in.content_length_n <= 0) {
ngx_http_proxy_init_upstream(p);
return NGX_DONE;
}
if (!(tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t)))) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
tf->file.fd = NGX_INVALID_FILE;
tf->file.log = r->connection->log;
tf->path = p->lcf->temp_path;
tf->pool = r->pool;
tf->warn = "a client request body is buffered to a temporary file";
/* tf->persistent = 0; */
rb->handler = ngx_http_proxy_init_upstream;
rb->data = p;
/* rb->bufs = NULL; */
/* rb->buf = NULL; */
/* rb->rest = 0; */
rb->temp_file = tf;
rc = ngx_http_read_client_request_body(r);
rc = ngx_http_read_client_request_body(r, ngx_http_proxy_init_upstream);
if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
return rc;
@ -428,17 +397,16 @@ static ngx_chain_t *ngx_http_proxy_create_request(ngx_http_proxy_ctx_t *p)
}
static void ngx_http_proxy_init_upstream(void *data)
static void ngx_http_proxy_init_upstream(ngx_http_request_t *r)
{
ngx_http_proxy_ctx_t *p = data;
ngx_chain_t *cl;
ngx_http_request_t *r;
ngx_http_proxy_ctx_t *p;
ngx_output_chain_ctx_t *output;
ngx_chain_writer_ctx_t *writer;
ngx_http_proxy_log_ctx_t *ctx;
r = p->request;
p = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http proxy init upstream, client timer: %d",
@ -502,7 +470,7 @@ static void ngx_http_proxy_init_upstream(void *data)
output->pool = r->pool;
output->bufs.num = 1;
output->tag = (ngx_buf_tag_t) &ngx_http_proxy_module;
output->output_filter = (ngx_output_chain_filter_pt) ngx_chain_writer;
output->output_filter = ngx_chain_writer;
if (!(writer = ngx_palloc(r->pool, sizeof(ngx_chain_writer_ctx_t)))) {
ngx_http_proxy_finalize_request(p, NGX_HTTP_INTERNAL_SERVER_ERROR);
@ -700,7 +668,7 @@ static void ngx_http_proxy_connect(ngx_http_proxy_ctx_t *p)
}
p->state->peer =
&p->upstream->peer.peers->peers[p->upstream->peer.cur_peer].addr_port_text;
&p->upstream->peer.peers->peer[p->upstream->peer.cur_peer].name;
if (rc == NGX_CONNECT_ERROR) {
ngx_http_proxy_next_upstream(p, NGX_HTTP_PROXY_FT_ERROR);
@ -733,7 +701,7 @@ static void ngx_http_proxy_connect(ngx_http_proxy_ctx_t *p)
}
if (r->request_body->buf) {
if (r->request_body->temp_file->file.fd != NGX_INVALID_FILE) {
if (r->request_body->temp_file) {
if (!(output->free = ngx_alloc_chain_link(r->pool))) {
ngx_http_proxy_finalize_request(p,
@ -1347,6 +1315,7 @@ static void ngx_http_proxy_send_response(ngx_http_proxy_ctx_t *p)
}
ep->preread_bufs->buf = p->header_in;
ep->preread_bufs->next = NULL;
p->header_in->recycled = 1;
ep->preread_size = p->header_in->last - p->header_in->pos;

16
src/http/ngx_http.h
View File

@ -13,6 +13,7 @@
#include <ngx_garbage_collector.h>
typedef struct ngx_http_request_s ngx_http_request_t;
typedef struct ngx_http_log_ctx_s ngx_http_log_ctx_t;
typedef struct ngx_http_cleanup_s ngx_http_cleanup_t;
typedef struct ngx_http_in_addr_s ngx_http_in_addr_t;
@ -22,6 +23,7 @@ typedef struct ngx_http_in_addr_s ngx_http_in_addr_t;
/* STUB */
#include <ngx_http_cache.h>
#include <ngx_http_upstream.h>
#include <ngx_http_request.h>
#include <ngx_http_config.h>
#include <ngx_http_busy_lock.h>
@ -33,8 +35,8 @@ typedef struct ngx_http_in_addr_s ngx_http_in_addr_t;
#endif
typedef struct {
u_int connection;
struct ngx_http_log_ctx_s {
ngx_uint_t connection;
/*
* we declare "action" as "char *" because the actions are usually
@ -45,18 +47,23 @@ typedef struct {
char *action;
ngx_str_t *client;
ngx_http_request_t *request;
} ngx_http_log_ctx_t;
};
#define ngx_http_get_module_ctx(r, module) r->ctx[module.ctx_index]
#define ngx_http_get_module_err_ctx(r, module) \
(r->err_ctx ? r->err_ctx[module.ctx_index] : r->ctx[module.ctx_index])
/* STUB */
#define ngx_http_create_ctx(r, cx, module, size, error) \
do { \
ngx_test_null(cx, ngx_pcalloc(r->pool, size), error); \
r->ctx[module.ctx_index] = cx; \
} while (0)
/**/
#define ngx_http_set_ctx(r, c, module) \
r->ctx[module.ctx_index] = c;
#define ngx_http_delete_ctx(r, module) \
r->ctx[module.ctx_index] = NULL;
@ -80,7 +87,8 @@ void ngx_http_close_request(ngx_http_request_t *r, int error);
void ngx_http_close_connection(ngx_connection_t *c);
ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r);
ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r,
ngx_http_client_body_handler_pt post_handler);
ngx_int_t ngx_http_send_header(ngx_http_request_t *r);
ngx_int_t ngx_http_special_response_handler(ngx_http_request_t *r, int error);

58
src/http/ngx_http_core_module.c
View File

@ -205,6 +205,13 @@ static ngx_command_t ngx_http_core_commands[] = {
offsetof(ngx_http_core_loc_conf_t, client_body_timeout),
NULL },
{ ngx_string("client_body_temp_path"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234,
ngx_conf_set_path_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_core_loc_conf_t, client_body_temp_path),
(void *) ngx_garbage_collector_temp_handler },
{ ngx_string("sendfile"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
@ -1288,15 +1295,11 @@ static void *ngx_http_core_create_srv_conf(ngx_conf_t *cf)
ngx_test_null(cscf,
ngx_pcalloc(cf->pool, sizeof(ngx_http_core_srv_conf_t)),
NGX_CONF_ERROR);
/*
set by ngx_pcalloc():
conf->client_large_buffers.num = 0;
*/
*
* set by ngx_pcalloc():
* conf->client_large_buffers.num = 0;
*/
ngx_init_array(cscf->locations, cf->pool,
5, sizeof(void *), NGX_CONF_ERROR);
@ -1398,22 +1401,22 @@ static void *ngx_http_core_create_loc_conf(ngx_conf_t *cf)
ngx_pcalloc(cf->pool, sizeof(ngx_http_core_loc_conf_t)),
NGX_CONF_ERROR);
/* set by ngx_pcalloc():
lcf->root.len = 0;
lcf->root.data = NULL;
lcf->types = NULL;
lcf->default_type.len = 0;
lcf->default_type.data = NULL;
lcf->err_log = NULL;
lcf->error_pages = NULL;
lcf->regex = NULL;
lcf->exact_match = 0;
lcf->auto_redirect = 0;
lcf->alias = 0;
*/
/*
* set by ngx_pcalloc():
*
* lcf->root.len = 0;
* lcf->root.data = NULL;
* lcf->types = NULL;
* lcf->default_type.len = 0;
* lcf->default_type.data = NULL;
* lcf->err_log = NULL;
* lcf->error_pages = NULL;
* lcf->client_body_path = NULL;
* lcf->regex = NULL;
* lcf->exact_match = 0;
* lcf->auto_redirect = 0;
* lcf->alias = 0;
*/
lcf->client_max_body_size = NGX_CONF_UNSET_SIZE;
lcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE;
@ -1526,6 +1529,11 @@ static char *ngx_http_core_merge_loc_conf(ngx_conf_t *cf,
ngx_conf_merge_msec_value(conf->lingering_timeout,
prev->lingering_timeout, 5000);
ngx_conf_merge_path_value(conf->client_body_temp_path,
prev->client_body_temp_path,
NGX_HTTP_CLIENT_TEMP_PATH, 0, 0, 0,
ngx_garbage_collector_temp_handler, cf);
ngx_conf_merge_value(conf->reset_timedout_connection,
prev->reset_timedout_connection, 0);
ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1);
@ -1746,7 +1754,7 @@ static char *ngx_set_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
if (overwrite == NGX_ERROR) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid value \"%V\"", value[i]);
"invalid value \"%V\"", &value[i]);
return NGX_CONF_ERROR;
}

2
src/http/ngx_http_core_module.h
View File

@ -199,6 +199,8 @@ struct ngx_http_core_loc_conf_s {
ngx_array_t *error_pages; /* error_page */
ngx_path_t *client_body_temp_path; /* client_body_temp_path */
ngx_http_cache_hash_t *open_files;
ngx_log_t *err_log;

734
src/http/ngx_http_log_handler.c
View File

@ -11,40 +11,64 @@
static u_char *ngx_http_log_addr(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static u_char *ngx_http_log_connection(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static u_char *ngx_http_log_msec(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
static u_char *ngx_http_log_request(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static u_char *ngx_http_log_status(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static u_char *ngx_http_log_length(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static u_char *ngx_http_log_apache_length(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static size_t ngx_http_log_request_getlen(ngx_http_request_t *r,
uintptr_t data);
static u_char *ngx_http_log_request(ngx_http_request_t *r, u_char *buf,
ngx_http_log_op_t *op);
static ngx_int_t ngx_http_log_header_in_compile(ngx_http_log_op_t *op,
ngx_str_t *value);
static size_t ngx_http_log_header_in_getlen(ngx_http_request_t *r,
uintptr_t data);
static u_char *ngx_http_log_header_in(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static size_t ngx_http_log_unknown_header_in_getlen(ngx_http_request_t *r,
uintptr_t data);
static u_char *ngx_http_log_unknown_header_in(ngx_http_request_t *r,
u_char *buf,
ngx_http_log_op_t *op);
static ngx_int_t ngx_http_log_header_out_compile(ngx_http_log_op_t *op,
ngx_str_t *value);
static size_t ngx_http_log_header_out_getlen(ngx_http_request_t *r,
uintptr_t data);
static u_char *ngx_http_log_header_out(ngx_http_request_t *r, u_char *buf,
ngx_http_log_op_t *op);
static size_t ngx_http_log_unknown_header_out_getlen(ngx_http_request_t *r,
uintptr_t data);
static u_char *ngx_http_log_unknown_header_out(ngx_http_request_t *r,
u_char *buf,
ngx_http_log_op_t *op);
static u_char *ngx_http_log_connection_header_out(ngx_http_request_t *r,
u_char *buf, uintptr_t data);
u_char *buf,
ngx_http_log_op_t *op);
static u_char *ngx_http_log_transfer_encoding_header_out(ngx_http_request_t *r,
u_char *buf,
uintptr_t data);
static u_char *ngx_http_log_unknown_header_in(ngx_http_request_t *r,
u_char *buf, uintptr_t data);
static u_char *ngx_http_log_header_out(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
static u_char *ngx_http_log_unknown_header_out(ngx_http_request_t *r, u_char *buf,
uintptr_t data);
ngx_http_log_op_t *op);
static ngx_int_t ngx_http_log_pre_conf(ngx_conf_t *cf);
static ngx_table_elt_t *ngx_http_log_unknown_header(ngx_list_t *headers,
ngx_str_t *value);
static ngx_int_t ngx_http_log_set_formats(ngx_conf_t *cf);
static void *ngx_http_log_create_main_conf(ngx_conf_t *cf);
static void *ngx_http_log_create_loc_conf(ngx_conf_t *cf);
static char *ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent,
@ -78,7 +102,7 @@ static ngx_command_t ngx_http_log_commands[] = {
ngx_http_module_t ngx_http_log_module_ctx = {
ngx_http_log_pre_conf, /* pre conf */
ngx_http_log_set_formats, /* pre conf */
ngx_http_log_create_main_conf, /* create main configuration */
NULL, /* init main configuration */
@ -110,28 +134,38 @@ static ngx_str_t ngx_http_combined_fmt =
ngx_http_log_op_name_t ngx_http_log_fmt_ops[] = {
{ ngx_string("addr"), INET_ADDRSTRLEN - 1, ngx_http_log_addr },
{ ngx_string("conn"), NGX_INT32_LEN, ngx_http_log_connection },
{ ngx_string("pipe"), 1, ngx_http_log_pipe },
{ ngx_string("addr"), INET_ADDRSTRLEN - 1, NULL, NULL, ngx_http_log_addr },
{ ngx_string("conn"), NGX_INT32_LEN, NULL, NULL, ngx_http_log_connection },
{ ngx_string("pipe"), 1, NULL, NULL, ngx_http_log_pipe },
{ ngx_string("time"), sizeof("28/Sep/1970:12:00:00") - 1,
ngx_http_log_time },
{ ngx_string("msec"), NGX_TIME_T_LEN + 4, ngx_http_log_msec },
{ ngx_string("request"), 0, ngx_http_log_request },
{ ngx_string("status"), 3, ngx_http_log_status },
{ ngx_string("length"), NGX_OFF_T_LEN, ngx_http_log_length },
{ ngx_string("apache_length"), NGX_OFF_T_LEN, ngx_http_log_apache_length },
NULL, NULL, ngx_http_log_time },
{ ngx_string("msec"), NGX_TIME_T_LEN + 4, NULL, NULL, ngx_http_log_msec },
{ ngx_string("status"), 3, NULL, NULL, ngx_http_log_status },
{ ngx_string("length"), NGX_OFF_T_LEN, NULL, NULL, ngx_http_log_length },
{ ngx_string("apache_length"), NGX_OFF_T_LEN,
NULL, NULL, ngx_http_log_apache_length },
{ ngx_string("request_length"), NGX_SIZE_T_LEN,
ngx_http_log_request_length },
{ ngx_string("i"), NGX_HTTP_LOG_ARG, ngx_http_log_header_in },
{ ngx_string("o"), NGX_HTTP_LOG_ARG, ngx_http_log_header_out },
{ ngx_null_string, 0, NULL }
NULL, NULL, ngx_http_log_request_length },
{ ngx_string("request"), 0, NULL,
ngx_http_log_request_getlen,
ngx_http_log_request },
{ ngx_string("i"), 0, ngx_http_log_header_in_compile,
ngx_http_log_header_in_getlen,
ngx_http_log_header_in },
{ ngx_string("o"), 0, ngx_http_log_header_out_compile,
ngx_http_log_header_out_getlen,
ngx_http_log_header_out },
{ ngx_null_string, 0, NULL, NULL, NULL }
};
ngx_int_t ngx_http_log_handler(ngx_http_request_t *r)
{
ngx_uint_t i, l;
uintptr_t data;
u_char *line, *p;
size_t len;
ngx_http_log_t *log;
@ -157,7 +191,7 @@ ngx_int_t ngx_http_log_handler(ngx_http_request_t *r)
op = log[l].ops->elts;
for (i = 0; i < log[l].ops->nelts; i++) {
if (op[i].len == 0) {
len += (size_t) op[i].op(r, NULL, op[i].data);
len += op[i].getlen(r, op[i].data);
} else {
len += op[i].len;
@ -177,20 +211,7 @@ ngx_int_t ngx_http_log_handler(ngx_http_request_t *r)
p = line;
for (i = 0; i < log[l].ops->nelts; i++) {
if (op[i].op == NGX_HTTP_LOG_COPY_SHORT) {
len = op[i].len;
data = op[i].data;
while (len--) {
*p++ = (char) (data & 0xff);
data >>= 8;
}
} else if (op[i].op == NGX_HTTP_LOG_COPY_LONG) {
p = ngx_cpymem(p, (void *) op[i].data, op[i].len);
} else {
p = op[i].op(r, p, op[i].data);
}
p = op[i].run(r, p, &op[i]);
}
#if (NGX_WIN32)
@ -206,8 +227,33 @@ ngx_int_t ngx_http_log_handler(ngx_http_request_t *r)
}
static u_char *ngx_http_log_copy_short(ngx_http_request_t *r, u_char *buf,
ngx_http_log_op_t *op)
{
size_t len;
uintptr_t data;
len = op->len;
data = op->data;
while (len--) {
*buf++ = (u_char) (data & 0xff);
data >>= 8;
}
return buf;
}
static u_char *ngx_http_log_copy_long(ngx_http_request_t *r, u_char *buf,
ngx_http_log_op_t *op)
{
return ngx_cpymem(buf, (u_char *) op->data, op->len);
}
static u_char *ngx_http_log_addr(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
ngx_http_log_op_t *op)
{
return ngx_cpymem(buf, r->connection->addr_text.data,
r->connection->addr_text.len);
@ -215,14 +261,14 @@ static u_char *ngx_http_log_addr(ngx_http_request_t *r, u_char *buf,
static u_char *ngx_http_log_connection(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
ngx_http_log_op_t *op)
{
return ngx_sprintf(buf, "%ui", r->connection->number);
}
static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
ngx_http_log_op_t *op)
{
if (r->pipeline) {
*buf = 'p';
@ -235,7 +281,7 @@ static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf,
static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
ngx_http_log_op_t *op)
{
return ngx_cpymem(buf, ngx_cached_http_log_time.data,
ngx_cached_http_log_time.len);
@ -243,7 +289,7 @@ static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf,
static u_char *ngx_http_log_msec(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
ngx_http_log_op_t *op)
{
struct timeval tv;
@ -253,20 +299,22 @@ static u_char *ngx_http_log_msec(ngx_http_request_t *r, u_char *buf,
}
static u_char *ngx_http_log_request(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
static size_t ngx_http_log_request_getlen(ngx_http_request_t *r,
uintptr_t data)
{
if (buf == NULL) {
/* find the request line length */
return (u_char *) r->request_line.len;
}
return r->request_line.len;
}
static u_char *ngx_http_log_request(ngx_http_request_t *r, u_char *buf,
ngx_http_log_op_t *op)
{
return ngx_cpymem(buf, r->request_line.data, r->request_line.len);
}
static u_char *ngx_http_log_status(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
ngx_http_log_op_t *op)
{
return ngx_sprintf(buf, "%ui",
r->err_status ? r->err_status : r->headers_out.status);
@ -274,95 +322,320 @@ static u_char *ngx_http_log_status(ngx_http_request_t *r, u_char *buf,
static u_char *ngx_http_log_length(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
ngx_http_log_op_t *op)
{
return ngx_sprintf(buf, "%O", r->connection->sent);
}
static u_char *ngx_http_log_apache_length(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
ngx_http_log_op_t *op)
{
return ngx_sprintf(buf, "%O", r->connection->sent - r->header_size);
}
static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
ngx_http_log_op_t *op)
{
return ngx_sprintf(buf, "%z", r->request_length);
}
static u_char *ngx_http_log_header_in(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
static ngx_int_t ngx_http_log_header_in_compile(ngx_http_log_op_t *op,
ngx_str_t *value)
{
ngx_uint_t i;
ngx_str_t *s;
ngx_table_elt_t *h;
ngx_http_log_op_t *op;
if (r) {
h = *(ngx_table_elt_t **) ((char *) &r->headers_in + data);
if (h == NULL) {
/* no header */
if (buf) {
*buf = '-';
}
return buf + 1;
}
if (buf == NULL) {
/* find the header length */
return (u_char *) h->value.len;
}
return ngx_cpymem(buf, h->value.data, h->value.len);
}
/* find an offset while a format string compilation */
op = (ngx_http_log_op_t *) buf;
s = (ngx_str_t *) data;
ngx_uint_t i;
op->len = 0;
for (i = 0; ngx_http_headers_in[i].name.len != 0; i++) {
if (ngx_http_headers_in[i].name.len != s->len) {
if (ngx_http_headers_in[i].name.len != value->len) {
continue;
}
if (ngx_strncasecmp(ngx_http_headers_in[i].name.data, s->data, s->len)
== 0)
if (ngx_strncasecmp(ngx_http_headers_in[i].name.data, value->data,
value->len) == 0)
{
op->op = ngx_http_log_header_in;
op->getlen = ngx_http_log_header_in_getlen;
op->run = ngx_http_log_header_in;
op->data = ngx_http_headers_in[i].offset;
return NULL;
return NGX_OK;
}
}
op->op = ngx_http_log_unknown_header_in;
op->data = (uintptr_t) s;
op->getlen = ngx_http_log_unknown_header_in_getlen;
op->run = ngx_http_log_unknown_header_in;
op->data = (uintptr_t) value;
return NULL;
return NGX_OK;
}
static size_t ngx_http_log_header_in_getlen(ngx_http_request_t *r,
uintptr_t data)
{
ngx_table_elt_t *h;
h = *(ngx_table_elt_t **) ((char *) &r->headers_in + data);
if (h) {
return h->value.len;
}
return 1;
}
static u_char *ngx_http_log_header_in(ngx_http_request_t *r, u_char *buf,
ngx_http_log_op_t *op)
{
ngx_table_elt_t *h;
h = *(ngx_table_elt_t **) ((char *) &r->headers_in + op->data);
if (h) {
return ngx_cpymem(buf, h->value.data, h->value.len);
}
*buf = '-';
return buf + 1;
}
static size_t ngx_http_log_unknown_header_in_getlen(ngx_http_request_t *r,
uintptr_t data)
{
ngx_table_elt_t *h;
h = ngx_http_log_unknown_header(&r->headers_in.headers, (ngx_str_t *) data);
if (h) {
return h->value.len;
}
return 1;
}
static u_char *ngx_http_log_unknown_header_in(ngx_http_request_t *r,
u_char *buf, uintptr_t data)
u_char *buf,
ngx_http_log_op_t *op)
{
ngx_table_elt_t *h;
h = ngx_http_log_unknown_header(&r->headers_in.headers,
(ngx_str_t *) op->data);
if (h) {
return ngx_cpymem(buf, h->value.data, h->value.len);
}
*buf = '-';
return buf + 1;
}
static ngx_int_t ngx_http_log_header_out_compile(ngx_http_log_op_t *op,
ngx_str_t *value)
{
ngx_uint_t i;
op->len = 0;
for (i = 0; ngx_http_headers_out[i].name.len != 0; i++) {
if (ngx_http_headers_out[i].name.len != value->len) {
continue;
}
if (ngx_strncasecmp(ngx_http_headers_out[i].name.data, value->data,
value->len) == 0)
{
op->getlen = ngx_http_log_header_out_getlen;
op->run = ngx_http_log_header_out;
op->data = ngx_http_headers_out[i].offset;
return NGX_OK;
}
}
if (value->len == sizeof("Connection") - 1
&& ngx_strncasecmp(value->data, "Connection", value->len) == 0)
{
op->len = sizeof("keep-alive") - 1;
op->getlen = NULL;
op->run = ngx_http_log_connection_header_out;
op->data = 0;
return NGX_OK;
}
if (value->len == sizeof("Transfer-Encoding") - 1
&& ngx_strncasecmp(value->data, "Transfer-Encoding", value->len) == 0)
{
op->len = sizeof("chunked") - 1;
op->getlen = NULL;
op->run = ngx_http_log_transfer_encoding_header_out;
op->data = 0;
return NGX_OK;
}
op->getlen = ngx_http_log_unknown_header_out_getlen;
op->run = ngx_http_log_unknown_header_out;
op->data = (uintptr_t) value;
return NGX_OK;
}
static size_t ngx_http_log_header_out_getlen(ngx_http_request_t *r,
uintptr_t data)
{
ngx_table_elt_t *h;
h = *(ngx_table_elt_t **) ((char *) &r->headers_out + data);
if (h) {
return h->value.len;
}
/*
* No header pointer was found.
* However, some headers: "Date", "Server", "Content-Length",
* and "Last-Modified" have a special handling in the header filter
* but we do not set up their pointers in the filter because
* they are too seldom needed to be logged.
*/
if (data == offsetof(ngx_http_headers_out_t, date)) {
return ngx_cached_http_time.len;
}
if (data == offsetof(ngx_http_headers_out_t, server)) {
return (sizeof(NGINX_VER) - 1);
}
if (data == offsetof(ngx_http_headers_out_t, content_length)) {
if (r->headers_out.content_length_n == -1) {
return 1;
}
return NGX_OFF_T_LEN;
}
if (data == offsetof(ngx_http_headers_out_t, last_modified)) {
if (r->headers_out.last_modified_time == -1) {
return 1;
}
return sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1;
}
return 1;
}
static u_char *ngx_http_log_header_out(ngx_http_request_t *r, u_char *buf,
ngx_http_log_op_t *op)
{
ngx_table_elt_t *h;
h = *(ngx_table_elt_t **) ((char *) &r->headers_out + op->data);
if (h) {
return ngx_cpymem(buf, h->value.data, h->value.len);
}
/*
* No header pointer was found.
* However, some headers: "Date", "Server", "Content-Length",
* and "Last-Modified" have a special handling in the header filter
* but we do not set up their pointers in the filter because
* they are too seldom needed to be logged.
*/
if (op->data == offsetof(ngx_http_headers_out_t, date)) {
return ngx_cpymem(buf, ngx_cached_http_time.data,
ngx_cached_http_time.len);
}
if (op->data == offsetof(ngx_http_headers_out_t, server)) {
return ngx_cpymem(buf, NGINX_VER, sizeof(NGINX_VER) - 1);
}
if (op->data == offsetof(ngx_http_headers_out_t, content_length)) {
if (r->headers_out.content_length_n == -1) {
*buf = '-';
return buf + 1;
}
return ngx_sprintf(buf, "%O", r->headers_out.content_length_n);
}
if (op->data == offsetof(ngx_http_headers_out_t, last_modified)) {
if (r->headers_out.last_modified_time == -1) {
*buf = '-';
return buf + 1;
}
return ngx_http_time(buf, r->headers_out.last_modified_time);
}
*buf = '-';
return buf + 1;
}
static size_t ngx_http_log_unknown_header_out_getlen(ngx_http_request_t *r,
uintptr_t data)
{
ngx_table_elt_t *h;
h = ngx_http_log_unknown_header(&r->headers_out.headers,
(ngx_str_t *) data);
if (h) {
return h->value.len;
}
return 1;
}
static u_char *ngx_http_log_unknown_header_out(ngx_http_request_t *r,
u_char *buf,
ngx_http_log_op_t *op)
{
ngx_table_elt_t *h;
h = ngx_http_log_unknown_header(&r->headers_out.headers,
(ngx_str_t *) op->data);
if (h) {
return ngx_cpymem(buf, h->value.data, h->value.len);
}
*buf = '-';
return buf + 1;
}
static ngx_table_elt_t *ngx_http_log_unknown_header(ngx_list_t *headers,
ngx_str_t *value)
{
ngx_uint_t i;
ngx_str_t *s;
ngx_list_part_t *part;
ngx_table_elt_t *h;
s = (ngx_str_t *) data;
part = &r->headers_in.headers.part;
part = &headers->part;
h = part->elts;
for (i = 0; /* void */; i++) {
@ -377,172 +650,23 @@ static u_char *ngx_http_log_unknown_header_in(ngx_http_request_t *r,
i = 0;
}
if (h[i].key.len != s->len) {
if (h[i].key.len != value->len) {
continue;
}
if (ngx_strncasecmp(h[i].key.data, s->data, s->len) == 0) {
if (buf == NULL) {
/* find the header length */
return (u_char *) h[i].value.len;
}
return ngx_cpymem(buf, h[i].value.data, h[i].value.len);
if (ngx_strncasecmp(h[i].key.data, value->data, value->len) == 0) {
return &h[i];
}
}
/* no header */
if (buf) {
*buf = '-';
}
return buf + 1;
}
static u_char *ngx_http_log_header_out(ngx_http_request_t *r, u_char *buf,
uintptr_t data)
{
ngx_uint_t i;
ngx_str_t *s;
ngx_table_elt_t *h;
ngx_http_log_op_t *op;
if (r) {
/* run-time execution */
if (r->http_version < NGX_HTTP_VERSION_10) {
if (buf) {
*buf = '-';
}
return buf + 1;
}
h = *(ngx_table_elt_t **) ((char *) &r->headers_out + data);
if (h == NULL) {
/*
* No header pointer was found.
* However, some headers: "Date", "Server", "Content-Length",
* and "Last-Modified" have a special handling in the header filter
* but we do not set up their pointers in the filter because
* they are too seldom needed to be logged.
*/
if (data == offsetof(ngx_http_headers_out_t, date)) {
if (buf == NULL) {
return (u_char *) ngx_cached_http_time.len;
}
return ngx_cpymem(buf, ngx_cached_http_time.data,
ngx_cached_http_time.len);
}
if (data == offsetof(ngx_http_headers_out_t, server)) {
if (buf == NULL) {
return (u_char *) (sizeof(NGINX_VER) - 1);
}
return ngx_cpymem(buf, NGINX_VER, sizeof(NGINX_VER) - 1);
}
if (data == offsetof(ngx_http_headers_out_t, content_length)) {
if (r->headers_out.content_length_n == -1) {
if (buf) {
*buf = '-';
}
return buf + 1;
}
if (buf == NULL) {
return (u_char *) NGX_OFF_T_LEN;
}
return ngx_sprintf(buf, "%O", r->headers_out.content_length_n);
}
if (data == offsetof(ngx_http_headers_out_t, last_modified)) {
if (r->headers_out.last_modified_time == -1) {
if (buf) {
*buf = '-';
}
return buf + 1;
}
if (buf == NULL) {
return (u_char *)
sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1;
}
return ngx_http_time(buf, r->headers_out.last_modified_time);
}
if (buf) {
*buf = '-';
}
return buf + 1;
}
if (buf == NULL) {
/* find the header length */
return (u_char *) h->value.len;
}
return ngx_cpymem(buf, h->value.data, h->value.len);
}
/* find an offset while a format string compilation */
op = (ngx_http_log_op_t *) buf;
s = (ngx_str_t *) data;
op->len = 0;
for (i = 0; ngx_http_headers_out[i].name.len != 0; i++) {
if (ngx_http_headers_out[i].name.len != s->len) {
continue;
}
if (ngx_strncasecmp(ngx_http_headers_out[i].name.data, s->data, s->len)
== 0)
{
op->op = ngx_http_log_header_out;
op->data = ngx_http_headers_out[i].offset;
return NULL;
}
}
if (s->len == sizeof("Connection") - 1
&& ngx_strncasecmp(s->data, "Connection", s->len) == 0)
{
op->op = ngx_http_log_connection_header_out;
op->data = (uintptr_t) NULL;
return NULL;
}
if (s->len == sizeof("Transfer-Encoding") - 1
&& ngx_strncasecmp(s->data, "Transfer-Encoding", s->len) == 0) {
op->op = ngx_http_log_transfer_encoding_header_out;
op->data = (uintptr_t) NULL;
return NULL;
}
op->op = ngx_http_log_unknown_header_out;
op->data = (uintptr_t) s;
return NULL;
}
static u_char *ngx_http_log_connection_header_out(ngx_http_request_t *r,
u_char *buf, uintptr_t data)
u_char *buf,
ngx_http_log_op_t *op)
{
if (buf == NULL) {
return (u_char *) ((r->keepalive) ? sizeof("keep-alive") - 1:
sizeof("close") - 1);
}
if (r->keepalive) {
return ngx_cpymem(buf, "keep-alive", sizeof("keep-alive") - 1);
@ -554,12 +678,8 @@ static u_char *ngx_http_log_connection_header_out(ngx_http_request_t *r,
static u_char *ngx_http_log_transfer_encoding_header_out(ngx_http_request_t *r,
u_char *buf,
uintptr_t data)
ngx_http_log_op_t *op)
{
if (buf == NULL) {
return (u_char *) ((r->chunked) ? sizeof("chunked") - 1 : 1);
}
if (r->chunked) {
return ngx_cpymem(buf, "chunked", sizeof("chunked") - 1);
}
@ -570,62 +690,12 @@ static u_char *ngx_http_log_transfer_encoding_header_out(ngx_http_request_t *r,
}
static u_char *ngx_http_log_unknown_header_out(ngx_http_request_t *r,
u_char *buf,
uintptr_t data)
{
ngx_uint_t i;
ngx_str_t *s;
ngx_list_part_t *part;
ngx_table_elt_t *h;
s = (ngx_str_t *) data;
part = &r->headers_out.headers.part;
h = part->elts;
for (i = 0; /* void */; i++) {
if (i >= part->nelts) {
if (part->next == NULL) {
break;
}
part = part->next;
h = part->elts;
i = 0;
}
if (h[i].key.len != s->len) {
continue;
}
if (ngx_strncasecmp(h[i].key.data, s->data, s->len) == 0) {
if (buf == NULL) {
/* find the header length */
return (u_char *) h[i].value.len;
}
return ngx_cpymem(buf, h[i].value.data, h[i].value.len);
}
}
/* no header */
if (buf) {
*buf = '-';
}
return buf + 1;
}
static ngx_int_t ngx_http_log_pre_conf(ngx_conf_t *cf)
static ngx_int_t ngx_http_log_set_formats(ngx_conf_t *cf)
{
ngx_http_log_op_name_t *op;
for (op = ngx_http_log_fmt_ops; op->name.len; op++) { /* void */ }
op->op = NULL;
op->run = NULL;
return NGX_OK;
}
@ -889,15 +959,15 @@ static char *ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd,
break;
}
for (name = ngx_http_log_fmt_ops; name->op; name++) {
for (name = ngx_http_log_fmt_ops; name->run; name++) {
if (name->name.len == 0) {
name = (ngx_http_log_op_name_t *) name->op;
name = (ngx_http_log_op_name_t *) name->run;
}
if (name->name.len == fname_len
&& ngx_strncmp(name->name.data, fname, fname_len) == 0)
{
if (name->len != NGX_HTTP_LOG_ARG) {
if (name->compile == NULL) {
if (arg.len) {
fname[fname_len] = '\0';
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@ -907,7 +977,8 @@ static char *ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd,
}
op->len = name->len;
op->op = name->op;
op->getlen = name->getlen;
op->run = name->run;
op->data = 0;
break;
@ -926,7 +997,9 @@ static char *ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd,
}
*a = arg;
name->op(NULL, (u_char *) op, (uintptr_t) a);
if (name->compile(op, a) == NGX_ERROR) {
return NGX_CONF_ERROR;
}
break;
}
@ -949,9 +1022,10 @@ static char *ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd,
if (len) {
op->len = len;
op->getlen = NULL;
if (len <= sizeof(uintptr_t)) {
op->op = NGX_HTTP_LOG_COPY_SHORT;
op->run = ngx_http_log_copy_short;
op->data = 0;
while (len--) {
@ -960,7 +1034,7 @@ static char *ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd,
}
} else {
op->op = NGX_HTTP_LOG_COPY_LONG;
op->run = ngx_http_log_copy_long;
if (!(p = ngx_palloc(cf->pool, len))) {
return NGX_CONF_ERROR;

49
src/http/ngx_http_log_handler.h
View File

@ -13,49 +13,54 @@
#include <ngx_http.h>
typedef u_char *(*ngx_http_log_op_pt) (ngx_http_request_t *r, u_char *buf,
uintptr_t data);
typedef struct ngx_http_log_op_s ngx_http_log_op_t;
#define NGX_HTTP_LOG_COPY_SHORT (ngx_http_log_op_pt) 0
#define NGX_HTTP_LOG_COPY_LONG (ngx_http_log_op_pt) -1
typedef u_char *(*ngx_http_log_op_run_pt) (ngx_http_request_t *r, u_char *buf,
ngx_http_log_op_t *op);
#define NGX_HTTP_LOG_ARG (u_int) -1
typedef size_t (*ngx_http_log_op_getlen_pt) (ngx_http_request_t *r,
uintptr_t data);
typedef ngx_int_t (*ngx_http_log_op_compile_pt) (ngx_http_log_op_t *op,
ngx_str_t *value);
struct ngx_http_log_op_s {
size_t len;
ngx_http_log_op_getlen_pt getlen;
ngx_http_log_op_run_pt run;
uintptr_t data;
};
typedef struct {
size_t len;
ngx_http_log_op_pt op;
uintptr_t data;
} ngx_http_log_op_t;
typedef struct {
ngx_str_t name;
ngx_array_t *ops; /* array of ngx_http_log_op_t */
ngx_str_t name;
ngx_array_t *ops; /* array of ngx_http_log_op_t */
} ngx_http_log_fmt_t;
typedef struct {
ngx_str_t name;
size_t len;
ngx_http_log_op_pt op;
ngx_str_t name;
size_t len;
ngx_http_log_op_compile_pt compile;
ngx_http_log_op_getlen_pt getlen;
ngx_http_log_op_run_pt run;
} ngx_http_log_op_name_t;
typedef struct {
ngx_array_t formats; /* array of ngx_http_log_fmt_t */
ngx_array_t formats; /* array of ngx_http_log_fmt_t */
} ngx_http_log_main_conf_t;
typedef struct {
ngx_open_file_t *file;
ngx_array_t *ops; /* array of ngx_http_log_op_t */
ngx_open_file_t *file;
ngx_array_t *ops; /* array of ngx_http_log_op_t */
} ngx_http_log_t;
typedef struct {
ngx_array_t *logs; /* array of ngx_http_log_t */
ngx_uint_t off; /* unsigned off:1 */
ngx_array_t *logs; /* array of ngx_http_log_t */
ngx_uint_t off; /* unsigned off:1 */
} ngx_http_log_loc_conf_t;

221
src/http/ngx_http_parse.c
View File

@ -34,15 +34,13 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
sw_major_digit,
sw_first_minor_digit,
sw_minor_digit,
sw_almost_done,
sw_done
sw_almost_done
} state;
state = r->state;
p = b->pos;
while (p < b->last && state < sw_done) {
ch = *p++;
for (p = b->pos; p < b->last; p++) {
ch = *p;
/* gcc 2.95.2 and msvc 6.0 compile this switch as an jump table */
@ -50,7 +48,7 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
/* HTTP methods: GET, HEAD, POST */
case sw_start:
r->request_start = p - 1;
r->request_start = p;
if (ch == CR || ch == LF) {
break;
@ -65,19 +63,19 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_method:
if (ch == ' ') {
r->method_end = p - 1;
r->method_end = p;
m = r->request_start;
if (r->method_end - m == 3) {
if (p - m == 3) {
if (m[0] == 'G' && m[1] == 'E' && m[2] == 'T') {
r->method = NGX_HTTP_GET;
}
} else if (r->method_end - m == 4) {
} else if (p - m == 4) {
if (m[0] == 'P' && m[1] == 'O'
&& m[2] == 'T' && m[3] == 'T')
&& m[2] == 'S' && m[3] == 'T')
{
r->method = NGX_HTTP_POST;
@ -113,14 +111,14 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_spaces_before_uri:
switch (ch) {
case '/':
r->uri_start = p - 1;
r->uri_start = p;
state = sw_after_slash_in_uri;
break;
case ' ':
break;
default:
if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z')) {
r->schema_start = p - 1;
r->schema_start = p;
state = sw_schema;
break;
}
@ -131,7 +129,7 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_schema:
switch (ch) {
case ':':
r->schema_end = p - 1;
r->schema_end = p;
state = sw_schema_slash;
break;
default:
@ -155,7 +153,7 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_schema_slash_slash:
switch (ch) {
case '/':
r->host_start = p - 1;
r->host_start = p;
state = sw_host;
break;
default:
@ -166,12 +164,12 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_host:
switch (ch) {
case ':':
r->host_end = p - 1;
r->host_end = p;
state = sw_port;
break;
case '/':
r->host_end = p - 1;
r->uri_start = p - 1;
r->host_end = p;
r->uri_start = p;
state = sw_after_slash_in_uri;
break;
default:
@ -187,8 +185,8 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_port:
switch (ch) {
case '/':
r->port_end = p - 1;
r->uri_start = p - 1;
r->port_end = p;
r->uri_start = p;
state = sw_after_slash_in_uri;
break;
default:
@ -203,17 +201,16 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_after_slash_in_uri:
switch (ch) {
case CR:
r->uri_end = p - 1;
r->uri_end = p;
r->http_minor = 9;
state = sw_almost_done;
break;
case LF:
r->uri_end = p - 1;
r->uri_end = p;
r->http_minor = 9;
state = sw_done;
break;
goto done;
case ' ':
r->uri_end = p - 1;
r->uri_end = p;
state = sw_http_09;
break;
case '.':
@ -233,7 +230,7 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
r->complex_uri = 1;
break;
case '?':
r->args_start = p;
r->args_start = p + 1;
state = sw_uri;
break;
default:
@ -246,21 +243,20 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_check_uri:
switch (ch) {
case CR:
r->uri_end = p - 1;
r->uri_end = p;
r->http_minor = 9;
state = sw_almost_done;
break;
case LF:
r->uri_end = p - 1;
r->uri_end = p;
r->http_minor = 9;
state = sw_done;
break;
goto done;
case ' ':
r->uri_end = p - 1;
r->uri_end = p;
state = sw_http_09;
break;
case '.':
r->uri_ext = p;
r->uri_ext = p + 1;
break;
#if (NGX_WIN32)
case '\\':
@ -277,7 +273,7 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
state = sw_uri;
break;
case '?':
r->args_start = p;
r->args_start = p + 1;
state = sw_uri;
break;
}
@ -287,17 +283,16 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_uri:
switch (ch) {
case CR:
r->uri_end = p - 1;
r->uri_end = p;
r->http_minor = 9;
state = sw_almost_done;
break;
case LF:
r->uri_end = p - 1;
r->uri_end = p;
r->http_minor = 9;
state = sw_done;
break;
goto done;
case ' ':
r->uri_end = p - 1;
r->uri_end = p;
state = sw_http_09;
break;
}
@ -314,9 +309,9 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
break;
case LF:
r->http_minor = 9;
state = sw_done;
break;
goto done;
case 'H':
r->http_protocol.data = p;
state = sw_http_H;
break;
default:
@ -406,8 +401,7 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
}
if (ch == LF) {
state = sw_done;
break;
goto done;
}
if (ch < '0' || ch > '9') {
@ -419,42 +413,38 @@ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
/* end of request line */
case sw_almost_done:
r->request_end = p - 2;
r->request_end = p - 1;
switch (ch) {
case LF:
state = sw_done;
break;
goto done;
default:
return NGX_HTTP_PARSE_INVALID_REQUEST;
}
break;
/* suppress warning */
case sw_done:
break;
}
}
b->pos = p;
r->state = state;
if (state == sw_done) {
if (r->request_end == NULL) {
r->request_end = p - 1;
}
return NGX_AGAIN;
r->http_version = r->http_major * 1000 + r->http_minor;
r->state = sw_start;
done:
if (r->http_version == 9 && r->method != NGX_HTTP_GET) {
return NGX_HTTP_PARSE_INVALID_09_METHOD;
}
b->pos = p + 1;
return NGX_OK;
} else {
r->state = state;
return NGX_AGAIN;
if (r->request_end == NULL) {
r->request_end = p;
}
r->http_version = r->http_major * 1000 + r->http_minor;
r->state = sw_start;
if (r->http_version == 9 && r->method != NGX_HTTP_GET) {
return NGX_HTTP_PARSE_INVALID_09_METHOD;
}
return NGX_OK;
}
@ -469,16 +459,13 @@ ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b)
sw_space_after_value,
sw_almost_done,
sw_header_almost_done,
sw_ignore_line,
sw_done,
sw_header_done
sw_ignore_line
} state;
state = r->state;
p = b->pos;
while (p < b->last && state < sw_done) {
ch = *p++;
for (p = b->pos; p < b->last; p++) {
ch = *p;
switch (state) {
@ -486,16 +473,15 @@ ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_start:
switch (ch) {
case CR:
r->header_end = p - 1;
r->header_end = p;
state = sw_header_almost_done;
break;
case LF:
r->header_end = p - 1;
state = sw_header_done;
break;
r->header_end = p;
goto header_done;
default:
state = sw_name;
r->header_name_start = p - 1;
r->header_name_start = p;
c = (u_char) (ch | 0x20);
if (c >= 'a' && c <= 'z') {
@ -523,7 +509,7 @@ ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b)
}
if (ch == ':') {
r->header_name_end = p - 1;
r->header_name_end = p;
state = sw_space_before_value;
break;
}
@ -539,7 +525,7 @@ ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b)
/* IIS may send the duplicate "HTTP/1.1 ..." lines */
if (ch == '/'
&& r->proxy
&& p - r->header_start == 5
&& p - r->header_start == 4
&& ngx_strncmp(r->header_start, "HTTP", 4) == 0)
{
state = sw_ignore_line;
@ -554,15 +540,14 @@ ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b)
case ' ':
break;
case CR:
r->header_start = r->header_end = p - 1;
r->header_start = r->header_end = p;
state = sw_almost_done;
break;
case LF:
r->header_start = r->header_end = p - 1;
state = sw_done;
break;
r->header_start = r->header_end = p;
goto done;
default:
r->header_start = p - 1;
r->header_start = p;
state = sw_value;
break;
}
@ -572,17 +557,16 @@ ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_value:
switch (ch) {
case ' ':
r->header_end = p - 1;
r->header_end = p;
state = sw_space_after_value;
break;
case CR:
r->header_end = p - 1;
r->header_end = p;
state = sw_almost_done;
break;
case LF:
r->header_end = p - 1;
state = sw_done;
break;
r->header_end = p;
goto done;
}
break;
@ -595,8 +579,7 @@ ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b)
state = sw_almost_done;
break;
case LF:
state = sw_done;
break;
goto done;
default:
state = sw_value;
break;
@ -618,8 +601,7 @@ ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_almost_done:
switch (ch) {
case LF:
state = sw_done;
break;
goto done;
default:
return NGX_HTTP_PARSE_INVALID_HEADER;
}
@ -629,34 +611,32 @@ ngx_int_t ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b)
case sw_header_almost_done:
switch (ch) {
case LF:
state = sw_header_done;
break;
goto header_done;
default:
return NGX_HTTP_PARSE_INVALID_HEADER;
}
break;
/* suppress warning */
case sw_done:
case sw_header_done:
break;
}
}
b->pos = p;
r->state = state;
if (state == sw_done) {
r->state = sw_start;
return NGX_OK;
return NGX_AGAIN;
} else if (state == sw_header_done) {
r->state = sw_start;
return NGX_HTTP_PARSE_HEADER_DONE;
done:
} else {
r->state = state;
return NGX_AGAIN;
}
b->pos = p + 1;
r->state = sw_start;
return NGX_OK;
header_done:
b->pos = p + 1;
r->state = sw_start;
return NGX_HTTP_PARSE_HEADER_DONE;
}
@ -677,8 +657,10 @@ ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r)
sw_quoted_second
} state, quoted_state;
#if (NGX_SUPPRESS_WARN)
decoded = '\0';
quoted_state = sw_usual;
#endif
state = sw_usual;
p = r->uri_start;
@ -688,10 +670,10 @@ ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r)
ch = *p++;
while (p <= r->uri_end && r->args_start == NULL) {
while (p <= r->uri_end) {
/*
* we use "ch = *p++" inside the cycle but this operation is safe
* we use "ch = *p++" inside the cycle, but this operation is safe,
* because after the URI there is always at least one charcter:
* the line feed
*/
@ -731,7 +713,7 @@ ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r)
break;
case '?':
r->args_start = p;
break;
goto done;
case ':':
state = sw_colon;
*u++ = ch;
@ -766,6 +748,9 @@ ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r)
quoted_state = state;
state = sw_quoted;
break;
case '?':
r->args_start = p;
goto done;
default:
state = sw_usual;
*u++ = ch;
@ -794,6 +779,9 @@ ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r)
quoted_state = state;
state = sw_quoted;
break;
case '?':
r->args_start = p;
goto done;
default:
state = sw_usual;
*u++ = ch;
@ -818,6 +806,9 @@ ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r)
quoted_state = state;
state = sw_quoted;
break;
case '?':
r->args_start = p;
goto done;
default:
state = sw_usual;
*u++ = ch;
@ -844,6 +835,9 @@ ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r)
quoted_state = state;
state = sw_quoted;
break;
case '?':
r->args_start = p;
goto done;
default:
state = sw_usual;
*u++ = ch;
@ -872,6 +866,9 @@ ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r)
quoted_state = state;
state = sw_quoted;
break;
case '?':
r->args_start = p;
goto done;
#if (NGX_WIN32)
case '.':
state = sw_dot_dot_dot;
@ -953,11 +950,9 @@ ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r)
c = (u_char) (ch | 0x20);
if (c >= 'a' && c <= 'f') {
ch = (u_char) ((decoded << 4) + c - 'a' + 10);
if (ch == '%') {
state = sw_usual;
if (ch == '?') {
*u++ = ch;
ch = *p++;
break;
}
state = quoted_state;
break;
@ -967,6 +962,8 @@ ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r)
}
}
done:
r->uri.len = u - r->uri.data;
r->uri.data[r->uri.len] = '\0';

41
src/http/ngx_http_parse_time.c
View File

@ -216,10 +216,6 @@ time_t ngx_http_parse_time(u_char *value, size_t len)
+ (*(p + 2) - '0') * 10 + *(p + 3) - '0';
}
#if 0
printf("%d.%d.%d %d:%d:%d\n", day, month + 1, year, hour, min, sec);
#endif
if (hour > 23 || min > 59 || sec > 59) {
return NGX_ERROR;
}
@ -239,7 +235,7 @@ time_t ngx_http_parse_time(u_char *value, size_t len)
/*
* shift new year to March 1 and start months from 1 (not 0),
* it's needed for Gauss's formula
* it is needed for Gauss's formula
*/
if (--month <= 0) {
@ -247,41 +243,16 @@ time_t ngx_http_parse_time(u_char *value, size_t len)
year -= 1;
}
/* Gauss's formula for Grigorian days from 1 March 1 BC */
/* Gauss's formula for Grigorian days from 1 March 1 BC */
return (365 * year + year / 4 - year / 100 + year / 400
+ 367 * month / 12 - 31
+ day
/*
* 719527 days were between March 1, 1 BC and March 1, 1970,
* 31 and 28 days in January and February 1970
*/
/*
* 719527 days were between March 1, 1 BC and March 1, 1970,
* 31 and 28 days in January and February 1970
*/
- 719527 + 31 + 28) * 86400 + hour * 3600 + min * 60 + sec;
}
#if 0
char zero[] = "Sun, 01 Jan 1970 08:49:30";
char one[] = "Sunday, 11-Dec-02 08:49:30";
char two[] = "Sun Mar 1 08:49:37 2000";
char thr[] = "Sun Dec 11 08:49:37 2002";
main()
{
int rc;
rc = ngx_http_parse_time(zero, sizeof(zero) - 1);
printf("rc: %d\n", rc);
rc = ngx_http_parse_time(one, sizeof(one) - 1);
printf("rc: %d\n", rc);
rc = ngx_http_parse_time(two, sizeof(two) - 1);
printf("rc: %d\n", rc);
rc = ngx_http_parse_time(thr, sizeof(thr) - 1);
printf("rc: %d\n", rc);
}
#endif

27
src/http/ngx_http_request.c
View File

@ -63,6 +63,8 @@ ngx_http_header_t ngx_http_headers_in[] = {
{ ngx_string("Referer"), offsetof(ngx_http_headers_in_t, referer) },
{ ngx_string("Content-Length"),
offsetof(ngx_http_headers_in_t, content_length) },
{ ngx_string("Content-Type"),
offsetof(ngx_http_headers_in_t, content_type) },
{ ngx_string("Range"), offsetof(ngx_http_headers_in_t, range) },
#if 0
@ -86,7 +88,7 @@ ngx_http_header_t ngx_http_headers_in[] = {
{ ngx_string("X-Real-IP"), offsetof(ngx_http_headers_in_t, x_real_ip) },
{ ngx_string("X-URL"), offsetof(ngx_http_headers_in_t, x_url) },
#endif
{ ngx_null_string, 0 }
};
@ -175,7 +177,7 @@ static void ngx_http_init_request(ngx_event_t *rev)
{
ngx_uint_t i;
socklen_t len;
struct sockaddr_in addr_in;
struct sockaddr_in sin;
ngx_connection_t *c;
ngx_http_request_t *r;
ngx_http_in_port_t *in_port;
@ -283,21 +285,19 @@ static void ngx_http_init_request(ngx_event_t *rev)
r->in_addr =
((struct sockaddr_in *) c->local_sockaddr)->sin_addr.s_addr;
} else {
} else
#endif
{
len = sizeof(struct sockaddr_in);
if (getsockname(c->fd, (struct sockaddr *) &addr_in, &len) == -1) {
if (getsockname(c->fd, (struct sockaddr *) &sin, &len) == -1) {
ngx_connection_error(c, ngx_socket_errno,
"getsockname() failed");
ngx_http_close_connection(c);
return;
}
r->in_addr = addr_in.sin_addr.s_addr;
#if (NGX_WIN32)
r->in_addr = sin.sin_addr.s_addr;
}
#endif
/* the last in_port->addrs address is "*" */
@ -573,6 +573,11 @@ static void ngx_http_process_request_line(ngx_event_t *rev)
}
if (r->http_protocol.data) {
r->http_protocol.len = r->request_end - r->http_protocol.data;
}
if (r->uri_ext) {
if (r->args_start) {
r->exten.len = r->args_start - 1 - r->uri_ext;
@ -2173,6 +2178,8 @@ void ngx_ssl_close_handler(ngx_event_t *ev)
void ngx_http_close_connection(ngx_connection_t *c)
{
ngx_pool_t *pool;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"close http connection: %d", c->fd);
@ -2192,7 +2199,11 @@ void ngx_http_close_connection(ngx_connection_t *c)
(*ngx_stat_active)--;
#endif
pool = c->pool;
ngx_close_connection(c);
ngx_destroy_pool(c->pool);
}

17
src/http/ngx_http_request.h
View File

@ -133,6 +133,7 @@ typedef struct {
ngx_table_elt_t *user_agent;
ngx_table_elt_t *referer;
ngx_table_elt_t *content_length;
ngx_table_elt_t *content_type;
ngx_table_elt_t *range;
@ -201,13 +202,14 @@ typedef struct {
} ngx_http_headers_out_t;
typedef void (*ngx_http_client_body_handler_pt)(ngx_http_request_t *r);
typedef struct {
ngx_temp_file_t *temp_file;
ngx_chain_t *bufs;
ngx_buf_t *buf;
size_t rest;
void (*handler) (void *data);
void *data;
ngx_temp_file_t *temp_file;
ngx_chain_t *bufs;
ngx_buf_t *buf;
size_t rest;
ngx_http_client_body_handler_pt post_handler;
} ngx_http_request_body_t;
@ -256,6 +258,8 @@ struct ngx_http_request_s {
ngx_http_cache_t *cache;
ngx_http_upstream_t *upstream;
ngx_file_t file;
ngx_pool_t *pool;
@ -280,6 +284,7 @@ struct ngx_http_request_s {
ngx_str_t unparsed_uri;
ngx_str_t method_name;
ngx_str_t http_protocol;
ngx_http_request_t *main;

163
src/http/ngx_http_request_body.c
View File

@ -11,31 +11,67 @@
static void ngx_http_read_client_request_body_handler(ngx_event_t *rev);
static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r);
static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r,
ngx_connection_t *c);
/*
* on completion ngx_http_read_client_request_body() adds to
* r->request_body->bufs one or two bufs:
* *) one memory buf that was preread in r->header_in;
* *) one memory or file buf that contains the rest of the body
*/
ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r,
ngx_http_client_body_handler_pt post_handler)
ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r)
{
ssize_t size;
ngx_buf_t *b;
ngx_chain_t *cl;
ngx_http_request_body_t *rb;
ngx_http_core_loc_conf_t *clcf;
if (!(rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t)))) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
r->request_body = rb;
if (r->headers_in.content_length_n <= 0) {
post_handler(r);
return NGX_OK;
}
rb->post_handler = post_handler;
/*
* set by ngx_pcalloc():
*
* rb->bufs = NULL;
* rb->buf = NULL;
* rb->rest = 0;
*/
size = r->header_in->last - r->header_in->pos;
if (size) {
/* there is the pre-read part of the request body */
ngx_test_null(b, ngx_calloc_buf(r->pool),
NGX_HTTP_INTERNAL_SERVER_ERROR);
if (!(b = ngx_calloc_buf(r->pool))) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
b->temporary = 1;
b->start = b->pos = r->header_in->pos;
b->end = b->last = r->header_in->last;
ngx_alloc_link_and_set_buf(r->request_body->bufs, b, r->pool,
NGX_HTTP_INTERNAL_SERVER_ERROR);
if (!(rb->bufs = ngx_alloc_chain_link(r->pool))) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
rb->bufs->buf = b;
rb->bufs->next = NULL;
if (size >= r->headers_in.content_length_n) {
@ -44,7 +80,7 @@ ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r)
r->header_in->pos += r->headers_in.content_length_n;
r->request_length += r->headers_in.content_length_n;
r->request_body->handler(r->request_body->data);
post_handler(r);
return NGX_OK;
}
@ -56,35 +92,39 @@ ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r)
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
r->request_body->rest = r->headers_in.content_length_n - size;
rb->rest = r->headers_in.content_length_n - size;
if (r->request_body->rest
< clcf->client_body_buffer_size
if (rb->rest < clcf->client_body_buffer_size
+ (clcf->client_body_buffer_size >> 2))
{
size = r->request_body->rest;
size = rb->rest;
} else {
size = clcf->client_body_buffer_size;
}
ngx_test_null(r->request_body->buf, ngx_create_temp_buf(r->pool, size),
NGX_HTTP_INTERNAL_SERVER_ERROR);
if (!(rb->buf = ngx_create_temp_buf(r->pool, size))) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
ngx_alloc_link_and_set_buf(cl, r->request_body->buf, r->pool,
NGX_HTTP_INTERNAL_SERVER_ERROR);
if (!(cl = ngx_alloc_chain_link(r->pool))) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
if (r->request_body->bufs) {
r->request_body->bufs->next = cl;
cl->buf = rb->buf;
cl->next = NULL;
if (rb->bufs) {
rb->bufs->next = cl;
} else {
r->request_body->bufs = cl;
rb->bufs = cl;
}
r->connection->read->event_handler =
ngx_http_read_client_request_body_handler;
return ngx_http_do_read_client_request_body(r);
return ngx_http_do_read_client_request_body(r, r->connection);
}
@ -102,7 +142,7 @@ static void ngx_http_read_client_request_body_handler(ngx_event_t *rev)
return;
}
rc = ngx_http_do_read_client_request_body(r);
rc = ngx_http_do_read_client_request_body(r, c);
if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
ngx_http_finalize_request(r, rc);
@ -110,24 +150,45 @@ static void ngx_http_read_client_request_body_handler(ngx_event_t *rev)
}
static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r)
static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r,
ngx_connection_t *c)
{
size_t size;
ssize_t n;
ngx_buf_t *b;
ngx_connection_t *c;
ngx_temp_file_t *tf;
ngx_http_request_body_t *rb;
ngx_http_core_loc_conf_t *clcf;
c = r->connection;
rb = r->request_body;
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http read client request body");
for ( ;; ) {
if (r->request_body->buf->last == r->request_body->buf->end) {
n = ngx_write_chain_to_temp_file(r->request_body->temp_file,
r->request_body->bufs->next ? r->request_body->bufs->next:
r->request_body->bufs);
if (rb->buf->last == rb->buf->end) {
if (rb->temp_file == NULL) {
if (!(tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t)))) {
return NGX_ERROR;
}
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
tf->file.fd = NGX_INVALID_FILE;
tf->file.log = r->connection->log;
tf->path = clcf->client_body_temp_path;
tf->pool = r->pool;
tf->warn = "a client request body is buffered "
"to a temporary file";
rb->temp_file = tf;
}
n = ngx_write_chain_to_temp_file(rb->temp_file,
rb->bufs->next ? rb->bufs->next:
rb->bufs);
/* TODO: n == 0 or not complete and level event */
@ -135,19 +196,19 @@ static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r)
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
r->request_body->temp_file->offset += n;
rb->temp_file->offset += n;
r->request_body->buf->pos = r->request_body->buf->start;
r->request_body->buf->last = r->request_body->buf->start;
rb->buf->pos = rb->buf->start;
rb->buf->last = rb->buf->start;
}
size = r->request_body->buf->end - r->request_body->buf->last;
size = rb->buf->end - rb->buf->last;
if (size > r->request_body->rest) {
size = r->request_body->rest;
if (size > rb->rest) {
size = rb->rest;
}
n = c->recv(c, r->request_body->buf->last, size);
n = c->recv(c, rb->buf->last, size);
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http client request body recv %z", n);
@ -173,33 +234,33 @@ static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r)
return NGX_HTTP_BAD_REQUEST;
}
r->request_body->buf->last += n;
r->request_body->rest -= n;
rb->buf->last += n;
rb->rest -= n;
r->request_length += n;
if (r->request_body->rest == 0) {
if (rb->rest == 0) {
break;
}
if (r->request_body->buf->last < r->request_body->buf->end) {
if (rb->buf->last < rb->buf->end) {
break;
}
}
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http client request body rest %uz",
r->request_body->rest);
"http client request body rest %uz", rb->rest);
if (r->request_body->rest) {
if (rb->rest) {
return NGX_AGAIN;
}
if (r->request_body->temp_file->file.fd != NGX_INVALID_FILE) {
if (rb->temp_file) {
/* save the last part */
n = ngx_write_chain_to_temp_file(r->request_body->temp_file,
r->request_body->bufs->next ? r->request_body->bufs->next:
r->request_body->bufs);
n = ngx_write_chain_to_temp_file(rb->temp_file,
rb->bufs->next ? rb->bufs->next:
rb->bufs);
/* TODO: n == 0 or not complete and level event */
@ -213,18 +274,18 @@ static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r)
b->in_file = 1;
b->file_pos = 0;
b->file_last = r->request_body->temp_file->file.offset;
b->file = &r->request_body->temp_file->file;
b->file_last = rb->temp_file->file.offset;
b->file = &rb->temp_file->file;
if (r->request_body->bufs->next) {
r->request_body->bufs->next->buf = b;
if (rb->bufs->next) {
rb->bufs->next->buf = b;
} else {
r->request_body->bufs->buf = b;
rb->bufs->buf = b;
}
}
r->request_body->handler(r->request_body->data);
rb->post_handler(r);
return NGX_OK;
}

42
src/http/ngx_http_script.c
View File

@ -9,42 +9,46 @@
#include <ngx_http.h>
char *ngx_http_script_copy(ngx_http_request_t *r,
ngx_http_script_code_t *code,
char *p, size_t len)
u_char *ngx_http_script_copy(ngx_http_request_t *r, u_char *buf, void *data)
{
return ngx_cpymem(p, code->offset, code->len < len ? code->len : len);
u_char **p = data;
ngx_http_script_code_t *code;
code = (ngx_http_script_code_t *)
((char *) data - sizeof(ngx_http_script_code_t));
return ngx_cpymem(buf, *p, code->data_len);
}
char *ngx_http_script_header_in(ngx_http_request_t *r,
ngx_http_script_code_t *code,
char *p, size_t len)
u_char *ngx_http_script_header_in(ngx_http_request_t *r,
u_char *buf, void *data)
{
ngx_str_t *s;
size_t *offset = data;
s = (ngx_str_t *) (((char *) r->headers_in) + code->offset);
ngx_table_elt_t *h;
return ngx_cpymem(p, s->data, s->len < len ? s->len : len);
h = *(ngx_table_elt_t **) (((char *) r->headers_in) + *offset);
return ngx_cpymem(p, h->value.data, h->value.len);
}
/* the log script codes */
char *ngx_http_script_request_line(ngx_http_request_t *r, char *p, size_t len)
u_char *ngx_http_script_request_line(ngx_http_request_t *r,
u_char *buf, void *data)
{
return ngx_cpymem(p, r->request_line.data,
r->request_line.len < len ? r->request_line.len : len);
return ngx_cpymem(p, r->request_line.data, r->request_line.len);
}
char *ngx_http_script_status(ngx_http_request_t *r, char *p, size_t len)
u_char *ngx_http_script_status(ngx_http_request_t *r, u_char *buf, void *data)
{
return ngx_snprintf(p, len, "%d", r->headers_out.status);
return ngx_sprintf(buf, "%ui", r->headers_out.status);
}
char *ngx_http_script_sent(ngx_http_request_t *r, char *p, size_t len)
u_char *ngx_http_script_sent(ngx_http_request_t *r, u_char *buf, void *data)
{
return ngx_sprintf(p, "%O", r->connection->sent);
return ngx_sprintf(buf, "%O", r->connection->sent);
}

16
src/http/ngx_http_script.h
View File

@ -8,10 +8,18 @@
#define _NGX_HTTP_SCRIPT_H_INCLUDED_
typedef struct {
handler;
offset / data;
size;
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_http.h>
typedef u_char *(*ngx_http_script_code_pt) (ngx_http_request_t *r,
u_char *buf, void *data);
typedef struct ngx_http_script_code_s {
size_t data_len;
size_t code_len;
ngx_http_script_code_pt code;
} ngx_http_script_code_t;

1204
src/http/ngx_http_upstream.c Normal file
View File

File diff suppressed because it is too large Load Diff

122
src/http/ngx_http_upstream.h Normal file
View File

@ -0,0 +1,122 @@
/*
* Copyright (C) Igor Sysoev
*/
#ifndef _NGX_HTTP_UPSTREAM_H_INCLUDED_
#define _NGX_HTTP_UPSTREAM_H_INCLUDED_
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_event.h>
#include <ngx_event_connect.h>
#include <ngx_event_pipe.h>
#include <ngx_http.h>
#define NGX_HTTP_UPSTREAM_FT_ERROR 0x02
#define NGX_HTTP_UPSTREAM_FT_TIMEOUT 0x04
#define NGX_HTTP_UPSTREAM_FT_INVALID_HEADER 0x08
#define NGX_HTTP_UPSTREAM_FT_HTTP_500 0x10
#define NGX_HTTP_UPSTREAM_FT_HTTP_404 0x20
#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK 0x40
#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING 0x80
#define NGX_HTTP_UPSTREAM_INVALID_HEADER 40
typedef struct {
time_t bl_time;
ngx_uint_t bl_state;
ngx_uint_t status;
time_t time;
ngx_str_t *peer;
} ngx_http_upstream_state_t;
typedef struct {
ngx_msec_t connect_timeout;
ngx_msec_t send_timeout;
ngx_msec_t read_timeout;
size_t send_lowat;
size_t header_buffer_size;
size_t busy_buffers_size;
size_t max_temp_file_size;
size_t temp_file_write_size;
ngx_uint_t next_upstream;
ngx_bufs_t bufs;
ngx_flag_t x_powered_by;
ngx_flag_t cyclic_temp_file;
ngx_path_t *temp_path;
} ngx_http_upstream_conf_t;
typedef struct ngx_http_upstream_s ngx_http_upstream_t;
struct ngx_http_upstream_s {
ngx_http_request_t *request;
ngx_peer_connection_t peer;
ngx_event_pipe_t pipe;
ngx_output_chain_ctx_t output;
ngx_chain_writer_ctx_t writer;
ngx_http_upstream_conf_t *conf;
ngx_buf_t header_in;
ngx_int_t (*create_request)(ngx_http_request_t *r);
ngx_int_t (*reinit_request)(ngx_http_request_t *r);
ngx_int_t (*process_header)(ngx_http_request_t *r);
ngx_int_t (*send_header)(ngx_http_request_t *r);
void (*abort_request)(ngx_http_request_t *r);
void (*finalize_request)(ngx_http_request_t *r,
ngx_int_t rc);
ngx_uint_t method;
ngx_str_t schema;
ngx_str_t uri;
ngx_str_t *location;
ngx_http_log_ctx_t *log_ctx;
ngx_log_handler_pt log_handler;
ngx_http_log_ctx_t *saved_ctx;
ngx_log_handler_pt saved_handler;
/* used to parse an upstream HTTP header */
ngx_uint_t status;
u_char *status_start;
u_char *status_end;
ngx_uint_t status_count;
ngx_uint_t parse_state;
ngx_http_upstream_state_t *state;
ngx_array_t states; /* of ngx_http_upstream_state_t */
unsigned cachable:1;
unsigned request_sent:1;
unsigned header_sent:1;
};
void ngx_http_upstream_init(ngx_http_request_t *r);
u_char *ngx_http_upstream_log_error(void *data, u_char *buf, size_t len);
extern char *ngx_http_upstream_header_errors[];
#endif /* _NGX_HTTP_UPSTREAM_H_INCLUDED_ */

22
src/http/ngx_http_write_filter.c
View File

@ -69,8 +69,19 @@ ngx_int_t ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
for (cl = ctx->out; cl; cl = cl->next) {
ll = &cl->next;
ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
"write old buf t:%d f:%d %p, pos %p, size: %z "
"file: %O, size: %z",
cl->buf->temporary, cl->buf->in_file,
cl->buf->start, cl->buf->pos,
cl->buf->last - cl->buf->pos,
cl->buf->file_pos,
cl->buf->file_last - cl->buf->file_pos);
#if 1
if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) {
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
"zero size buf in writer");
ngx_debug_point();
}
#endif
@ -97,8 +108,19 @@ ngx_int_t ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
*ll = cl;
ll = &cl->next;
ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
"write new buf t:%d f:%d %p, pos %p, size: %z "
"file: %O, size: %z",
cl->buf->temporary, cl->buf->in_file,
cl->buf->start, cl->buf->pos,
cl->buf->last - cl->buf->pos,
cl->buf->file_pos,
cl->buf->file_last - cl->buf->file_pos);
#if 1
if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) {
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
"zero size buf in writer");
ngx_debug_point();
}
#endif

6
src/imap/ngx_imap_handler.c
View File

@ -298,8 +298,14 @@ void ngx_imap_close_session(ngx_imap_session_t *s)
void ngx_imap_close_connection(ngx_connection_t *c)
{
ngx_pool_t *pool;
ngx_log_debug1(NGX_LOG_DEBUG_IMAP, c->log, 0,
"close imap connection: %d", c->fd);
pool = c->pool;
ngx_close_connection(c);
ngx_destroy_pool(c->pool);
}

34
src/imap/ngx_imap_proxy.c
View File

@ -24,6 +24,7 @@ void ngx_imap_proxy_init(ngx_imap_session_t *s)
{
ngx_int_t rc;
ngx_peers_t *peers;
struct sockaddr_in *sin;
ngx_imap_proxy_ctx_t *p;
if (!(p = ngx_pcalloc(s->connection->pool, sizeof(ngx_imap_proxy_ctx_t)))) {
@ -44,20 +45,31 @@ void ngx_imap_proxy_init(ngx_imap_session_t *s)
p->upstream.log = s->connection->log;
p->upstream.log_error = NGX_ERROR_ERR;
peers->number = 1;
peers->max_fails = 1;
#if 0
peers->peers[0].addr = inet_addr("81.19.69.70");
peers->peers[0].addr_port_text.len = sizeof("81.19.69.70:110") - 1;
peers->peers[0].addr_port_text.data = (u_char *) "81.19.69.70:110";
peers->peers[0].port = htons(110);
if (!(sin = ngx_pcalloc(s->connection->pool, sizeof(struct sockaddr_in)))) {
ngx_imap_close_connection(s->connection);
return;
}
peers->peer[0].sockaddr = (struct sockaddr *) sin;
peers->peer[0].socklen = sizeof(struct sockaddr_in);
sin->sin_port = htons(110);
#if 1
sin->sin_addr.s_addr = inet_addr("81.19.64.101");
peers->peer[0].name.len = sizeof("81.19.64.101:110") - 1;
peers->peer[0].name.data = (u_char *) "81.19.64.101:110";
#else
peers->peers[0].addr = inet_addr("81.19.64.101");
peers->peers[0].addr_port_text.len = sizeof("81.19.64.101:110") - 1;
peers->peers[0].addr_port_text.data = (u_char *) "81.19.64.101:110";
peers->peers[0].port = htons(110);
sin->sin_addr.s_addr = inet_addr("81.19.69.70");
peers->peer[0].name.len = sizeof("81.19.69.70:110") - 1;
peers->peer[0].name.data = (u_char *) "81.19.69.70:110";
#endif
peers->number = 1;
peers->peer[0].max_fails = 1;
peers->peer[0].fail_timeout = 60;
peers->peer[0].weight = 1;
rc = ngx_event_connect_peer(&p->upstream);
if (rc == NGX_ERROR) {

1
src/os/unix/ngx_freebsd_config.h
View File

@ -37,6 +37,7 @@
#include <netinet/tcp.h> /* TCP_NODELAY, TCP_NOPUSH */
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/un.h>
#include <libutil.h> /* setproctitle() before 4.1 */
#include <osreldate.h>

20
src/os/unix/ngx_freebsd_sendfile_chain.c
View File

@ -10,16 +10,16 @@
/*
* Although FreeBSD sendfile() allows to pass a header and a trailer
* Although FreeBSD sendfile() allows to pass a header and a trailer,
* it can not send a header with a part of the file in one packet until
* FreeBSD 5.3. Besides over the fast ethernet connection sendfile()
* FreeBSD 5.3. Besides, over the fast ethernet connection sendfile()
* may send the partially filled packets, i.e. the 8 file pages may be sent
* as the 11 full 1460-bytes packets, then one incomplete 324-bytes packet,
* and then again the 11 full 1460-bytes packets.
*
* So we use the TCP_NOPUSH option (similar to Linux's TCP_CORK)
* to postpone the sending - it not only sends a header and the first part
* of the file in one packet but also sends the file pages in the full packets.
* Threfore we use the TCP_NOPUSH option (similar to Linux's TCP_CORK)
* to postpone the sending - it not only sends a header and the first part of
* the file in one packet, but also sends the file pages in the full packets.
*
* But until FreeBSD 4.5 the turning TCP_NOPUSH off does not flush a pending
* data that less than MSS so that data may be sent with 5 second delay.
@ -220,7 +220,7 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
err = ngx_errno;
/*
* there is a tiny chance to be interrupted, however
* there is a tiny chance to be interrupted, however,
* we continue a processing without the TCP_NOPUSH
*/
@ -249,7 +249,7 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
* http://www.freebsd.org/cgi/query-pr.cgi?pr=33771
*/
if (ngx_freebsd_sendfile_nbytes_bug == 0) {
if (!ngx_freebsd_sendfile_nbytes_bug) {
header_size = 0;
}
@ -282,7 +282,7 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
if (rc == 0 && sent == 0) {
/*
* rc and sent are equals to zero when someone has truncated
* rc and sent equal to zero when someone has truncated
* the file, so the offset became beyond the end of the file
*/
@ -370,8 +370,8 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
if (eagain) {
/*
* sendfile() can return EAGAIN even if it has sent
* a whole file part but the successive sendfile() call would
* sendfile() may return EAGAIN, even if it has sent a whole file
* part, it indicates that the successive sendfile() call would
* return EAGAIN right away and would not send anything.
* We use it as a hint.
*/

1
src/os/unix/ngx_linux_config.h
View File

@ -42,6 +42,7 @@
#include <netinet/tcp.h> /* TCP_NODELAY, TCP_CORK */
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/un.h>
#include <time.h> /* tzset() */
#include <malloc.h> /* memalign() */

20
src/os/unix/ngx_linux_sendfile_chain.c
View File

@ -11,9 +11,10 @@
/*
* On Linux up to 2.4.21 sendfile() (syscall #187) works with 32-bit
* offsets only and the including <sys/sendfile.h> breaks the compiling
* if off_t is 64 bit wide. So we use own sendfile() definition where offset
* parameter is int32_t and use sendfile() for the file parts below 2G only.
* offsets only, and the including <sys/sendfile.h> breaks the compiling,
* if off_t is 64 bit wide. So we use own sendfile() definition, where offset
* parameter is int32_t, and use sendfile() for the file parts below 2G only,
* see src/os/unix/ngx_linux_config.h
*
* Linux 2.4.21 has a new sendfile64() syscall #239.
*/
@ -85,6 +86,14 @@ ngx_chain_t *ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
continue;
}
#if 1
if (!ngx_buf_in_memory(cl->buf) && !cl->buf->in_file) {
ngx_log_error(NGX_LOG_ALERT, c->log, 0,
"zero size buf in sendfile");
ngx_debug_point();
}
#endif
if (!ngx_buf_in_memory_only(cl->buf)) {
break;
}
@ -118,7 +127,6 @@ ngx_chain_t *ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
&& cl
&& cl->buf->in_file)
{
/* the TCP_CORK and TCP_NODELAY are mutually exclusive */
if (c->tcp_nodelay) {
@ -131,7 +139,7 @@ ngx_chain_t *ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
err = ngx_errno;
/*
* there is a tiny chance to be interrupted, however
* there is a tiny chance to be interrupted, however,
* we continue a processing with the TCP_NODELAY
* and without the TCP_CORK
*/
@ -157,7 +165,7 @@ ngx_chain_t *ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
err = ngx_errno;
/*
* there is a tiny chance to be interrupted, however
* there is a tiny chance to be interrupted, however,
* we continue a processing without the TCP_CORK
*/

1
src/os/unix/ngx_posix_config.h
View File

@ -57,6 +57,7 @@
#include <netinet/tcp.h> /* TCP_NODELAY */
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/un.h>
#if (NGX_HAVE_LIMITS_H)
#include <limits.h> /* IOV_MAX */

2
src/os/unix/ngx_process_cycle.c
View File

@ -1113,7 +1113,7 @@ static void ngx_garbage_collector_cycle(ngx_cycle_t *cycle, void *data)
for (i = 0; i < cycle->pathes.nelts; i++) {
ctx.path = path[i];
ctx.log = cycle->log;
ctx.handler = path[i]->gc_handler;
ctx.handler = path[i]->cleaner;
ngx_collect_garbage(&ctx, &path[i]->name, 0);
}

1
src/os/unix/ngx_solaris_config.h
View File

@ -41,6 +41,7 @@
#include <netinet/tcp.h> /* TCP_NODELAY */
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/un.h>
#include <sys/systeminfo.h>
#include <limits.h> /* IOV_MAX */

1
src/os/win32/ngx_win32_config.h
View File

@ -122,6 +122,7 @@ typedef uint32_t ngx_atomic_t;
#define NGX_SIG_ATOMIC_T_SIZE 4
#define NGX_HAVE_LITTLE_ENDIAN 1
#define NGX_HAVE_NONALIGNED 1
#define NGX_THREADS 1