mirror of
https://github.com/nginx/nginx.git
synced 2024-12-22 23:23:32 -06:00
899b44eab2
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
256 lines
6.4 KiB
Plaintext
256 lines
6.4 KiB
Plaintext
|
|
# Copyright (C) Igor Sysoev
|
|
|
|
|
|
if [ $EVENT_SELECT = NO -a $EVENT_FOUND = NO ]; then
|
|
EVENT_SELECT=YES
|
|
fi
|
|
|
|
if [ $EVENT_SELECT = YES ]; then
|
|
have=NGX_HAVE_SELECT . auto/have
|
|
CORE_SRCS="$CORE_SRCS $SELECT_SRCS"
|
|
EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
|
|
fi
|
|
|
|
|
|
if [ $EVENT_POLL = NO -a $EVENT_FOUND = NO ]; then
|
|
EVENT_POLL=YES
|
|
fi
|
|
|
|
if [ $EVENT_POLL = YES ]; then
|
|
have=NGX_HAVE_POLL . auto/have
|
|
CORE_SRCS="$CORE_SRCS $POLL_SRCS"
|
|
EVENT_MODULES="$EVENT_MODULES $POLL_MODULE"
|
|
fi
|
|
|
|
|
|
if [ $NGX_TEST_BUILD_DEVPOLL = YES ]; then
|
|
have=NGX_HAVE_DEVPOLL . auto/have
|
|
have=NGX_TEST_BUILD_DEVPOLL . auto/have
|
|
EVENT_MODULES="$EVENT_MODULES $DEVPOLL_MODULE"
|
|
CORE_SRCS="$CORE_SRCS $DEVPOLL_SRCS"
|
|
fi
|
|
|
|
if [ $NGX_TEST_BUILD_EPOLL = YES ]; then
|
|
have=NGX_HAVE_EPOLL . auto/have
|
|
have=NGX_TEST_BUILD_EPOLL . auto/have
|
|
EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE"
|
|
CORE_SRCS="$CORE_SRCS $EPOLL_SRCS"
|
|
fi
|
|
|
|
if [ $NGX_TEST_BUILD_RTSIG = YES ]; then
|
|
have=NGX_HAVE_RTSIG . auto/have
|
|
have=NGX_TEST_BUILD_RTSIG . auto/have
|
|
EVENT_MODULES="$EVENT_MODULES $RTSIG_MODULE"
|
|
CORE_SRCS="$CORE_SRCS $RTSIG_SRCS"
|
|
fi
|
|
|
|
if [ $NGX_TEST_BUILD_SOLARIS_SENDFILEV = YES ]; then
|
|
have=NGX_TEST_BUILD_SOLARIS_SENDFILEV . auto/have
|
|
CORE_SRCS="$CORE_SRCS $SOLARIS_SENDFILEV_SRCS"
|
|
fi
|
|
|
|
|
|
if [ $HTTP_SSI = YES ]; then
|
|
HTTP_POSTPONE=YES
|
|
fi
|
|
|
|
# the filter order is important
|
|
# ngx_http_write_filter
|
|
# ngx_http_header_filter
|
|
# ngx_http_chunked_filter
|
|
# ngx_http_range_header_filter
|
|
# ngx_http_ssl_filter
|
|
# ngx_http_gzip_filter
|
|
# ngx_http_postpone_filter
|
|
# ngx_http_charset_filter
|
|
# ngx_http_ssi_filter
|
|
# ngx_http_headers_filter
|
|
# ngx_http_copy_filter
|
|
# ngx_http_range_body_filter
|
|
# ngx_http_not_modified_filter
|
|
|
|
HTTP_FILTER_MODULES="$HTTP_WRITE_FILTER_MODULE \
|
|
$HTTP_HEADER_FILTER_MODULE \
|
|
$HTTP_CHUNKED_FILTER_MODULE \
|
|
$HTTP_RANGE_HEADER_FILTER_MODULE"
|
|
|
|
if [ $HTTP_GZIP = YES ]; then
|
|
have=NGX_HTTP_GZIP . auto/have
|
|
USE_ZLIB=YES
|
|
HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_GZIP_FILTER_MODULE"
|
|
HTTP_SRCS="$HTTP_SRCS $HTTP_GZIP_SRCS"
|
|
fi
|
|
|
|
if [ $HTTP_POSTPONE = YES ]; then
|
|
HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
|
|
HTTP_SRCS="$HTTP_SRCS $HTPP_POSTPONE_FILTER_SRCS"
|
|
fi
|
|
|
|
if [ $HTTP_CHARSET = YES ]; then
|
|
have=NGX_HTTP_CHARSET . auto/have
|
|
HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE"
|
|
HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS"
|
|
fi
|
|
|
|
if [ $HTTP_SSI = YES ]; then
|
|
have=NGX_HTTP_SSI . auto/have
|
|
HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSI_FILTER_MODULE"
|
|
HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS"
|
|
fi
|
|
|
|
if [ $HTTP_USERID = YES ]; then
|
|
HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_USERID_FILTER_MODULE"
|
|
HTTP_SRCS="$HTTP_SRCS $HTTP_USERID_SRCS"
|
|
fi
|
|
|
|
HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE"
|
|
|
|
if [ $HTTP_AUTOINDEX = YES ]; then
|
|
have=NGX_HTTP_AUTOINDEX . auto/have
|
|
HTTP_MODULES="$HTTP_MODULES $HTTP_AUTOINDEX_MODULE"
|
|
HTTP_SRCS="$HTTP_SRCS $HTTP_AUTOINDEX_SRCS"
|
|
fi
|
|
|
|
HTTP_MODULES="$HTTP_MODULES $HTTP_INDEX_MODULE"
|
|
|
|
if [ $HTTP_AUTH_BASIC = YES ]; then
|
|
have=NGX_HTTP_AUTH_BASIC . auto/have
|
|
have=NGX_CRYPT . auto/have
|
|
HTTP_MODULES="$HTTP_MODULES $HTTP_AUTH_BASIC_MODULE"
|
|
HTTP_SRCS="$HTTP_SRCS $HTTP_AUTH_BASIC_SRCS"
|
|
CORE_LIBS="$CORE_LIBS $CRYPT_LIB"
|
|
fi
|
|
|
|
if [ $HTTP_ACCESS = YES ]; then
|
|
have=NGX_HTTP_ACCESS . auto/have
|
|
HTTP_MODULES="$HTTP_MODULES $HTTP_ACCESS_MODULE"
|
|
HTTP_SRCS="$HTTP_SRCS $HTTP_ACCESS_SRCS"
|
|
fi
|
|
|
|
if [ $HTTP_STATUS = YES ]; then
|
|
have=NGX_HTTP_STATUS . auto/have
|
|
HTTP_MODULES="$HTTP_MODULES $HTTP_STATUS_MODULE"
|
|
HTTP_SRCS="$HTTP_SRCS $HTTP_STATUS_SRCS"
|
|
fi
|
|
|
|
if [ $HTTP_GEO = YES ]; then
|
|
have=NGX_HTTP_GEO . auto/have
|
|
HTTP_MODULES="$HTTP_MODULES $HTTP_GEO_MODULE"
|
|
HTTP_SRCS="$HTTP_SRCS $HTTP_GEO_SRCS"
|
|
fi
|
|
|
|
if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then
|
|
have=NGX_HTTP_REWRITE . auto/have
|
|
USE_PCRE=YES
|
|
HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE"
|
|
HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS"
|
|
fi
|
|
|
|
if [ $HTTP_SSL = YES ]; then
|
|
USE_OPENSSL=YES
|
|
have=NGX_HTTP_SSL . auto/have
|
|
HTTP_MODULES="$HTTP_MODULES $HTTP_SSL_MODULE"
|
|
HTTP_DEPS="$HTTP_DEPS $HTTP_SSL_DEPS"
|
|
HTTP_SRCS="$HTTP_SRCS $HTTP_SSL_SRCS"
|
|
fi
|
|
|
|
if [ $HTTP_PROXY = YES ]; then
|
|
have=NGX_HTTP_PROXY . auto/have
|
|
#USE_MD5=YES
|
|
HTTP_MODULES="$HTTP_MODULES $HTTP_PROXY_MODULE"
|
|
HTTP_INCS="$HTTP_INCS $HTTP_PROXY_INCS"
|
|
HTTP_DEPS="$HTTP_DEPS $HTTP_PROXY_DEPS"
|
|
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"
|
|
#HTTP_SRCS="$HTTP_SRCS $HTPP_FILE_CACHE_SRCS"
|
|
|
|
if [ $HTTP_STUB_STATUS = YES ]; then
|
|
have=NGX_STAT_STUB . auto/have
|
|
HTTP_MODULES="$HTTP_MODULES ngx_http_stub_status_module"
|
|
HTTP_SRCS="$HTTP_SRCS src/http/modules/ngx_http_stub_status_module.c"
|
|
fi
|
|
|
|
#if [ -r $NGX_OBJS/auto ]; then
|
|
# . $NGX_OBJS/auto
|
|
#fi
|
|
|
|
|
|
if test -n "$NGX_ADDONS"; then
|
|
|
|
echo configuring additional modules
|
|
|
|
for ngx_addon_dir in $NGX_ADDONS
|
|
do
|
|
echo "adding module in $ngx_addon_dir"
|
|
|
|
if test -f $ngx_addon_dir/config; then
|
|
. $ngx_addon_dir/config
|
|
|
|
echo " + $ngx_addon_name was configured"
|
|
|
|
else
|
|
echo "$0: error: no $ngx_addon_dir/config was found"
|
|
exit 1
|
|
fi
|
|
done
|
|
fi
|
|
|
|
|
|
modules="$CORE_MODULES $EVENT_MODULES"
|
|
|
|
if [ $HTTP = YES ]; then
|
|
modules="$modules $HTTP_MODULES $HTTP_FILTER_MODULES \
|
|
$HTTP_HEADERS_FILTER_MODULE \
|
|
$HTTP_COPY_FILTER_MODULE \
|
|
$HTTP_RANGE_BODY_FILTER_MODULE \
|
|
$HTTP_NOT_MODIFIED_FILTER_MODULE"
|
|
|
|
NGX_ADDON_DEPS="$NGX_ADDON_DEPS \$(HTTP_DEPS)"
|
|
fi
|
|
|
|
|
|
IMAP_MODULES=$IMAP_MODULE
|
|
|
|
if [ $IMAP = YES ]; then
|
|
modules="$modules $IMAP_MODULES"
|
|
fi
|
|
|
|
|
|
cat << END > $NGX_MODULES_C
|
|
|
|
#include <ngx_config.h>
|
|
#include <ngx_core.h>
|
|
|
|
$NGX_PRAGMA
|
|
|
|
END
|
|
|
|
for mod in $modules
|
|
do
|
|
echo "extern ngx_module_t $mod;" >> $NGX_MODULES_C
|
|
done
|
|
|
|
echo >> $NGX_MODULES_C
|
|
echo 'ngx_module_t *ngx_modules[] = {' >> $NGX_MODULES_C
|
|
|
|
for mod in $modules
|
|
do
|
|
echo " &$mod," >> $NGX_MODULES_C
|
|
done
|
|
|
|
cat << END >> $NGX_MODULES_C
|
|
NULL
|
|
};
|
|
|
|
END
|