dev: fixed test suite with nginx 1.13.6+ with openresty's patches.

agentzh · agentzh · commit 6abb4041abba · 2017-10-26T17:45:41.000-07:00
diff --git a/t/conditional-get.t b/t/conditional-get.t
@@ -229,7 +229,7 @@ GET /cats
 If-Unmodified-Since: Thu, 10 May 2012 07:50:58 GMT
 --- response_headers
 Content-Type: text/html
-Content-Length: 182
+Content-Length: 186
 !Last-Modified
 --- response_body_like: 412 Precondition Failed
 --- error_code: 412
diff --git a/util/build.sh b/util/build.sh
@@ -18,6 +18,15 @@ if [ ! -f $patch_file ]; then
 fi
 # we ignore any errors here since the target directory might have already been patched.
 patch --forward -p1 < $patch_file
+
+patch_file=$root/../openresty/patches/ngx_http_redis-$ngx_redis_version-default_port_fix.patch
+if [ ! -f $patch_file ]; then
+    echo "$patch_file: No such file" > /dev/stderr
+    exit 1
+fi
+# we ignore any errors here since the target directory might have already been patched.
+patch --forward -p1 < $patch_file
+
 cd $root || exit 1
 
             #--without-http_memcached_module \
