initial checkin for nginx 1.1.4.

This commit is contained in:
agentzh (章亦春)
2011-09-23 18:53:51 +08:00
parent 5136657315
commit 237638cdfc
10 changed files with 774 additions and 4 deletions

View File

@ -40,7 +40,7 @@ patch -p1 < $root/patches/nginx-$main_ver-no_Werror.patch || exit 1
patch -p1 < $root/patches/nginx-$main_ver-request_body_preread_fix.patch || exit 1
patch -p1 < $root/patches/nginx-$main_ver-request_body_in_single_buf.patch || exit 1
#patch -p1 < $root/patches/nginx-$main_ver-request_body_in_single_buf.patch || exit 1
patch -p1 -l < $root/patches/nginx-$main_ver-subrequest_loop.patch || exit 1

2
util/upgrade-patches.pl Normal file → Executable file
View File

@ -21,7 +21,7 @@ for my $file (@files) {
or die "failed run command $cmd.\n";
}
my $cmd = "sed -i 's/1\.0\.5/1.0.6/g' $newfile";
my $cmd = "sed -i 's/\Q$ver\E/$newver/g' $newfile";
system($cmd) == 0
or die "failed to run command $cmd.\n";

View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=1.0.6
minor_ver=21
main_ver=1.1.4
minor_ver=1
version=$main_ver.$minor_ver
echo $version