186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

checked in the patches for nginx 1.5.3; also applied the unix_socket_accept_over_read patch the nginx cores older than 1.5.3.

Browse Source
This commit is contained in:
Yichun Zhang (agentzh)
2013-08-30 12:41:13 -07:00
parent c36f990f10
commit 921fd6d675
14 changed files with 2145 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
util/mirror-tarballs
View File

@ -109,13 +109,19 @@ echo "$info_txt applying the location_if_inherits_proxy patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-location_if_inherits_proxy.patch || exit 1
echo
echo "$info_txt applying the upstream_truncation patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-upstream_truncation.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.5.3`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the upstream_truncation patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-upstream_truncation.patch || exit 1
echo
fi
echo "$info_txt applying the channel-uninit-params patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-channel-uninit-params.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.5.3`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the channel-uninit-params patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-channel-uninit-params.patch || exit 1
echo
fi
echo "$info_txt applying the dtrace patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-dtrace.patch || exit 1
@ -153,9 +159,12 @@ if [ "$answer" = "N" ]; then
echo
fi
echo "$info_txt applying patches/nginx-$main_ver-invalid_referer_hash.patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-invalid_referer_hash.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.5.3`
if [ "$answer" = "N" ]; then
echo "$info_txt applying patches/nginx-$main_ver-invalid_referer_hash.patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-invalid_referer_hash.patch || exit 1
echo
fi
answer=`$root/util/ver-ge "$main_ver" 1.4.1`
if [ "$answer" = "Y" ]; then
@ -164,6 +173,13 @@ if [ "$answer" = "Y" ]; then
echo
fi
answer=`$root/util/ver-ge "$main_ver" 1.5.3`
if [ "$answer" = "N" ]; then
echo "$info_txt applying the unix_socket_accept_over_read patch for lua $ver"
patch -p1 < $root/patches/nginx-$ver-unix_socket_accept_over_read.patch || exit 1
echo
fi
rm -f *.patch || exit 1
cd .. || exit 1

2
util/ver
View File

@ -1,6 +1,6 @@
#!/bin/bash
#main_ver=1.3.11
#main_ver=1.5.3
main_ver=1.4.2
minor_ver=1
version=$main_ver.$minor_ver