diff --git a/test/regression/regression.cc b/test/regression/regression.cc index 8008ed22..a7187615 100644 --- a/test/regression/regression.cc +++ b/test/regression/regression.cc @@ -161,7 +161,7 @@ void perform_unit_test(std::vector *tests, goto end; } - modsec_assay->processURI(t->uri.c_str(), t->protocol.c_str(), + modsec_assay->processURI(t->uri.c_str(), t->method.c_str(), t->httpVersion.c_str()); actions(&r, modsec_assay); diff --git a/test/regression/regression_test.cc b/test/regression/regression_test.cc index 72c0b202..43eac55a 100644 --- a/test/regression/regression_test.cc +++ b/test/regression/regression_test.cc @@ -141,8 +141,8 @@ RegressionTest *RegressionTest::from_yajl_node(const yajl_val &node) { if (strcmp(key2, "uri") == 0) { u->uri = YAJL_GET_STRING(val2); } - if (strcmp(key2, "protocol") == 0) { - u->protocol = YAJL_GET_STRING(val2); + if (strcmp(key2, "method") == 0) { + u->method = YAJL_GET_STRING(val2); } if (strcmp(key2, "http_version") == 0) { u->httpVersion = YAJL_GET_NUMBER(val2); diff --git a/test/regression/regression_test.h b/test/regression/regression_test.h index afdfce45..27204a45 100644 --- a/test/regression/regression_test.h +++ b/test/regression/regression_test.h @@ -59,7 +59,7 @@ class RegressionTest { int clientPort; int serverPort; - std::string protocol; + std::string method; std::string httpVersion; std::string uri; diff --git a/test/test-cases/regression/action-id.json b/test/test-cases/regression/action-id.json index ff311310..c2dfe557 100644 --- a/test/test-cases/regression/action-id.json +++ b/test/test-cases/regression/action-id.json @@ -20,7 +20,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -66,7 +66,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -112,7 +112,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -158,7 +158,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -204,7 +204,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -250,7 +250,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/action-msg.json b/test/test-cases/regression/action-msg.json index f0f58b17..79a7317d 100644 --- a/test/test-cases/regression/action-msg.json +++ b/test/test-cases/regression/action-msg.json @@ -26,7 +26,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -86,7 +86,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, diff --git a/test/test-cases/regression/action-tag.json b/test/test-cases/regression/action-tag.json index c84e556b..1fd64b6c 100644 --- a/test/test-cases/regression/action-tag.json +++ b/test/test-cases/regression/action-tag.json @@ -26,7 +26,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -86,7 +86,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, diff --git a/test/test-cases/regression/actions.json b/test/test-cases/regression/actions.json index fefd4dc4..fc7355fd 100644 --- a/test/test-cases/regression/actions.json +++ b/test/test-cases/regression/actions.json @@ -27,7 +27,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -88,7 +88,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -150,7 +150,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -212,7 +212,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -273,7 +273,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -334,7 +334,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, diff --git a/test/test-cases/regression/auditlog.json b/test/test-cases/regression/auditlog.json index c62ba571..19d391e1 100644 --- a/test/test-cases/regression/auditlog.json +++ b/test/test-cases/regression/auditlog.json @@ -26,7 +26,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -85,7 +85,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -145,7 +145,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, diff --git a/test/test-cases/regression/collection-tx-with-macro.json b/test/test-cases/regression/collection-tx-with-macro.json index 9a3c8eb7..b310bfb5 100644 --- a/test/test-cases/regression/collection-tx-with-macro.json +++ b/test/test-cases/regression/collection-tx-with-macro.json @@ -26,7 +26,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -86,7 +86,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -146,7 +146,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -207,7 +207,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, diff --git a/test/test-cases/regression/collection-tx.json b/test/test-cases/regression/collection-tx.json index 7dc7f8da..1552f608 100644 --- a/test/test-cases/regression/collection-tx.json +++ b/test/test-cases/regression/collection-tx.json @@ -26,7 +26,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -86,7 +86,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -146,7 +146,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -207,7 +207,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, diff --git a/test/test-cases/regression/config-body_limits.json b/test/test-cases/regression/config-body_limits.json index c147581a..c05b2f47 100644 --- a/test/test-cases/regression/config-body_limits.json +++ b/test/test-cases/regression/config-body_limits.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -60,7 +60,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -102,7 +102,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", @@ -161,7 +161,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/config-calling_phases_by_name.json b/test/test-cases/regression/config-calling_phases_by_name.json index 052392c0..3e65179b 100644 --- a/test/test-cases/regression/config-calling_phases_by_name.json +++ b/test/test-cases/regression/config-calling_phases_by_name.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -60,7 +60,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/config-include.json b/test/test-cases/regression/config-include.json index 19cc7a39..1c2874c9 100644 --- a/test/test-cases/regression/config-include.json +++ b/test/test-cases/regression/config-include.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -60,7 +60,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -102,7 +102,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -144,7 +144,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -186,7 +186,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -229,7 +229,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/config-secdefaultaction.json b/test/test-cases/regression/config-secdefaultaction.json index 6f83e680..0abbf63e 100644 --- a/test/test-cases/regression/config-secdefaultaction.json +++ b/test/test-cases/regression/config-secdefaultaction.json @@ -26,7 +26,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -87,7 +87,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -165,7 +165,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -262,7 +262,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, diff --git a/test/test-cases/regression/config-secremoterules.json b/test/test-cases/regression/config-secremoterules.json index 61b39f69..fcc61927 100644 --- a/test/test-cases/regression/config-secremoterules.json +++ b/test/test-cases/regression/config-secremoterules.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -75,7 +75,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/debug_log.json b/test/test-cases/regression/debug_log.json index 2adc2cfa..fd7eb7f7 100644 --- a/test/test-cases/regression/debug_log.json +++ b/test/test-cases/regression/debug_log.json @@ -27,7 +27,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1=test¶2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, diff --git a/test/test-cases/regression/issue-394.json b/test/test-cases/regression/issue-394.json index d874e0e8..1ce7a596 100644 --- a/test/test-cases/regression/issue-394.json +++ b/test/test-cases/regression/issue-394.json @@ -17,7 +17,7 @@ "request": { "headers": "", "body": "", - "protocol": "GET", + "method": "GET", "http_version": 1.1 }, "response": { diff --git a/test/test-cases/regression/operator-ipMatchFromFile.json b/test/test-cases/regression/operator-ipMatchFromFile.json index 8c0e18cd..8a817cc3 100644 --- a/test/test-cases/regression/operator-ipMatchFromFile.json +++ b/test/test-cases/regression/operator-ipMatchFromFile.json @@ -20,7 +20,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -66,7 +66,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -112,7 +112,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/operator-rx.json b/test/test-cases/regression/operator-rx.json index 8e864a49..8635b870 100644 --- a/test/test-cases/regression/operator-rx.json +++ b/test/test-cases/regression/operator-rx.json @@ -20,7 +20,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/sec_component_signature.json b/test/test-cases/regression/sec_component_signature.json index e7668939..7b5539a8 100644 --- a/test/test-cases/regression/sec_component_signature.json +++ b/test/test-cases/regression/sec_component_signature.json @@ -26,7 +26,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, diff --git a/test/test-cases/regression/secaction.json b/test/test-cases/regression/secaction.json index 460c8634..5fbb7a01 100644 --- a/test/test-cases/regression/secaction.json +++ b/test/test-cases/regression/secaction.json @@ -27,7 +27,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, diff --git a/test/test-cases/regression/secmarker.json b/test/test-cases/regression/secmarker.json index d5e244c6..ffface80 100644 --- a/test/test-cases/regression/secmarker.json +++ b/test/test-cases/regression/secmarker.json @@ -27,7 +27,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -90,7 +90,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, diff --git a/test/test-cases/regression/transformation-none.json b/test/test-cases/regression/transformation-none.json index 4107139b..8df23807 100644 --- a/test/test-cases/regression/transformation-none.json +++ b/test/test-cases/regression/transformation-none.json @@ -27,7 +27,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -87,7 +87,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, diff --git a/test/test-cases/regression/transformations.json b/test/test-cases/regression/transformations.json index 6d2731fb..49f17ad1 100644 --- a/test/test-cases/regression/transformations.json +++ b/test/test-cases/regression/transformations.json @@ -27,7 +27,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -87,7 +87,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= WHEE ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, diff --git a/test/test-cases/regression/variable-ARGS.json b/test/test-cases/regression/variable-ARGS.json index f9646bc8..4facdba9 100644 --- a/test/test-cases/regression/variable-ARGS.json +++ b/test/test-cases/regression/variable-ARGS.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -59,7 +59,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -102,7 +102,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -148,7 +148,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/variable-ARGS_COMBINED_SIZE.json b/test/test-cases/regression/variable-ARGS_COMBINED_SIZE.json index a391857c..abb003df 100644 --- a/test/test-cases/regression/variable-ARGS_COMBINED_SIZE.json +++ b/test/test-cases/regression/variable-ARGS_COMBINED_SIZE.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -59,7 +59,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value&a=b", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -102,7 +102,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -148,7 +148,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2&a=b\n" ] @@ -194,7 +194,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "a=%EC%A7%84%20%EB%A7%88%EC%9D%BC%20%EB%A6%AC" ] @@ -240,7 +240,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/?z=%EC%A7%84%20%EB%A7%88%EC%9D%BC%20%EB%A6%AC", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -283,7 +283,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/?z=진 마일 리", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-ARGS_GET.json b/test/test-cases/regression/variable-ARGS_GET.json index 13e5e263..1fc6f486 100644 --- a/test/test-cases/regression/variable-ARGS_GET.json +++ b/test/test-cases/regression/variable-ARGS_GET.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -59,7 +59,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-ARGS_GET_NAMES.json b/test/test-cases/regression/variable-ARGS_GET_NAMES.json index 74b3150e..08b5c68c 100644 --- a/test/test-cases/regression/variable-ARGS_GET_NAMES.json +++ b/test/test-cases/regression/variable-ARGS_GET_NAMES.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -59,7 +59,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-ARGS_NAMES.json b/test/test-cases/regression/variable-ARGS_NAMES.json index 1108c6ab..2747b51b 100644 --- a/test/test-cases/regression/variable-ARGS_NAMES.json +++ b/test/test-cases/regression/variable-ARGS_NAMES.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -59,7 +59,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -102,7 +102,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -148,7 +148,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/variable-ARGS_POST.json b/test/test-cases/regression/variable-ARGS_POST.json index 2bf03fe6..8ba6c87e 100644 --- a/test/test-cases/regression/variable-ARGS_POST.json +++ b/test/test-cases/regression/variable-ARGS_POST.json @@ -20,7 +20,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -66,7 +66,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/variable-ARGS_POST_NAMES.json b/test/test-cases/regression/variable-ARGS_POST_NAMES.json index 725d46a4..5407cf45 100644 --- a/test/test-cases/regression/variable-ARGS_POST_NAMES.json +++ b/test/test-cases/regression/variable-ARGS_POST_NAMES.json @@ -20,7 +20,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -66,7 +66,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/variable-AUTH_TYPE.json b/test/test-cases/regression/variable-AUTH_TYPE.json index 7dab5b98..c3ab34cc 100644 --- a/test/test-cases/regression/variable-AUTH_TYPE.json +++ b/test/test-cases/regression/variable-AUTH_TYPE.json @@ -21,7 +21,7 @@ "Authorization": "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -68,7 +68,7 @@ "AuThOrIzAtIoN": "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/variable-DURATION.json b/test/test-cases/regression/variable-DURATION.json index df6cc5bc..f173de44 100644 --- a/test/test-cases/regression/variable-DURATION.json +++ b/test/test-cases/regression/variable-DURATION.json @@ -21,7 +21,7 @@ "Authorization": "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/variable-ENV.json b/test/test-cases/regression/variable-ENV.json index 8cfea56d..85733bb3 100644 --- a/test/test-cases/regression/variable-ENV.json +++ b/test/test-cases/regression/variable-ENV.json @@ -20,7 +20,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -66,7 +66,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] @@ -112,7 +112,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/variable-FILES.json b/test/test-cases/regression/variable-FILES.json index 2bd19cc6..4a22e37d 100644 --- a/test/test-cases/regression/variable-FILES.json +++ b/test/test-cases/regression/variable-FILES.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-FILES_COMBINED_SIZE.json b/test/test-cases/regression/variable-FILES_COMBINED_SIZE.json index 7d69e1b8..68690b13 100644 --- a/test/test-cases/regression/variable-FILES_COMBINED_SIZE.json +++ b/test/test-cases/regression/variable-FILES_COMBINED_SIZE.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-FILES_NAMES.json b/test/test-cases/regression/variable-FILES_NAMES.json index b15faa3b..896598c3 100644 --- a/test/test-cases/regression/variable-FILES_NAMES.json +++ b/test/test-cases/regression/variable-FILES_NAMES.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-FILES_SIZES.json b/test/test-cases/regression/variable-FILES_SIZES.json index f0221a9c..cff46516 100644 --- a/test/test-cases/regression/variable-FILES_SIZES.json +++ b/test/test-cases/regression/variable-FILES_SIZES.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-FILES_TMP_CONTENT.json b/test/test-cases/regression/variable-FILES_TMP_CONTENT.json index 17faa673..d57f6c1a 100644 --- a/test/test-cases/regression/variable-FILES_TMP_CONTENT.json +++ b/test/test-cases/regression/variable-FILES_TMP_CONTENT.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-FULL_REQUEST.json b/test/test-cases/regression/variable-FULL_REQUEST.json index 57ba1f8c..c3ee4aec 100644 --- a/test/test-cases/regression/variable-FULL_REQUEST.json +++ b/test/test-cases/regression/variable-FULL_REQUEST.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-FULL_REQUEST_LENGTH.json b/test/test-cases/regression/variable-FULL_REQUEST_LENGTH.json index 4bc51832..0deafaae 100644 --- a/test/test-cases/regression/variable-FULL_REQUEST_LENGTH.json +++ b/test/test-cases/regression/variable-FULL_REQUEST_LENGTH.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-GEO.json b/test/test-cases/regression/variable-GEO.json index 36d794db..88684b68 100644 --- a/test/test-cases/regression/variable-GEO.json +++ b/test/test-cases/regression/variable-GEO.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -61,7 +61,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -104,7 +104,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -147,7 +147,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -190,7 +190,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -233,7 +233,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -276,7 +276,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -319,7 +319,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -362,7 +362,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -405,7 +405,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -448,7 +448,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-HIGHEST_SEVERITY.json b/test/test-cases/regression/variable-HIGHEST_SEVERITY.json index 091fc2a0..028011d8 100644 --- a/test/test-cases/regression/variable-HIGHEST_SEVERITY.json +++ b/test/test-cases/regression/variable-HIGHEST_SEVERITY.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -60,7 +60,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-INBOUND_DATA_ERROR.json b/test/test-cases/regression/variable-INBOUND_DATA_ERROR.json index 2231bd7a..be21681b 100644 --- a/test/test-cases/regression/variable-INBOUND_DATA_ERROR.json +++ b/test/test-cases/regression/variable-INBOUND_DATA_ERROR.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -62,7 +62,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-MATCHED_VAR.json b/test/test-cases/regression/variable-MATCHED_VAR.json index 8088db2f..e9e7126e 100644 --- a/test/test-cases/regression/variable-MATCHED_VAR.json +++ b/test/test-cases/regression/variable-MATCHED_VAR.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -60,7 +60,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-MATCHED_VARS.json b/test/test-cases/regression/variable-MATCHED_VARS.json index dcfa903d..a3199745 100644 --- a/test/test-cases/regression/variable-MATCHED_VARS.json +++ b/test/test-cases/regression/variable-MATCHED_VARS.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?keyI=value&keyII=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -61,7 +61,7 @@ "Accept":"*/*" }, "uri":"/?keyI=value&keyII=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-MATCHED_VARS_NAMES.json b/test/test-cases/regression/variable-MATCHED_VARS_NAMES.json index c7bb31a7..7388d317 100644 --- a/test/test-cases/regression/variable-MATCHED_VARS_NAMES.json +++ b/test/test-cases/regression/variable-MATCHED_VARS_NAMES.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?keyI=value&keyII=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -61,7 +61,7 @@ "Accept":"*/*" }, "uri":"/?keyI=value&keyII=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-MATCHED_VAR_NAME.json b/test/test-cases/regression/variable-MATCHED_VAR_NAME.json index db77aa16..164ffee0 100644 --- a/test/test-cases/regression/variable-MATCHED_VAR_NAME.json +++ b/test/test-cases/regression/variable-MATCHED_VAR_NAME.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?keyI=value&keyII=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -61,7 +61,7 @@ "Accept":"*/*" }, "uri":"/?keyI=value&keyII=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-MODSEC_BUILD.json b/test/test-cases/regression/variable-MODSEC_BUILD.json index 4473ba03..f10f59b7 100644 --- a/test/test-cases/regression/variable-MODSEC_BUILD.json +++ b/test/test-cases/regression/variable-MODSEC_BUILD.json @@ -20,7 +20,7 @@ "Content-Type": "application/x-www-form-urlencoded" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body": [ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/variable-MULTIPART_CRLF_LF_LINES.json b/test/test-cases/regression/variable-MULTIPART_CRLF_LF_LINES.json index 681f5d68..667223a3 100644 --- a/test/test-cases/regression/variable-MULTIPART_CRLF_LF_LINES.json +++ b/test/test-cases/regression/variable-MULTIPART_CRLF_LF_LINES.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", @@ -82,7 +82,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-MULTIPART_FILENAME.json b/test/test-cases/regression/variable-MULTIPART_FILENAME.json index 2597284d..58ccf402 100644 --- a/test/test-cases/regression/variable-MULTIPART_FILENAME.json +++ b/test/test-cases/regression/variable-MULTIPART_FILENAME.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", @@ -82,7 +82,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-MULTIPART_NAME.json b/test/test-cases/regression/variable-MULTIPART_NAME.json index 7d41de57..2f63d5a6 100644 --- a/test/test-cases/regression/variable-MULTIPART_NAME.json +++ b/test/test-cases/regression/variable-MULTIPART_NAME.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", @@ -82,7 +82,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json b/test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json index ed7af8ad..4876f97d 100644 --- a/test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json +++ b/test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", @@ -82,7 +82,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", @@ -143,7 +143,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", @@ -204,7 +204,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", @@ -265,7 +265,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", @@ -326,7 +326,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-MULTIPART_UNMATCHED_BOUNDARY.json b/test/test-cases/regression/variable-MULTIPART_UNMATCHED_BOUNDARY.json index 0a4f4a4c..d02b1938 100644 --- a/test/test-cases/regression/variable-MULTIPART_UNMATCHED_BOUNDARY.json +++ b/test/test-cases/regression/variable-MULTIPART_UNMATCHED_BOUNDARY.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json b/test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json index 7d8098e3..9aecfa94 100644 --- a/test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json +++ b/test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -62,7 +62,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-PATH_INFO.json b/test/test-cases/regression/variable-PATH_INFO.json index 904c1c49..a10bcb4c 100644 --- a/test/test-cases/regression/variable-PATH_INFO.json +++ b/test/test-cases/regression/variable-PATH_INFO.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three", - "protocol":"POST", + "method":"POST", "body":[ "param1=value1¶m2=value2" ] @@ -66,7 +66,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key=value", - "protocol":"POST", + "method":"POST", "body":[ "param1=value1¶m2=value2" ] @@ -112,7 +112,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/%20/three?key=value", - "protocol":"POST", + "method":"POST", "body":[ "param1=value1¶m2=value2" ] diff --git a/test/test-cases/regression/variable-QUERY_STRING.json b/test/test-cases/regression/variable-QUERY_STRING.json index 5a462241..0b3f5943 100644 --- a/test/test-cases/regression/variable-QUERY_STRING.json +++ b/test/test-cases/regression/variable-QUERY_STRING.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-REMOTE_ADDR.json b/test/test-cases/regression/variable-REMOTE_ADDR.json index f9db48e3..e85d49c3 100644 --- a/test/test-cases/regression/variable-REMOTE_ADDR.json +++ b/test/test-cases/regression/variable-REMOTE_ADDR.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -63,7 +63,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-REMOTE_HOST.json b/test/test-cases/regression/variable-REMOTE_HOST.json index e967556a..9433602d 100644 --- a/test/test-cases/regression/variable-REMOTE_HOST.json +++ b/test/test-cases/regression/variable-REMOTE_HOST.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -63,7 +63,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-REMOTE_PORT.json b/test/test-cases/regression/variable-REMOTE_PORT.json index 212ccc45..9792ed8f 100644 --- a/test/test-cases/regression/variable-REMOTE_PORT.json +++ b/test/test-cases/regression/variable-REMOTE_PORT.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -63,7 +63,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-REQUEST_BASENAME.json b/test/test-cases/regression/variable-REQUEST_BASENAME.json index b248ad05..3d8a254f 100644 --- a/test/test-cases/regression/variable-REQUEST_BASENAME.json +++ b/test/test-cases/regression/variable-REQUEST_BASENAME.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/login.php?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-REQUEST_BODY.json b/test/test-cases/regression/variable-REQUEST_BODY.json index ee9566d8..517fe4cf 100644 --- a/test/test-cases/regression/variable-REQUEST_BODY.json +++ b/test/test-cases/regression/variable-REQUEST_BODY.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-REQUEST_BODY_LENGTH.json b/test/test-cases/regression/variable-REQUEST_BODY_LENGTH.json index 538ed151..43767d59 100644 --- a/test/test-cases/regression/variable-REQUEST_BODY_LENGTH.json +++ b/test/test-cases/regression/variable-REQUEST_BODY_LENGTH.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-REQUEST_COOKIES.json b/test/test-cases/regression/variable-REQUEST_COOKIES.json index 23a88140..2df6ceac 100644 --- a/test/test-cases/regression/variable-REQUEST_COOKIES.json +++ b/test/test-cases/regression/variable-REQUEST_COOKIES.json @@ -19,7 +19,7 @@ "Cookie":"USER_TOKEN=Yes; a=z; t=b" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -61,7 +61,7 @@ "Cookie":"USER_TOKEN=Yes; a=z; t=b" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -103,7 +103,7 @@ "Cookie":"USER_TOKEN=Yes; a=z; t=b" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-REQUEST_COOKIES_NAMES.json b/test/test-cases/regression/variable-REQUEST_COOKIES_NAMES.json index d4d71eb4..68b1c939 100644 --- a/test/test-cases/regression/variable-REQUEST_COOKIES_NAMES.json +++ b/test/test-cases/regression/variable-REQUEST_COOKIES_NAMES.json @@ -19,7 +19,7 @@ "Cookie":"USER_TOKEN=Yes; a=z; t=b" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -61,7 +61,7 @@ "Cookie":"USER_TOKEN=Yes; a=z; t=b" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -103,7 +103,7 @@ "Cookie":"USER_TOKEN=Yes; a=z; t=b" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-REQUEST_FILENAME.json b/test/test-cases/regression/variable-REQUEST_FILENAME.json index 85aa1134..8572f8fe 100644 --- a/test/test-cases/regression/variable-REQUEST_FILENAME.json +++ b/test/test-cases/regression/variable-REQUEST_FILENAME.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/login.php?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-REQUEST_HEADERS.json b/test/test-cases/regression/variable-REQUEST_HEADERS.json index 4ebf0fa8..5f2f244c 100644 --- a/test/test-cases/regression/variable-REQUEST_HEADERS.json +++ b/test/test-cases/regression/variable-REQUEST_HEADERS.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-REQUEST_HEADERS_NAMES.json b/test/test-cases/regression/variable-REQUEST_HEADERS_NAMES.json index 09621241..6ff98b68 100644 --- a/test/test-cases/regression/variable-REQUEST_HEADERS_NAMES.json +++ b/test/test-cases/regression/variable-REQUEST_HEADERS_NAMES.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-REQUEST_LINE.json b/test/test-cases/regression/variable-REQUEST_LINE.json index 28c1611d..1f75caa1 100644 --- a/test/test-cases/regression/variable-REQUEST_LINE.json +++ b/test/test-cases/regression/variable-REQUEST_LINE.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET", + "method":"GET", "http_version":1.1 }, "response":{ diff --git a/test/test-cases/regression/variable-REQUEST_METHOD.json b/test/test-cases/regression/variable-REQUEST_METHOD.json index 67bd46f2..4f343624 100644 --- a/test/test-cases/regression/variable-REQUEST_METHOD.json +++ b/test/test-cases/regression/variable-REQUEST_METHOD.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET", + "method":"GET", "http_version":1.1 }, "response":{ diff --git a/test/test-cases/regression/variable-REQUEST_PROTOCOL.json b/test/test-cases/regression/variable-REQUEST_PROTOCOL.json index 0d854d1e..3d24585b 100644 --- a/test/test-cases/regression/variable-REQUEST_PROTOCOL.json +++ b/test/test-cases/regression/variable-REQUEST_PROTOCOL.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET", + "method":"GET", "http_version":1.1 }, "response":{ diff --git a/test/test-cases/regression/variable-REQUEST_URI.json b/test/test-cases/regression/variable-REQUEST_URI.json index d360d7b8..e3e5fcb6 100644 --- a/test/test-cases/regression/variable-REQUEST_URI.json +++ b/test/test-cases/regression/variable-REQUEST_URI.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET", + "method":"GET", "http_version":1.1 }, "response":{ diff --git a/test/test-cases/regression/variable-REQUEST_URI_RAW.json b/test/test-cases/regression/variable-REQUEST_URI_RAW.json index 447be89d..81760c19 100644 --- a/test/test-cases/regression/variable-REQUEST_URI_RAW.json +++ b/test/test-cases/regression/variable-REQUEST_URI_RAW.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET", + "method":"GET", "http_version":1.1 }, "response":{ diff --git a/test/test-cases/regression/variable-RESPONSE_BODY.json b/test/test-cases/regression/variable-RESPONSE_BODY.json index 2f9d73d3..0102bb8d 100644 --- a/test/test-cases/regression/variable-RESPONSE_BODY.json +++ b/test/test-cases/regression/variable-RESPONSE_BODY.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET", + "method":"GET", "http_version":1.1 }, "response":{ diff --git a/test/test-cases/regression/variable-RESPONSE_CONTENT_LENGTH.json b/test/test-cases/regression/variable-RESPONSE_CONTENT_LENGTH.json index ea008335..9268a4c7 100644 --- a/test/test-cases/regression/variable-RESPONSE_CONTENT_LENGTH.json +++ b/test/test-cases/regression/variable-RESPONSE_CONTENT_LENGTH.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET", + "method":"GET", "http_version":1.1 }, "response":{ diff --git a/test/test-cases/regression/variable-RESPONSE_CONTENT_TYPE.json b/test/test-cases/regression/variable-RESPONSE_CONTENT_TYPE.json index c3a401e6..ed9fd2b5 100644 --- a/test/test-cases/regression/variable-RESPONSE_CONTENT_TYPE.json +++ b/test/test-cases/regression/variable-RESPONSE_CONTENT_TYPE.json @@ -18,7 +18,7 @@ "Accept":"*/*" }, "uri":"/?key=value&key=other_value", - "protocol":"GET", + "method":"GET", "http_version":1.1 }, "response":{ diff --git a/test/test-cases/regression/variable-RESPONSE_HEADERS.json b/test/test-cases/regression/variable-RESPONSE_HEADERS.json index 4053616f..524a48d9 100644 --- a/test/test-cases/regression/variable-RESPONSE_HEADERS.json +++ b/test/test-cases/regression/variable-RESPONSE_HEADERS.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-RESPONSE_HEADERS_NAMES.json b/test/test-cases/regression/variable-RESPONSE_HEADERS_NAMES.json index a9d7635a..570fb50c 100644 --- a/test/test-cases/regression/variable-RESPONSE_HEADERS_NAMES.json +++ b/test/test-cases/regression/variable-RESPONSE_HEADERS_NAMES.json @@ -21,7 +21,7 @@ "Expect":"100-continue" }, "uri":"/", - "protocol":"POST", + "method":"POST", "body":[ "--------------------------756b6d74fa1a8ee2", "Content-Disposition: form-data; name=\"name\"", diff --git a/test/test-cases/regression/variable-SERVER_ADDR.json b/test/test-cases/regression/variable-SERVER_ADDR.json index f1e9c208..5de1f203 100644 --- a/test/test-cases/regression/variable-SERVER_ADDR.json +++ b/test/test-cases/regression/variable-SERVER_ADDR.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -63,7 +63,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-SERVER_PORT.json b/test/test-cases/regression/variable-SERVER_PORT.json index 100078c9..73a9bde2 100644 --- a/test/test-cases/regression/variable-SERVER_PORT.json +++ b/test/test-cases/regression/variable-SERVER_PORT.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -63,7 +63,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-TIME.json b/test/test-cases/regression/variable-TIME.json index 075419ae..963a2a74 100644 --- a/test/test-cases/regression/variable-TIME.json +++ b/test/test-cases/regression/variable-TIME.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-TIME_DAY.json b/test/test-cases/regression/variable-TIME_DAY.json index f4869361..2cffc966 100644 --- a/test/test-cases/regression/variable-TIME_DAY.json +++ b/test/test-cases/regression/variable-TIME_DAY.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-TIME_EPOCH.json b/test/test-cases/regression/variable-TIME_EPOCH.json index a278ba43..72507a99 100644 --- a/test/test-cases/regression/variable-TIME_EPOCH.json +++ b/test/test-cases/regression/variable-TIME_EPOCH.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-TIME_HOUR.json b/test/test-cases/regression/variable-TIME_HOUR.json index 9156ef06..1f6abc20 100644 --- a/test/test-cases/regression/variable-TIME_HOUR.json +++ b/test/test-cases/regression/variable-TIME_HOUR.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-TIME_MIN.json b/test/test-cases/regression/variable-TIME_MIN.json index 17516a5e..5003bcb3 100644 --- a/test/test-cases/regression/variable-TIME_MIN.json +++ b/test/test-cases/regression/variable-TIME_MIN.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-TIME_MON.json b/test/test-cases/regression/variable-TIME_MON.json index 39263e61..8085104b 100644 --- a/test/test-cases/regression/variable-TIME_MON.json +++ b/test/test-cases/regression/variable-TIME_MON.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-TIME_SEC.json b/test/test-cases/regression/variable-TIME_SEC.json index c6b5e56b..0141500e 100644 --- a/test/test-cases/regression/variable-TIME_SEC.json +++ b/test/test-cases/regression/variable-TIME_SEC.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-TIME_WDAY.json b/test/test-cases/regression/variable-TIME_WDAY.json index 1301597d..25beaca7 100644 --- a/test/test-cases/regression/variable-TIME_WDAY.json +++ b/test/test-cases/regression/variable-TIME_WDAY.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-TIME_YEAR.json b/test/test-cases/regression/variable-TIME_YEAR.json index 30d8c77a..99e145f8 100644 --- a/test/test-cases/regression/variable-TIME_YEAR.json +++ b/test/test-cases/regression/variable-TIME_YEAR.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-TX.json b/test/test-cases/regression/variable-TX.json index 65576ed3..1648ae1d 100644 --- a/test/test-cases/regression/variable-TX.json +++ b/test/test-cases/regression/variable-TX.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ @@ -61,7 +61,7 @@ "Cookie":"USER_TOKEN=Yes; a=z; t=b" }, "uri":"/?key=value&key=other_value", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-UNIQUE_ID.json b/test/test-cases/regression/variable-UNIQUE_ID.json index 76653712..fe461a01 100644 --- a/test/test-cases/regression/variable-UNIQUE_ID.json +++ b/test/test-cases/regression/variable-UNIQUE_ID.json @@ -20,7 +20,7 @@ "Content-Type":"application/x-www-form-urlencoded" }, "uri":"/one/two/three?key1=value1&key2=v%20a%20l%20u%20e%202", - "protocol":"GET" + "method":"GET" }, "response":{ "headers":{ diff --git a/test/test-cases/regression/variable-variation-count.json b/test/test-cases/regression/variable-variation-count.json index 5fc10153..ac7e609e 100644 --- a/test/test-cases/regression/variable-variation-count.json +++ b/test/test-cases/regression/variable-variation-count.json @@ -26,7 +26,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -85,7 +85,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, @@ -144,7 +144,7 @@ "Cache-Control": "no-cache" }, "uri": "\/test.pl?param1= test ¶m2=test2", - "protocol": "GET", + "method": "GET", "http_version": 1.1, "body": "" }, diff --git a/test/test-cases/regression/variable-variation-exclusion.json b/test/test-cases/regression/variable-variation-exclusion.json index c4f37df0..37c7bd24 100644 --- a/test/test-cases/regression/variable-variation-exclusion.json +++ b/test/test-cases/regression/variable-variation-exclusion.json @@ -26,7 +26,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" }, @@ -85,7 +85,7 @@ "Cache-Control":"no-cache" }, "uri":"\/test.pl?param1= test ¶m2=test2", - "protocol":"GET", + "method":"GET", "http_version":1.1, "body":"" },