[nginx] Stream: moved fastopen compatibility check.

Sergey Kandaurov pluknet at nginx.com
Fri Mar 22 11:17:25 UTC 2024


details:   https://hg.nginx.org/nginx/rev/6317e21a15e0
branches:  
changeset: 9224:6317e21a15e0
user:      Roman Arutyunyan <arut at nginx.com>
date:      Thu Jan 18 19:12:38 2024 +0400
description:
Stream: moved fastopen compatibility check.

The move makes the code look similar to the corresponding code in http module.

diffstat:

 src/stream/ngx_stream_core_module.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r dd516985310f -r 6317e21a15e0 src/stream/ngx_stream_core_module.c
--- a/src/stream/ngx_stream_core_module.c	Fri Mar 22 14:53:19 2024 +0400
+++ b/src/stream/ngx_stream_core_module.c	Thu Jan 18 19:12:38 2024 +0400
@@ -1215,6 +1215,12 @@ ngx_stream_core_listen(ngx_conf_t *cf, n
     }
 
     if (lsopt.type == SOCK_DGRAM) {
+#if (NGX_HAVE_TCP_FASTOPEN)
+        if (lsopt.fastopen != -1) {
+            return "\"fastopen\" parameter is incompatible with \"udp\"";
+        }
+#endif
+
         if (backlog) {
             return "\"backlog\" parameter is incompatible with \"udp\"";
         }
@@ -1244,12 +1250,6 @@ ngx_stream_core_listen(ngx_conf_t *cf, n
         if (lsopt.proxy_protocol) {
             return "\"proxy_protocol\" parameter is incompatible with \"udp\"";
         }
-
-#if (NGX_HAVE_TCP_FASTOPEN)
-        if (lsopt.fastopen != -1) {
-            return "\"fastopen\" parameter is incompatible with \"udp\"";
-        }
-#endif
     }
 
     for (n = 0; n < u.naddrs; n++) {


More information about the nginx-devel mailing list