#58 - fixed

Author: dedok

src/ngx_http_tnt_handlers.c

@@ -49,7 +49,7 @@ ngx_http_tnt_get_output_size(
 
     if (r->method & NGX_HTTP_POST ||
         ((r->method & NGX_HTTP_PUT || r->method & NGX_HTTP_DELETE)
-          && r->headers_in.content_length_n))
+          && r->headers_in.content_length_n > 0))
     {
       output_size += r->headers_in.content_length_n;
     }
@@ -564,22 +564,11 @@ ngx_int_t ngx_http_tnt_init_handlers(
     u->abort_request = ngx_http_tnt_abort_request;
     u->finalize_request = ngx_http_tnt_finalize_request;
 
-    switch (r->method) {
-    case NGX_HTTP_POST:
-        if (r->headers_in.content_length_n == 0) {
-            return NGX_HTTP_BAD_REQUEST;
-        }
+
+    if (r->headers_in.content_length_n > 0) {
         u->create_request = ngx_http_tnt_body_json_handler;
-        break;
-    default:
-        if ((r->method == NGX_HTTP_PUT || r->method == NGX_HTTP_DELETE)
-            && r->headers_in.content_length_n) {
-          u->create_request = ngx_http_tnt_body_json_handler;
-        }
-        else {
-          u->create_request = ngx_http_tnt_query_handler;
-        }
-        break;
+    } else {
+        u->create_request = ngx_http_tnt_query_handler;
     }
 
     return NGX_OK;
@@ -618,7 +607,7 @@ ngx_http_tnt_body_json_handler(ngx_http_request_t *r)
     if (out_chain->buf == NULL) {
         crit("[BUG?] ngx_http_tnt_body_json_handler -- "
              "failed to allocate output buffer, size %ui",
-             r->headers_in.content_length_n * tlcf->in_multiplier);
+             (r->headers_in.content_length_n + 1) * tlcf->in_multiplier);
         return NGX_ERROR;
     }
 

test/http_utils.py

@@ -199,6 +199,48 @@ def get_fail(url, data, headers):
     (code, msg) = get(url, data, headers)
     return (code, msg)
 
+def delete(url, data, headers):
+    out = '{}'
+    try:
+        req = urllib2.Request(url)
+        req.get_method = lambda: 'DELETE'
+        if headers:
+            for header in headers:
+                req.add_header(header, headers[header])
+        if data:
+            req.add_header('Content-Type', 'application/json')
+            res = urllib2.urlopen(req, json.dumps(data))
+        else:
+            res = urllib2.urlopen(req)
+
+        out = res.read()
+        out = out + res.read()
+        rc = res.getcode()
+
+        if VERBOSE:
+            print("code: ", rc, " recv: '", out, "'")
+
+        if rc != 500:
+            return (rc, json.loads(out))
+
+        return (rc, False)
+    except urllib2.HTTPError as e:
+        if e.code == 400:
+            out = e.read();
+
+        if VERBOSE:
+            print("code: ", e.code, " recv: '", out, "'")
+
+        return (e.code, json.loads(out))
+    except Exception as e:
+        print(traceback.format_exc())
+        return (False, e)
+
+def delete_success(url, data, headers):
+    (code, msg) = delete(url, data, headers)
+    assert(code == 200), 'expected 200'
+    result = get_result(msg)
+
 def assert_headers(result, headers_in):
     for header in headers_in:
         header_from_server = result[0]['headers'][header]

test/ngx_confs/tnt_server_test.conf

@@ -17,7 +17,7 @@ http {
    send_timeout 10;
 
    upstream tnt {
-     server 127.0.0.1:9999 max_fails=1 fail_timeout=30s;
+     server 127.0.0.1:9999 max_fails=1 fail_timeout=1s;
      keepalive 1;
    }
 
@@ -148,5 +148,27 @@ http {
        tnt_pass tnt;
      }
      # ]]
+
+     # BUG -- https://github.com/tarantool/nginx_upstream_module/issues/58 [[
+     location /issue_58 {
+       if ( $request_method = GET ) {
+             tnt_method "read";
+       }
+       if ( $request_method = PUT ) {
+             tnt_method "insert";
+       }
+       if ( $request_method = POST ) {
+             tnt_method "update";
+       }
+       if ( $request_method = DELETE ) {
+             tnt_method "delete";
+       }
+       tnt_http_rest_methods get delete;
+       tnt_http_methods all;
+       tnt_pure_result off;
+       tnt_pass_http_request on parse_args;
+       tnt_pass tnt;
+     }
+     # ]]
    }
 }

test/test.lua

@@ -92,3 +92,17 @@ end
 function four_empty_strings()
   return {"", "", "", "", {a = ""}}
 end
+
+function issue_58(request)
+  return true
+end
+
+-- BUG -- https://github.com/tarantool/nginx_upstream_module/issues/58
+function delete(request, a1, a2)
+  return request, a1, a2
+end
+
+function insert(request, a1, a2)
+  return request, a1, a2
+end
+-- ]]

test/v23_features.py

@@ -124,3 +124,15 @@
 preset_method_location = BASE_URL + '/tnt'
 post_success(preset_method_location, {
     'method':'four_empty_strings', 'params':[], 'id': 1}, {})
+
+#===========
+#
+print('[+] issue #58, REST or RPC?')
+
+preset_method_location = BASE_URL + '/issue_58'
+put_success(preset_method_location, None, None)
+put_success(preset_method_location, {'params':[1, 2]}, None)
+
+delete_success(preset_method_location, None, None)
+delete_success(preset_method_location, {'params':[1, 2]}, None)
+