mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
Compare commits
7 Commits
v1.0.11.25
...
v1.0.11.27
Author | SHA1 | Date | |
---|---|---|---|
843fd34df6 | |||
39cea1cbb3 | |||
b4f3bd982f | |||
fcb85fb288 | |||
9a756394cc | |||
922f49f734 | |||
99c37ea419 |
32
patches/nginx-1.0.11-upstream_pipelining.patch
Normal file
32
patches/nginx-1.0.11-upstream_pipelining.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
diff -ur nginx-1.0.11/src/http/ngx_http_upstream.c nginx-1.0.11-patched/src/http/ngx_http_upstream.c
|
||||||
|
--- nginx-1.0.11/src/http/ngx_http_upstream.c 2011-12-14 02:34:34.000000000 +0800
|
||||||
|
+++ nginx-1.0.11-patched/src/http/ngx_http_upstream.c 2012-03-21 21:20:17.333111806 +0800
|
||||||
|
@@ -1385,6 +1385,8 @@
|
||||||
|
|
||||||
|
/* rc == NGX_OK */
|
||||||
|
|
||||||
|
+ u->request_all_sent = 1;
|
||||||
|
+
|
||||||
|
if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
|
||||||
|
if (ngx_tcp_push(c->fd) == NGX_ERROR) {
|
||||||
|
ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
|
||||||
|
@@ -1451,7 +1453,7 @@
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- if (u->header_sent) {
|
||||||
|
+ if (u->request_all_sent) {
|
||||||
|
u->write_event_handler = ngx_http_upstream_dummy_handler;
|
||||||
|
|
||||||
|
(void) ngx_handle_write_event(c->write, 0);
|
||||||
|
diff -ur nginx-1.0.11/src/http/ngx_http_upstream.h nginx-1.0.11-patched/src/http/ngx_http_upstream.h
|
||||||
|
--- nginx-1.0.11/src/http/ngx_http_upstream.h 2011-11-01 22:18:10.000000000 +0800
|
||||||
|
+++ nginx-1.0.11-patched/src/http/ngx_http_upstream.h 2012-03-21 21:18:21.041237173 +0800
|
||||||
|
@@ -313,6 +313,7 @@
|
||||||
|
unsigned buffering:1;
|
||||||
|
|
||||||
|
unsigned request_sent:1;
|
||||||
|
+ unsigned request_all_sent:1;
|
||||||
|
unsigned header_sent:1;
|
||||||
|
};
|
||||||
|
|
@ -26,6 +26,9 @@ cd nginx-$ver || exit 1
|
|||||||
|
|
||||||
# patch the patch
|
# patch the patch
|
||||||
|
|
||||||
|
echo "INFO: applying the upstream-pipelining patch"
|
||||||
|
patch -p1 < $root/patches/nginx-$main_ver-upstream_pipelining.patch || exit 1
|
||||||
|
|
||||||
cp $root/patches/nginx-$main_ver-server_header.patch server_header.patch || exit 1
|
cp $root/patches/nginx-$main_ver-server_header.patch server_header.patch || exit 1
|
||||||
sed $"s/NGINX_VERSION \".unknown\"/NGINX_VERSION \".$minor_ver\"/" server_header.patch \
|
sed $"s/NGINX_VERSION \".unknown\"/NGINX_VERSION \".$minor_ver\"/" server_header.patch \
|
||||||
> server_header.patch.tmp && mv -f server_header.patch.tmp server_header.patch || exit 1
|
> server_header.patch.tmp && mv -f server_header.patch.tmp server_header.patch || exit 1
|
||||||
@ -73,7 +76,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.38rc1
|
ver=0.38rc2
|
||||||
$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
|
||||||
@ -117,7 +120,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.5.0rc19
|
ver=0.5.0rc21
|
||||||
$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
|
||||||
@ -303,5 +306,6 @@ cp $root/util/install bundle/
|
|||||||
|
|
||||||
cd $root
|
cd $root
|
||||||
|
|
||||||
tar czf $name.tar.gz $name
|
tar cf $name.tar $name
|
||||||
|
gzip -f --best $name.tar
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user