mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
37bbfd4378 | |||
4118c23f95 | |||
2d7a4ad019 | |||
28e127dd92 | |||
21a9b100a1 | |||
78e850f1b6 | |||
3373388062 | |||
1921477c18 |
15
patches/nginx-1.2.1-location_if_inherits_proxy.patch
Normal file
15
patches/nginx-1.2.1-location_if_inherits_proxy.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
--- nginx-1.2.1/src/http/modules/ngx_http_proxy_module.c 2012-04-23 18:40:01.000000000 +0800
|
||||||
|
+++ nginx-1.2.1-patched/src/http/modules/ngx_http_proxy_module.c 2012-06-24 12:48:57.289834450 +0800
|
||||||
|
@@ -3023,8 +3023,10 @@
|
||||||
|
|
||||||
|
if (conf->upstream.upstream || conf->proxy_lengths) {
|
||||||
|
clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
|
||||||
|
- if (clcf->handler == NULL && clcf->lmt_excpt) {
|
||||||
|
- clcf->handler = ngx_http_proxy_handler;
|
||||||
|
+ if (clcf->handler == NULL) {
|
||||||
|
+ if (clcf->lmt_excpt) {
|
||||||
|
+ clcf->handler = ngx_http_proxy_handler;
|
||||||
|
+ }
|
||||||
|
conf->location = prev->location;
|
||||||
|
}
|
||||||
|
}
|
555
t/sanity.t
555
t/sanity.t
File diff suppressed because it is too large
Load Diff
@ -85,6 +85,9 @@ patch -p1 < $root/patches/nginx-$main_ver-poll_del_event_at_exit.patch
|
|||||||
|
|
||||||
#patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1
|
#patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1
|
||||||
|
|
||||||
|
echo applying location_if_inherits_proxy.patch ...
|
||||||
|
patch -p1 < $root/patches/nginx-$main_ver-location_if_inherits_proxy.patch
|
||||||
|
|
||||||
rm -f *.patch || exit 1
|
rm -f *.patch || exit 1
|
||||||
|
|
||||||
cd .. || exit 1
|
cd .. || exit 1
|
||||||
@ -96,7 +99,7 @@ sed $"s/NGINX_VERSION \".unknown/NGINX_VERSION \".$minor_ver/" \
|
|||||||
|| exit 1
|
|| exit 1
|
||||||
rm -rf no-pool-nginx-$ver
|
rm -rf no-pool-nginx-$ver
|
||||||
|
|
||||||
ver=0.39
|
ver=0.40
|
||||||
$root/util/get-tarball "http://github.com/agentzh/echo-nginx-module/tarball/v$ver" -O echo-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/agentzh/echo-nginx-module/tarball/v$ver" -O echo-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf echo-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf echo-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1
|
mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1
|
||||||
@ -140,7 +143,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.5.2
|
ver=0.5.5
|
||||||
$root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
|
mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
|
||||||
@ -161,7 +164,7 @@ mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.13rc8
|
ver=0.14
|
||||||
$root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
|
mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
|
||||||
@ -296,7 +299,7 @@ mv agentzh-lua-resty-memcached-* lua-resty-memcached-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.09
|
ver=0.10
|
||||||
$root/util/get-tarball "http://github.com/agentzh/lua-resty-redis/tarball/v$ver" -O "lua-resty-redis-$ver.tar.gz" || exit 1
|
$root/util/get-tarball "http://github.com/agentzh/lua-resty-redis/tarball/v$ver" -O "lua-resty-redis-$ver.tar.gz" || exit 1
|
||||||
tar -xzf lua-resty-redis-$ver.tar.gz || exit 1
|
tar -xzf lua-resty-redis-$ver.tar.gz || exit 1
|
||||||
mv agentzh-lua-resty-redis-* lua-resty-redis-$ver || exit 1
|
mv agentzh-lua-resty-redis-* lua-resty-redis-$ver || exit 1
|
||||||
|
Reference in New Issue
Block a user