add new build jobs and modify some test check

.travis.yml

@@ -52,6 +52,8 @@ env:
     - TEST_NGINX_SLEEP=0.006
     - MALLOC_PERTURB_=9
   jobs:
+    - NGINX_VERSION=1.21.4 OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d
+    - NGINX_VERSION=1.21.4 OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f
     - NGINX_VERSION=1.25.1 OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d
     - NGINX_VERSION=1.25.1 OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f
 

t/028-req-header.t

@@ -273,8 +273,14 @@ Content-Type:
     }
 --- request
 GET /bar
---- response_body
-Foo: a, b
+--- response_body eval
+# Since nginx version 1.23.0, nginx combines same $http_* variable together
+# wtf
+$Test::Nginx::Util::NginxVersion >= 1.023000 ?
+
+"Foo: a, b\n"
+:
+"Foo: a\n"
 
 
 

t/162-socket-tls-handshake.t

@@ -63,7 +63,7 @@ run_tests();
 
 __DATA__
 
-=== TEST 1: sanity: www.bing.com
+=== TEST 1: sanity: www.google.com
 --- config
     server_tokens off;
     resolver $TEST_NGINX_RESOLVER ipv6=off;
@@ -86,7 +86,7 @@ __DATA__
                 local sock = ngx.socket.tcp()
                 sock:settimeout(2000)
 
-                local ok, err = sock:connect("www.bing.com", 443)
+                local ok, err = sock:connect("www.google.com", 443)
                 if not ok then
                     ngx.say("failed to connect: ", err)
                     return
@@ -102,7 +102,7 @@ __DATA__
 
                 ngx.say("ssl handshake: ", type(sess))
 
-                local req = "GET / HTTP/1.1\r\nHost: www.bing.com\r\nConnection: close\r\n\r\n"
+                local req = "GET / HTTP/1.1\r\nHost: www.google.com\r\nConnection: close\r\n\r\n"
                 local bytes, err = sock:send(req)
                 if not bytes then
                     ngx.say("failed to send http request: ", err)
@@ -131,7 +131,7 @@ GET /t
 --- response_body_like chop
 \Aconnected: 1
 ssl handshake: cdata
-sent http request: 57 bytes.
+sent http request: 59 bytes.
 received: HTTP/1.1 (?:200 OK|302 Found)
 close: 1 nil
 \z

util/build.sh

@@ -29,10 +29,14 @@ if [ "$OPENSSL_VER" = "1.1.0l" ]; then
     add_http3_module=""
 fi
 
+if [ "$NGINX_VERSION" = "1.25.1" ]; then
+    disable_pcre2=--without-pcre2
+fi
+
 time ngx-build $force $version \
             --with-threads \
             --with-pcre-jit \
-            --without-pcre2 \
+            $disable_pcre2 \
             --with-ipv6 \
             --with-cc-opt="-DNGX_LUA_USE_ASSERT -I$PCRE_INC -I$OPENSSL_INC" \
             --with-http_v2_module \