bugfix: a followup fix for the previous commit.

Author: agentzh

src/ngx_http_lua_socket_tcp.c

@@ -2712,7 +2712,7 @@ ngx_http_lua_socket_tcp_settimeout(lua_State *L)
 
     timeout = (ngx_int_t) lua_tonumber(L, 2);
     if (timeout >> 31) {
-        return luaL_error(L, "timeout value too large");
+        return luaL_error(L, "bad timeout value");
     }
 
     lua_pushinteger(L, timeout);
@@ -2759,17 +2759,17 @@ ngx_http_lua_socket_tcp_settimeouts(lua_State *L)
 
     connect_timeout = (ngx_int_t) lua_tonumber(L, 2);
     if (connect_timeout >> 31) {
-        return luaL_error(L, "timeout value too large");
+        return luaL_error(L, "bad timeout value");
     }
 
     send_timeout = (ngx_int_t) lua_tonumber(L, 3);
     if (send_timeout >> 31) {
-        return luaL_error(L, "timeout value too large");
+        return luaL_error(L, "bad timeout value");
     }
 
     read_timeout = (ngx_int_t) lua_tonumber(L, 4);
     if (read_timeout >> 31) {
-        return luaL_error(L, "timeout value too large");
+        return luaL_error(L, "bad timeout value");
     }
 
     lua_rawseti(L, 1, SOCKET_READ_TIMEOUT_INDEX);

t/023-rewrite/tcp-socket-timeout.t

@@ -24,7 +24,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 4 + 14);
+plan tests => repeat_each() * (blocks() * 4 + 8);
 
 our $HtmlDir = html_dir;
 
@@ -174,7 +174,7 @@ lua tcp socket connect timeout: 102
 
 
 
-=== TEST 5: sock:settimeout(-1) does not override lua_socket_connect_timeout
+=== TEST 5: -1 is bad timeout value
 --- config
     server_tokens off;
     lua_socket_connect_timeout 102ms;
@@ -198,14 +198,12 @@ lua tcp socket connect timeout: 102
     }
 --- request
 GET /t5
---- response_body
-failed to connect: timeout
+--- response_body_like chomp
+500 Internal Server Error
 --- error_log
-lua tcp socket connect timeout: 102
---- no_error_log
-[error]
-[alert]
+bad timeout value
 --- timeout: 10
+--- error_code: 500
 
 
 
@@ -371,7 +369,7 @@ lua tcp socket read timed out
 
 
 
-=== TEST 10: sock:settimeout(-1) does not override lua_socket_read_timeout
+=== TEST 10: -1 is bad timeout value
 --- config
     server_tokens off;
     lua_socket_read_timeout 102ms;
@@ -385,8 +383,6 @@ lua tcp socket read timed out
                 return
             end
 
-            ngx.say("connected: ", ok)
-
             sock:settimeout(-1)
 
             local line
@@ -402,13 +398,12 @@ lua tcp socket read timed out
     }
 --- request
 GET /t
---- response_body
-connected: 1
-failed to receive: timeout
+--- response_body_like chomp
+500 Internal Server Error
 --- error_log
-lua tcp socket read timeout: 102
-lua tcp socket connect timeout: 60000
-lua tcp socket read timed out
+bad timeout value
+--- timeout: 10
+--- error_code: 500
 
 
 
@@ -574,7 +569,7 @@ lua tcp socket write timed out
 
 
 
-=== TEST 15: sock:settimeout(-1) does not override lua_socket_send_timeout
+=== TEST 15: -1 is bad timeout value
 --- config
     server_tokens off;
     lua_socket_send_timeout 102ms;
@@ -588,8 +583,6 @@ lua tcp socket write timed out
                 return
             end
 
-            ngx.say("connected: ", ok)
-
             sock:settimeout(-1)
 
             local bytes
@@ -605,10 +598,9 @@ lua tcp socket write timed out
     }
 --- request
 GET /t
---- response_body
-connected: 1
-failed to send: timeout
+--- response_body_like chomp
+500 Internal Server Error
 --- error_log
-lua tcp socket send timeout: 102
-lua tcp socket connect timeout: 60000
-lua tcp socket write timed out
+bad timeout value
+--- timeout: 10
+--- error_code: 500

t/065-tcp-socket-timeout.t

@@ -28,7 +28,7 @@ our $StapScript = $t::StapThread::StapScript;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 4 + 11);
+plan tests => repeat_each() * (blocks() * 4 + 6);
 
 our $HtmlDir = html_dir;
 
@@ -159,7 +159,7 @@ lua tcp socket connect timed out
 
 
 
-=== TEST 5: sock:settimeout(-1) does not override lua_socket_connect_timeout
+=== TEST 5: -1 is bad timeout value
 --- config
     server_tokens off;
     lua_socket_connect_timeout 102ms;
@@ -179,11 +179,11 @@ lua tcp socket connect timed out
     }
 --- request
 GET /t
---- response_body
-failed to connect: timeout
+--- response_body_like chomp
+500 Internal Server Error
 --- error_log
-lua tcp socket connect timeout: 102
-lua tcp socket connect timed out
+bad timeout value
+--- error_code: 500
 
 
 
@@ -342,7 +342,7 @@ lua tcp socket read timed out
 
 
 
-=== TEST 10: sock:settimeout(-1) does not override lua_socket_read_timeout
+=== TEST 10: -1 is bad timeout value
 --- config
     server_tokens off;
     lua_socket_read_timeout 102ms;
@@ -356,8 +356,6 @@ lua tcp socket read timed out
                 return
             end
 
-            ngx.say("connected: ", ok)
-
             sock:settimeout(-1)
 
             local line
@@ -371,13 +369,11 @@ lua tcp socket read timed out
     }
 --- request
 GET /t
---- response_body
-connected: 1
-failed to receive: timeout
+--- response_body_like chomp
+500 Internal Server Error
+--- error_code: 500
 --- error_log
-lua tcp socket read timeout: 102
-lua tcp socket connect timeout: 60000
-lua tcp socket read timed out
+bad timeout value
 
 
 
@@ -563,8 +559,6 @@ lua tcp socket write timed out
                 return
             end
 
-            ngx.say("connected: ", ok)
-
             sock:settimeout(-1)
 
             local bytes
@@ -578,13 +572,11 @@ lua tcp socket write timed out
     }
 --- request
 GET /t
---- response_body
-connected: 1
-failed to send: timeout
+--- response_body_like chomp
+500 Internal Server Error
 --- error_log
-lua tcp socket send timeout: 102
-lua tcp socket connect timeout: 60000
-lua tcp socket write timed out
+bad timeout value
+--- error_code: 500
 
 
 
@@ -1021,6 +1013,6 @@ close: 1 nil
 GET /t
 --- response_body_like
 settimeout: ok
-failed to set timeout: lua tcp socket timeout 2147483648(?:\.\d+)? will overflow
+failed to set timeout: bad timeout value
 --- no_error_log
 [error]

t/147-tcp-socket-timeouts.t

@@ -560,7 +560,7 @@ failed to receive a line: closed []
 GET /t
 --- response_body_like
 settimeouts: ok
-failed to set timeouts: timeout value too large
+failed to set timeouts: bad timeout value
 --- no_error_log
 [error]
 
@@ -591,7 +591,7 @@ failed to set timeouts: timeout value too large
 GET /t
 --- response_body_like
 settimeouts: ok
-failed to set timeouts: timeout value too large
+failed to set timeouts: bad timeout value
 --- no_error_log
 [error]
 
@@ -622,6 +622,6 @@ failed to set timeouts: timeout value too large
 GET /t
 --- response_body_like
 settimeouts: ok
-failed to set timeouts: timeout value too large
+failed to set timeouts: bad timeout value
 --- no_error_log
 [error]