bugfix: Dgram: insert a receive block only if "--- dgram_response" is…

… specified.
openresty · Aug 22, 2016 · 9f65bb9 · 9f65bb9
1 parent 196f9f7
commit 9f65bb9
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/lib/Test/Nginx/Socket/Lua/Dgram.pm b/lib/Test/Nginx/Socket/Lua/Dgram.pm
@@ -102,15 +102,10 @@ _EOC_
         } else {
             $new_http_server_config .= <<_EOC_;
                         sock:send('trigger dgram req')
-                        local data, err = sock:receive()
-                        if not data then
-                            sock:close()
-                            ngx.say("receive stream response error: ", err)
-                            return
-                        end
 _EOC_
         }
 
+
         if (defined $block->abort) {
             my $timeout = Test::Nginx::Util::parse_time($block->timeout)
                           // Test::Nginx::Util::timeout();
@@ -128,6 +123,14 @@ _EOC_
             || defined $block->dgram_response
             || defined $block->dgram_response_like)
         {
+          $new_http_server_config .= <<_EOC_;
+              local data, err = sock:receive()
+              if not data then
+                sock:close()
+                ngx.say("receive stream response error: ", err)
+                return
+              end
+_EOC_
             if (defined $block->log_dgram_response) {
                 $new_http_server_config .= <<_EOC_;
                     print("stream response: ", data)
@@ -166,20 +169,21 @@ _EOC_
 
             $new_http_server_config .= <<_EOC_;
                         sock:send('trigger_dgram_req2')
-                        local data, err = sock:receive()
-                        if not data then
-                            ngx.say("receive stream response error: ", err)
-                            return
-                        end
 _EOC_
 
             if (defined $block->response_body
                 || defined $block->response_body_like
                 || defined $block->dgram_response
                 || defined $block->dgram_response_like)
             {
-                $new_http_server_config .= <<_EOC_;
-                        ngx.print(data)
+              $new_http_server_config .= <<_EOC_;
+                  local data, err = sock:receive()
+                  if not data then
+                    sock:close()
+                    ngx.say("receive stream response error: ", err)
+                    return
+                  end
+                  ngx.print(data)
 _EOC_
             }
         }
@@ -223,6 +227,12 @@ _EOC_
                 || defined $block->dgram_response_like)
             {
                 $new_http_server_config .= <<_EOC_;
+                        local data, err = sock:receive()
+                        if not data then
+                          sock:close()
+                          ngx.say("receive stream response error: ", err)
+                          return
+                        end
                         ngx.print(data)
 _EOC_
             }