IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-26 08:51:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

nginx-0.0.7-2004-06-22-20:43:09 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-06-22 16:43:09 +00:00
parent b14169a714
commit 3d5c0fc89e
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
auto/modules
View File

@ -43,16 +43,12 @@ fi
HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES \ HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES \
$HTTP_CHUNKED_FILTER_MODULE \ $HTTP_CHUNKED_FILTER_MODULE \
$HTTP_RANGE_HEADER_FILTER_MODULE \ $HTTP_RANGE_HEADER_FILTER_MODULE"
$HTTP_CHARSET_FILTER_MODULE"
HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE $HTTP_INDEX_MODULE" if [ $HTTP_CHARSET = YES ]; then
have=NGX_HTTP_CHARSET . auto/have
if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE"
have=NGX_HTTP_REWRITE . auto/have HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS"
USE_PCRE=YES
HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE"
HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS"
fi fi
if [ $HTTP_GZIP = YES ]; then if [ $HTTP_GZIP = YES ]; then
@ -68,6 +64,15 @@ if [ $HTTP_SSI = YES ]; then
HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS" HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS"
fi fi
HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE $HTTP_INDEX_MODULE"
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_PROXY = YES ]; then if [ $HTTP_PROXY = YES ]; then
have=NGX_HTTP_PROXY . auto/have have=NGX_HTTP_PROXY . auto/have
USE_MD5=YES USE_MD5=YES

2
auto/options
View File

@ -29,6 +29,7 @@ EVENT_AIO=NO
USE_THREADS=NO USE_THREADS=NO
HTTP_CHARSET=YES
HTTP_REWRITE=YES HTTP_REWRITE=YES
HTTP_GZIP=YES HTTP_GZIP=YES
HTTP_SSI=YES HTTP_SSI=YES
@ -80,6 +81,7 @@ do
--with-threads=*) USE_THREADS="$value" ;; --with-threads=*) USE_THREADS="$value" ;;
--with-threads) USE_THREADS="pthreads" ;; --with-threads) USE_THREADS="pthreads" ;;
--without-http_charset_module) HTTP_CHARSET=NO ;;
--without-http_rewrite_module) HTTP_REWRITE=NO ;; --without-http_rewrite_module) HTTP_REWRITE=NO ;;
--without-http_ssi_module) HTTP_SSI=NO ;; --without-http_ssi_module) HTTP_SSI=NO ;;
--without-http_gzip_module) HTTP_GZIP=NO ;; --without-http_gzip_module) HTTP_GZIP=NO ;;

6
auto/sources
View File

@ -187,7 +187,6 @@ HTTP_FILTER_MODULES="ngx_http_write_filter_module \
ngx_http_header_filter_module" ngx_http_header_filter_module"
HTTP_CHUNKED_FILTER_MODULE=ngx_http_chunked_filter_module HTTP_CHUNKED_FILTER_MODULE=ngx_http_chunked_filter_module
HTTP_CHARSET_FILTER_MODULE=ngx_http_charset_filter_module
HTTP_HEADERS_FILTER_MODULE=ngx_http_headers_filter_module HTTP_HEADERS_FILTER_MODULE=ngx_http_headers_filter_module
HTTP_COPY_FILTER_MODULE=ngx_http_copy_filter_module HTTP_COPY_FILTER_MODULE=ngx_http_copy_filter_module
@ -225,7 +224,6 @@ HTTP_SRCS="src/http/ngx_http.c \
src/http/modules/ngx_http_index_handler.c \ src/http/modules/ngx_http_index_handler.c \
src/http/modules/ngx_http_chunked_filter.c \ src/http/modules/ngx_http_chunked_filter.c \
src/http/modules/ngx_http_range_filter.c \ src/http/modules/ngx_http_range_filter.c \
src/http/modules/ngx_http_charset_filter.c \
src/http/modules/ngx_http_headers_filter.c \ src/http/modules/ngx_http_headers_filter.c \
src/http/modules/ngx_http_not_modified_filter.c" src/http/modules/ngx_http_not_modified_filter.c"
@ -236,6 +234,10 @@ HTPP_CACHE_SRCS=src/http/ngx_http_cache.c
HTPP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c HTPP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c
HTTP_CHARSET_FILTER_MODULE=ngx_http_charset_filter_module
HTTP_CHARSET_FILTER_SRCS=src/http/modules/ngx_http_charset_filter.c
HTTP_REWRITE_MODULE=ngx_http_rewrite_module HTTP_REWRITE_MODULE=ngx_http_rewrite_module
HTTP_REWRITE_SRCS=src/http/modules/ngx_http_rewrite_handler.c HTTP_REWRITE_SRCS=src/http/modules/ngx_http_rewrite_handler.c

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

@ -245,6 +245,10 @@ static int ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
/* we need to restore the second event if it exists */ /* we need to restore the second event if it exists */
if (event == NGX_READ_EVENT) { if (event == NGX_READ_EVENT) {
if (ev->accept) {
return NGX_OK;
}
e = c->write; e = c->write;
event = POLLOUT; event = POLLOUT;