added patches for nginx 1.3.4.

This commit is contained in:
agentzh (章亦春)
2012-08-13 15:38:49 -07:00
parent 52cf79ee28
commit 5e4d755aad
11 changed files with 1944 additions and 8 deletions

View File

@ -1,9 +1,9 @@
#!/bin/bash
#!/usr/bin/env bash
#root=$(readlink -f -- "$(dirname -- "$0")/..")
root=`perl -MCwd -e'print Cwd::abs_path(shift)' $(dirname -- "$0")/..`
. util/ver
. ./util/ver
name=ngx_openresty-$version
work=$root/work
@ -73,14 +73,17 @@ patch -p1 < $root/patches/nginx-$main_ver-log_escape_non_ascii.patch || exit 1
#echo applying filter_finalize_hang.patch ...
#patch -p1 < $root/patches/nginx-$main_ver-filter_finalize_hang.patch || exit 1
echo applying add_core_vars_polluting_globals.patch ...
patch -p1 < $root/patches/nginx-$main_ver-add_core_vars_polluting_globals.patch || exit 1
answer=`$root/util/ver-ge "$main_ver" 1.3.4`
if [ "$answer" = "N" ]; then
echo applying add_core_vars_polluting_globals.patch ...
patch -p1 < $root/patches/nginx-$main_ver-add_core_vars_polluting_globals.patch || exit 1
echo applying resolver_debug_log_overflow.patch ...
patch -p1 < $root/patches/nginx-$main_ver-resolver_debug_log_overflow.patch || exit 1
echo applying resolver_debug_log_overflow.patch ...
patch -p1 < $root/patches/nginx-$main_ver-resolver_debug_log_overflow.patch || exit 1
echo applying poll_del_event_at_exit.patch ...
patch -p1 < $root/patches/nginx-$main_ver-poll_del_event_at_exit.patch
echo applying poll_del_event_at_exit.patch ...
patch -p1 < $root/patches/nginx-$main_ver-poll_del_event_at_exit.patch
fi
#echo "INFO: applying null-character-fixes patch"
#patch -p0 < $root/patches/nginx-$main_ver-null_character_fixes.patch || exit 1