Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for forward proxy #335

Closed
wants to merge 3 commits into from
Closed

add support for forward proxy #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ac6f43
add support for forward proxy
jinglong Nov 4, 2013
c0eedff
merge nginx 1.4.3
jinglong Nov 8, 2013
75444ea
bugfix: the return value of ngx_http_validate_host has been changed i…
jinglong Nov 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions auto/modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,16 @@ if [ $HTTP_MEMCACHED_SHARED = YES ]; then
NGX_SHARED_SRCS="$NGX_SHARED_SRCS|$HTTP_MEMCACHED_SRCS"
fi

if [ $HTTP_PROXY_CONNECT = YES ]; then
HTTP_MODULES="$HTTP_MODULES $HTTP_PROXY_CONNECT_MODULE"
HTTP_SRCS="$HTTP_SRCS $HTTP_PROXY_CONNECT_SRCS"
fi

if [ $HTTP_PROXY_CONNECT_SHARED = YES ]; then
NGX_SHARED_MODULES="$NGX_SHARED_MODULES $HTTP_PROXY_CONNECT_MODULE"
NGX_SHARED_SRCS="$NGX_SHARED_SRCS|$HTTP_PROXY_CONNECT_SRCS"
fi

if [ $HTTP_EMPTY_GIF = YES ]; then
HTTP_MODULES="$HTTP_MODULES $HTTP_EMPTY_GIF_MODULE"
HTTP_SRCS="$HTTP_SRCS $HTTP_EMPTY_GIF_SRCS"
Expand Down
16 changes: 16 additions & 0 deletions auto/options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ NGX_ALL_MODULES="
ngx_http_scgi_module
ngx_http_perl_module
ngx_http_memcached_module
ngx_http_proxy_connect_module
ngx_http_empty_gif_module
ngx_http_browser_module
ngx_http_secure_link_module
Expand Down Expand Up @@ -234,6 +235,7 @@ HTTP_PERL=NO
HTTP_LUA=NO
HTTP_TFS=NO
HTTP_MEMCACHED=YES
HTTP_PROXY_CONNECT=YES
HTTP_LIMIT_CONN=YES
HTTP_LIMIT_REQ=YES
HTTP_EMPTY_GIF=YES
Expand Down Expand Up @@ -290,6 +292,7 @@ HTTP_FASTCGI_SHARED=NO
HTTP_UWSGI_SHARED=NO
HTTP_SCGI_SHARED=NO
HTTP_MEMCACHED_SHARED=NO
HTTP_PROXY_CONNECT_SHARED=NO
HTTP_LIMIT_CONN_SHARED=NO
HTTP_LIMIT_REQ_SHARED=NO
HTTP_EMPTY_GIF_SHARED=NO
Expand Down Expand Up @@ -517,6 +520,8 @@ do
HTTP_SCGI=NO ;;
--with-http_memcached_module=shared) HTTP_MEMCACHED_SHARED=YES
HTTP_MEMCACHED=NO ;;
--with-http_proxy_connect_module=shared) HTTP_PROXY_CONNECT_SHARED=YES
HTTP_PROXY_CONNECT=NO ;;
--with-http_limit_conn_module=shared) HTTP_LIMIT_CONN_SHARED=YES
HTTP_LIMIT_CONN=NO ;;
--with-http_limit_req_module=shared) HTTP_LIMIT_REQ_SHARED=YES
Expand Down Expand Up @@ -575,6 +580,8 @@ do
HTTP_SCGI_SHARED=NO ;;
--without-http_memcached_module) HTTP_MEMCACHED=NO
HTTP_MEMCACHED_SHARED=NO ;;
--without-http_proxy_connect_module) HTTP_PROXY_CONNECT=NO
HTTP_PROXY_CONNECT_SHARED=NO ;;
--without-http_limit_zone_module)
HTTP_LIMIT_CONN=NO
HTTP_LIMIT_CONN_SHARED=NO
Expand Down Expand Up @@ -789,6 +796,8 @@ cat << END
--with-http_scgi_module=shared enable ngx_http_scgi_module (shared)
--with-http_memcached_module=shared
enable ngx_http_memcached_module (shared)
--with-http_proxy_connect_module=shared
enable ngx_http_proxy_connect_module (shared)
--with-http_limit_conn_module=shared
enable ngx_http_limit_conn_module (shared)
--with-http_limit_req_module=shared
Expand Down Expand Up @@ -827,6 +836,8 @@ cat << END
--without-http_uwsgi_module disable ngx_http_uwsgi_module
--without-http_scgi_module disable ngx_http_scgi_module
--without-http_memcached_module disable ngx_http_memcached_module
--without-http_proxy_connect_module
disable ngx_http_proxy_connect_module
--without-http_limit_conn_module disable ngx_http_limit_conn_module
--without-http_limit_req_module disable ngx_http_limit_req_module
--without-http_empty_gif_module disable ngx_http_empty_gif_module
Expand Down Expand Up @@ -963,6 +974,7 @@ if [ $NGX_SHARED_ALL_MODULES = YES ]; then
HTTP_UWSGI_SHARED=YES
HTTP_SCGI_SHARED=YES
HTTP_MEMCACHED_SHARED=YES
HTTP_PROXY_CONNECT_SHARED=YES
HTTP_LIMIT_CONN_SHARED=YES
HTTP_LIMIT_REQ_SHARED=YES
HTTP_EMPTY_GIF_SHARED=YES
Expand Down Expand Up @@ -999,6 +1011,7 @@ if [ $NGX_SHARED_ALL_MODULES = YES ]; then
HTTP_UWSGI=NO
HTTP_SCGI=NO
HTTP_MEMCACHED=NO
HTTP_PROXY_CONNECT=NO
HTTP_LIMIT_CONN=NO
HTTP_LIMIT_REQ=NO
HTTP_EMPTY_GIF=NO
Expand Down Expand Up @@ -1035,12 +1048,14 @@ elif [ $NGX_STATIC_ALL_MODULES = YES ]; then
HTTP_REFERER=YES
HTTP_REWRITE=YES
HTTP_PROXY=YES
HTTP_PROXY_CONNECT=YES
HTTP_FASTCGI=YES
HTTP_UWSGI=YES
HTTP_SCGI=YES
HTTP_PERL=YES
HTTP_LUA=YES
HTTP_MEMCACHED=YES
HTTP_PROXY_CONNECT=YES
HTTP_LIMIT_CONN=YES
HTTP_LIMIT_REQ=YES
HTTP_EMPTY_GIF=YES
Expand Down Expand Up @@ -1089,6 +1104,7 @@ elif [ $NGX_STATIC_ALL_MODULES = YES ]; then
HTTP_UWSGI_SHARED=NO
HTTP_SCGI_SHARED=NO
HTTP_MEMCACHED_SHARED=NO
HTTP_PROXY_CONNECT_SHARED=NO
HTTP_LIMIT_CONN_SHARED=NO
HTTP_LIMIT_REQ_SHARED=NO
HTTP_EMPTY_GIF_SHARED=NO
Expand Down
4 changes: 4 additions & 0 deletions auto/sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,10 @@ HTTP_MEMCACHED_MODULE=ngx_http_memcached_module
HTTP_MEMCACHED_SRCS=src/http/modules/ngx_http_memcached_module.c


HTTP_PROXY_CONNECT_MODULE=ngx_http_proxy_connect_module
HTTP_PROXY_CONNECT_SRCS=src/http/modules/ngx_http_proxy_connect_module.c


HTTP_LIMIT_CONN_MODULE=ngx_http_limit_conn_module
HTTP_LIMIT_CONN_SRCS=src/http/modules/ngx_http_limit_conn_module.c

Expand Down
Loading