Skip to content

Commit f4b525a

Browse files
syucreamsyucream
authored
Merge pull request #70 from syucream/clang-format
clang-format
2 parents 5246cd8 + 45effad commit f4b525a

15 files changed

+261
-270
lines changed

‎src/ts_mruby.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,15 @@
99
#include <atscppapi/RemapPlugin.h>
1010

1111
#include "ts_mruby.hpp"
12-
#include "ts_mruby_internal.hpp"
1312
#include "ts_mruby_init.hpp"
1413
#include "ts_mruby_internal.hpp"
14+
#include "ts_mruby_internal.hpp"
1515
#include "ts_mruby_request.hpp"
1616
#include "utils.hpp"
1717

1818
using namespace std;
1919
using namespace atscppapi;
2020

21-
2221
namespace {
2322

2423
// Global mruby scripts cache
@@ -141,7 +140,8 @@ class MRubyRemapPlugin : public RemapPlugin, MRubyPluginBase {
141140
// As global plugin
142141
void TSPluginInit(int argc, const char *argv[]) {
143142
if (argc == 2) {
144-
RegisterGlobalPlugin(TS_MRUBY_PLUGIN_NAME, TS_MRUBY_PLUGIN_AUTHOR, TS_MRUBY_PLUGIN_EMAIL);
143+
RegisterGlobalPlugin(TS_MRUBY_PLUGIN_NAME, TS_MRUBY_PLUGIN_AUTHOR,
144+
TS_MRUBY_PLUGIN_EMAIL);
145145

146146
if (!scriptsCache) {
147147
scriptsCache = ts_mruby::utils::mockable_ptr<MrubyScriptsCache>();

‎src/ts_mruby.hpp

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
#include <fstream>
2+
#include <iostream>
13
#include <map>
24
#include <string>
3-
#include <iostream>
4-
#include <fstream>
55

66
#include <mruby.h>
77
#include <mruby/compile.h>
@@ -21,13 +21,16 @@ class MrubyScriptsCache {
2121
MOCKABLE_ATTR
2222
void store(const std::string &filepath) {
2323
std::ifstream ifs(filepath);
24-
const std::string code((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
24+
const std::string code((std::istreambuf_iterator<char>(ifs)),
25+
std::istreambuf_iterator<char>());
2526

2627
scripts_.insert(make_pair(filepath, code));
2728
}
2829

2930
MOCKABLE_ATTR
30-
const std::string &load(const std::string &filepath) { return scripts_[filepath]; }
31+
const std::string &load(const std::string &filepath) {
32+
return scripts_[filepath];
33+
}
3134

3235
#ifdef MOCKING
3336
using mock_type = class MrubyScriptsCacheMock;

‎src/ts_mruby_config_keys.hpp

+103-104
Original file line numberDiff line numberDiff line change
@@ -14,109 +14,108 @@
1414
* NOTE: These entries are based on lib/ts/apidefs.h.in on trafficserver.
1515
* so, we must follow updates of trafficserver core...
1616
*/
17-
const static char* OVERRIDABLE_CONFIG_KEY[] = {
18-
// "TS_CONFIG_NULL" is -1, invalid and unnecessary index
19-
"TS_CONFIG_URL_REMAP_PRISTINE_HOST_HDR",
20-
"TS_CONFIG_HTTP_CHUNKING_ENABLED",
21-
"TS_CONFIG_HTTP_NEGATIVE_CACHING_ENABLED",
22-
"TS_CONFIG_HTTP_NEGATIVE_CACHING_LIFETIME",
23-
"TS_CONFIG_HTTP_CACHE_WHEN_TO_REVALIDATE",
24-
"TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_IN",
25-
"TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT",
26-
"TS_CONFIG_HTTP_KEEP_ALIVE_POST_OUT",
27-
"TS_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH",
28-
"TS_CONFIG_NET_SOCK_RECV_BUFFER_SIZE_OUT",
29-
"TS_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT",
30-
"TS_CONFIG_NET_SOCK_OPTION_FLAG_OUT",
31-
"TS_CONFIG_HTTP_FORWARD_PROXY_AUTH_TO_PARENT",
32-
"TS_CONFIG_HTTP_ANONYMIZE_REMOVE_FROM",
33-
"TS_CONFIG_HTTP_ANONYMIZE_REMOVE_REFERER",
34-
"TS_CONFIG_HTTP_ANONYMIZE_REMOVE_USER_AGENT",
35-
"TS_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE",
36-
"TS_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP",
37-
"TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP",
38-
"TS_CONFIG_HTTP_RESPONSE_SERVER_ENABLED",
39-
"TS_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR",
40-
"TS_CONFIG_HTTP_SERVER_TCP_INIT_CWND",
41-
"TS_CONFIG_HTTP_SEND_HTTP13_REQUESTS",
42-
"TS_CONFIG_HTTP_CACHE_HTTP",
43-
"TS_CONFIG_HTTP_CACHE_CLUSTER_CACHE_LOCAL",
44-
"TS_CONFIG_HTTP_CACHE_IGNORE_CLIENT_NO_CACHE",
45-
"TS_CONFIG_HTTP_CACHE_IGNORE_CLIENT_CC_MAX_AGE",
46-
"TS_CONFIG_HTTP_CACHE_IMS_ON_CLIENT_NO_CACHE",
47-
"TS_CONFIG_HTTP_CACHE_IGNORE_SERVER_NO_CACHE",
48-
"TS_CONFIG_HTTP_CACHE_CACHE_RESPONSES_TO_COOKIES",
49-
"TS_CONFIG_HTTP_CACHE_IGNORE_AUTHENTICATION",
50-
"TS_CONFIG_HTTP_CACHE_CACHE_URLS_THAT_LOOK_DYNAMIC",
51-
"TS_CONFIG_HTTP_CACHE_REQUIRED_HEADERS",
52-
"TS_CONFIG_HTTP_INSERT_REQUEST_VIA_STR",
53-
"TS_CONFIG_HTTP_INSERT_RESPONSE_VIA_STR",
54-
"TS_CONFIG_HTTP_CACHE_HEURISTIC_MIN_LIFETIME",
55-
"TS_CONFIG_HTTP_CACHE_HEURISTIC_MAX_LIFETIME",
56-
"TS_CONFIG_HTTP_CACHE_GUARANTEED_MIN_LIFETIME",
57-
"TS_CONFIG_HTTP_CACHE_GUARANTEED_MAX_LIFETIME",
58-
"TS_CONFIG_HTTP_CACHE_MAX_STALE_AGE",
59-
"TS_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_IN",
60-
"TS_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_OUT",
61-
"TS_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_IN",
62-
"TS_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_OUT",
63-
"TS_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_OUT",
64-
"TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS",
65-
"TS_CONFIG_HTTP_CONNECT_ATTEMPTS_MAX_RETRIES",
66-
"TS_CONFIG_HTTP_CONNECT_ATTEMPTS_MAX_RETRIES_DEAD_SERVER",
67-
"TS_CONFIG_HTTP_CONNECT_ATTEMPTS_RR_RETRIES",
68-
"TS_CONFIG_HTTP_CONNECT_ATTEMPTS_TIMEOUT",
69-
"TS_CONFIG_HTTP_POST_CONNECT_ATTEMPTS_TIMEOUT",
70-
"TS_CONFIG_HTTP_DOWN_SERVER_CACHE_TIME",
71-
"TS_CONFIG_HTTP_DOWN_SERVER_ABORT_THRESHOLD",
72-
"TS_CONFIG_HTTP_CACHE_FUZZ_TIME",
73-
"TS_CONFIG_HTTP_CACHE_FUZZ_MIN_TIME",
74-
"TS_CONFIG_HTTP_DOC_IN_CACHE_SKIP_DNS",
75-
"TS_CONFIG_HTTP_BACKGROUND_FILL_ACTIVE_TIMEOUT",
76-
"TS_CONFIG_HTTP_RESPONSE_SERVER_STR",
77-
"TS_CONFIG_HTTP_CACHE_HEURISTIC_LM_FACTOR",
78-
"TS_CONFIG_HTTP_CACHE_FUZZ_PROBABILITY",
79-
"TS_CONFIG_HTTP_BACKGROUND_FILL_COMPLETED_THRESHOLD",
80-
"TS_CONFIG_NET_SOCK_PACKET_MARK_OUT",
81-
"TS_CONFIG_NET_SOCK_PACKET_TOS_OUT",
82-
"TS_CONFIG_HTTP_INSERT_AGE_IN_RESPONSE",
83-
"TS_CONFIG_HTTP_CHUNKING_SIZE",
84-
"TS_CONFIG_HTTP_FLOW_CONTROL_ENABLED",
85-
"TS_CONFIG_HTTP_FLOW_CONTROL_LOW_WATER_MARK",
86-
"TS_CONFIG_HTTP_FLOW_CONTROL_HIGH_WATER_MARK",
87-
"TS_CONFIG_HTTP_CACHE_RANGE_LOOKUP",
88-
"TS_CONFIG_HTTP_NORMALIZE_AE_GZIP",
89-
"TS_CONFIG_HTTP_DEFAULT_BUFFER_SIZE",
90-
"TS_CONFIG_HTTP_DEFAULT_BUFFER_WATER_MARK",
91-
"TS_CONFIG_HTTP_REQUEST_HEADER_MAX_SIZE",
92-
"TS_CONFIG_HTTP_RESPONSE_HEADER_MAX_SIZE",
93-
"TS_CONFIG_HTTP_NEGATIVE_REVALIDATING_ENABLED",
94-
"TS_CONFIG_HTTP_NEGATIVE_REVALIDATING_LIFETIME",
95-
"TS_CONFIG_HTTP_ACCEPT_ENCODING_FILTER_ENABLED",
96-
"TS_CONFIG_SSL_HSTS_MAX_AGE",
97-
"TS_CONFIG_SSL_HSTS_INCLUDE_SUBDOMAINS",
98-
"TS_CONFIG_HTTP_CACHE_OPEN_READ_RETRY_TIME",
99-
"TS_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES",
100-
"TS_CONFIG_HTTP_CACHE_RANGE_WRITE",
101-
"TS_CONFIG_HTTP_POST_CHECK_CONTENT_LENGTH_ENABLED",
102-
"TS_CONFIG_HTTP_GLOBAL_USER_AGENT_HEADER",
103-
"TS_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE",
104-
"TS_CONFIG_HTTP_SLOW_LOG_THRESHOLD",
105-
"TS_CONFIG_HTTP_CACHE_GENERATION",
106-
"TS_CONFIG_BODY_FACTORY_TEMPLATE_BASE",
107-
"TS_CONFIG_HTTP_CACHE_OPEN_WRITE_FAIL_ACTION",
108-
"TS_CONFIG_HTTP_ENABLE_REDIRECTION",
109-
"TS_CONFIG_HTTP_NUMBER_OF_REDIRECTIONS",
110-
"TS_CONFIG_HTTP_CACHE_MAX_OPEN_WRITE_RETRIES",
111-
"TS_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY",
112-
"TS_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT",
113-
"TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE",
114-
"TS_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT",
115-
"TS_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT",
116-
"TS_CONFIG_HTTP_UNCACHEABLE_REQUESTS_BYPASS_PARENT",
117-
"TS_CONFIG_HTTP_PARENT_PROXY_TOTAL_CONNECT_ATTEMPTS",
118-
"TS_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_IN",
119-
""
120-
};
17+
const static char *OVERRIDABLE_CONFIG_KEY[] = {
18+
// "TS_CONFIG_NULL" is -1, invalid and unnecessary index
19+
"TS_CONFIG_URL_REMAP_PRISTINE_HOST_HDR",
20+
"TS_CONFIG_HTTP_CHUNKING_ENABLED",
21+
"TS_CONFIG_HTTP_NEGATIVE_CACHING_ENABLED",
22+
"TS_CONFIG_HTTP_NEGATIVE_CACHING_LIFETIME",
23+
"TS_CONFIG_HTTP_CACHE_WHEN_TO_REVALIDATE",
24+
"TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_IN",
25+
"TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT",
26+
"TS_CONFIG_HTTP_KEEP_ALIVE_POST_OUT",
27+
"TS_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH",
28+
"TS_CONFIG_NET_SOCK_RECV_BUFFER_SIZE_OUT",
29+
"TS_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT",
30+
"TS_CONFIG_NET_SOCK_OPTION_FLAG_OUT",
31+
"TS_CONFIG_HTTP_FORWARD_PROXY_AUTH_TO_PARENT",
32+
"TS_CONFIG_HTTP_ANONYMIZE_REMOVE_FROM",
33+
"TS_CONFIG_HTTP_ANONYMIZE_REMOVE_REFERER",
34+
"TS_CONFIG_HTTP_ANONYMIZE_REMOVE_USER_AGENT",
35+
"TS_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE",
36+
"TS_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP",
37+
"TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP",
38+
"TS_CONFIG_HTTP_RESPONSE_SERVER_ENABLED",
39+
"TS_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR",
40+
"TS_CONFIG_HTTP_SERVER_TCP_INIT_CWND",
41+
"TS_CONFIG_HTTP_SEND_HTTP13_REQUESTS",
42+
"TS_CONFIG_HTTP_CACHE_HTTP",
43+
"TS_CONFIG_HTTP_CACHE_CLUSTER_CACHE_LOCAL",
44+
"TS_CONFIG_HTTP_CACHE_IGNORE_CLIENT_NO_CACHE",
45+
"TS_CONFIG_HTTP_CACHE_IGNORE_CLIENT_CC_MAX_AGE",
46+
"TS_CONFIG_HTTP_CACHE_IMS_ON_CLIENT_NO_CACHE",
47+
"TS_CONFIG_HTTP_CACHE_IGNORE_SERVER_NO_CACHE",
48+
"TS_CONFIG_HTTP_CACHE_CACHE_RESPONSES_TO_COOKIES",
49+
"TS_CONFIG_HTTP_CACHE_IGNORE_AUTHENTICATION",
50+
"TS_CONFIG_HTTP_CACHE_CACHE_URLS_THAT_LOOK_DYNAMIC",
51+
"TS_CONFIG_HTTP_CACHE_REQUIRED_HEADERS",
52+
"TS_CONFIG_HTTP_INSERT_REQUEST_VIA_STR",
53+
"TS_CONFIG_HTTP_INSERT_RESPONSE_VIA_STR",
54+
"TS_CONFIG_HTTP_CACHE_HEURISTIC_MIN_LIFETIME",
55+
"TS_CONFIG_HTTP_CACHE_HEURISTIC_MAX_LIFETIME",
56+
"TS_CONFIG_HTTP_CACHE_GUARANTEED_MIN_LIFETIME",
57+
"TS_CONFIG_HTTP_CACHE_GUARANTEED_MAX_LIFETIME",
58+
"TS_CONFIG_HTTP_CACHE_MAX_STALE_AGE",
59+
"TS_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_IN",
60+
"TS_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_OUT",
61+
"TS_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_IN",
62+
"TS_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_OUT",
63+
"TS_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_OUT",
64+
"TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS",
65+
"TS_CONFIG_HTTP_CONNECT_ATTEMPTS_MAX_RETRIES",
66+
"TS_CONFIG_HTTP_CONNECT_ATTEMPTS_MAX_RETRIES_DEAD_SERVER",
67+
"TS_CONFIG_HTTP_CONNECT_ATTEMPTS_RR_RETRIES",
68+
"TS_CONFIG_HTTP_CONNECT_ATTEMPTS_TIMEOUT",
69+
"TS_CONFIG_HTTP_POST_CONNECT_ATTEMPTS_TIMEOUT",
70+
"TS_CONFIG_HTTP_DOWN_SERVER_CACHE_TIME",
71+
"TS_CONFIG_HTTP_DOWN_SERVER_ABORT_THRESHOLD",
72+
"TS_CONFIG_HTTP_CACHE_FUZZ_TIME",
73+
"TS_CONFIG_HTTP_CACHE_FUZZ_MIN_TIME",
74+
"TS_CONFIG_HTTP_DOC_IN_CACHE_SKIP_DNS",
75+
"TS_CONFIG_HTTP_BACKGROUND_FILL_ACTIVE_TIMEOUT",
76+
"TS_CONFIG_HTTP_RESPONSE_SERVER_STR",
77+
"TS_CONFIG_HTTP_CACHE_HEURISTIC_LM_FACTOR",
78+
"TS_CONFIG_HTTP_CACHE_FUZZ_PROBABILITY",
79+
"TS_CONFIG_HTTP_BACKGROUND_FILL_COMPLETED_THRESHOLD",
80+
"TS_CONFIG_NET_SOCK_PACKET_MARK_OUT",
81+
"TS_CONFIG_NET_SOCK_PACKET_TOS_OUT",
82+
"TS_CONFIG_HTTP_INSERT_AGE_IN_RESPONSE",
83+
"TS_CONFIG_HTTP_CHUNKING_SIZE",
84+
"TS_CONFIG_HTTP_FLOW_CONTROL_ENABLED",
85+
"TS_CONFIG_HTTP_FLOW_CONTROL_LOW_WATER_MARK",
86+
"TS_CONFIG_HTTP_FLOW_CONTROL_HIGH_WATER_MARK",
87+
"TS_CONFIG_HTTP_CACHE_RANGE_LOOKUP",
88+
"TS_CONFIG_HTTP_NORMALIZE_AE_GZIP",
89+
"TS_CONFIG_HTTP_DEFAULT_BUFFER_SIZE",
90+
"TS_CONFIG_HTTP_DEFAULT_BUFFER_WATER_MARK",
91+
"TS_CONFIG_HTTP_REQUEST_HEADER_MAX_SIZE",
92+
"TS_CONFIG_HTTP_RESPONSE_HEADER_MAX_SIZE",
93+
"TS_CONFIG_HTTP_NEGATIVE_REVALIDATING_ENABLED",
94+
"TS_CONFIG_HTTP_NEGATIVE_REVALIDATING_LIFETIME",
95+
"TS_CONFIG_HTTP_ACCEPT_ENCODING_FILTER_ENABLED",
96+
"TS_CONFIG_SSL_HSTS_MAX_AGE",
97+
"TS_CONFIG_SSL_HSTS_INCLUDE_SUBDOMAINS",
98+
"TS_CONFIG_HTTP_CACHE_OPEN_READ_RETRY_TIME",
99+
"TS_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES",
100+
"TS_CONFIG_HTTP_CACHE_RANGE_WRITE",
101+
"TS_CONFIG_HTTP_POST_CHECK_CONTENT_LENGTH_ENABLED",
102+
"TS_CONFIG_HTTP_GLOBAL_USER_AGENT_HEADER",
103+
"TS_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE",
104+
"TS_CONFIG_HTTP_SLOW_LOG_THRESHOLD",
105+
"TS_CONFIG_HTTP_CACHE_GENERATION",
106+
"TS_CONFIG_BODY_FACTORY_TEMPLATE_BASE",
107+
"TS_CONFIG_HTTP_CACHE_OPEN_WRITE_FAIL_ACTION",
108+
"TS_CONFIG_HTTP_ENABLE_REDIRECTION",
109+
"TS_CONFIG_HTTP_NUMBER_OF_REDIRECTIONS",
110+
"TS_CONFIG_HTTP_CACHE_MAX_OPEN_WRITE_RETRIES",
111+
"TS_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY",
112+
"TS_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT",
113+
"TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE",
114+
"TS_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT",
115+
"TS_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT",
116+
"TS_CONFIG_HTTP_UNCACHEABLE_REQUESTS_BYPASS_PARENT",
117+
"TS_CONFIG_HTTP_PARENT_PROXY_TOTAL_CONNECT_ATTEMPTS",
118+
"TS_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_IN",
119+
""};
121120

122121
#endif // TS_MRUBY_CONFIG_KEYS_H

‎src/ts_mruby_connection.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ static mrb_value ts_mrb_get_conn_var_remote_port(mrb_state *mrb,
3737
auto *context = reinterpret_cast<TSMrubyContext *>(mrb->ud);
3838
Transaction *transaction = context->getTransaction();
3939

40-
4140
const sockaddr *addr = transaction->getClientAddress();
4241
uint16_t remote_port = utils::getPort(addr);
4342
const string &port_str = std::to_string(remote_port);

‎src/ts_mruby_core.cpp

+46-38
Original file line numberDiff line numberDiff line change
@@ -28,38 +28,44 @@ using namespace std;
2828
using namespace atscppapi;
2929

3030
const static vector<pair<HttpStatus, string>> HTTP_STATUS = {
31-
{HttpStatus::HTTP_STATUS_CONTINUE, "HTTP_CONTINUE"},
32-
{HttpStatus::HTTP_STATUS_SWITCHING_PROTOCOL, "HTTP_SWITCHING_PROTOCOLS"},
33-
{HttpStatus::HTTP_STATUS_OK, "HTTP_OK"},
34-
{HttpStatus::HTTP_STATUS_CREATED, "HTTP_CREATED"},
35-
{HttpStatus::HTTP_STATUS_ACCEPTED, "HTTP_ACCEPTED"},
36-
{HttpStatus::HTTP_STATUS_NO_CONTENT, "HTTP_NO_CONTENT"},
37-
{HttpStatus::HTTP_STATUS_PARTIAL_CONTENT, "HTTP_PARTIAL_CONTENT"},
38-
{HttpStatus::HTTP_STATUS_MOVED_PERMANENTLY, "HTTP_MOVED_PERMANENTLY"},
39-
{HttpStatus::HTTP_STATUS_MOVED_TEMPORARILY, "HTTP_MOVED_TEMPORARILY"},
40-
{HttpStatus::HTTP_STATUS_SEE_OTHER, "HTTP_SEE_OTHER"},
41-
{HttpStatus::HTTP_STATUS_NOT_MODIFIED, "HTTP_NOT_MODIFIED"},
42-
{HttpStatus::HTTP_STATUS_TEMPORARY_REDIRECT, "HTTP_TEMPORARY_REDIRECT"},
43-
{HttpStatus::HTTP_STATUS_BAD_REQUEST, "HTTP_BAD_REQUEST"},
44-
{HttpStatus::HTTP_STATUS_UNAUTHORIZED, "HTTP_UNAUTHORIZED"},
45-
{HttpStatus::HTTP_STATUS_FORBIDDEN, "HTTP_FORBIDDEN"},
46-
{HttpStatus::HTTP_STATUS_NOT_FOUND, "HTTP_NOT_FOUND"},
47-
{HttpStatus::HTTP_STATUS_METHOD_NOT_ALLOWED, "HTTP_NOT_ALLOWED"},
48-
{HttpStatus::HTTP_STATUS_REQUEST_TIMEOUT, "HTTP_REQUEST_TIME_OUT"},
49-
{HttpStatus::HTTP_STATUS_CONFLICT, "HTTP_CONFLICT"},
50-
{HttpStatus::HTTP_STATUS_LENGTH_REQUIRED, "HTTP_LENGTH_REQUIRED"},
51-
{HttpStatus::HTTP_STATUS_PRECONDITION_FAILED, "HTTP_PRECONDITION_FAILED"},
52-
{HttpStatus::HTTP_STATUS_REQUEST_ENTITY_TOO_LARGE, "HTTP_REQUEST_ENTITY_TOO_LARGE"},
53-
{HttpStatus::HTTP_STATUS_REQUEST_URI_TOO_LONG, "HTTP_REQUEST_URI_TOO_LARGE"},
54-
{HttpStatus::HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE, "HTTP_UNSUPPORTED_MEDIA_TYPE"},
55-
{HttpStatus::HTTP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE, "HTTP_RANGE_NOT_SATISFIABLE"},
56-
{HttpStatus::HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE, "HTTP_REQUEST_HEADER_TOO_LARGE"},
57-
{HttpStatus::HTTP_STATUS_INTERNAL_SERVER_ERROR, "HTTP_INTERNAL_SERVER_ERROR"},
58-
{HttpStatus::HTTP_STATUS_NOT_IMPLEMENTED, "HTTP_NOT_IMPLEMENTED"},
59-
{HttpStatus::HTTP_STATUS_BAD_GATEWAY, "HTTP_BAD_GATEWAY"},
60-
{HttpStatus::HTTP_STATUS_SERVICE_UNAVAILABLE, "HTTP_SERVICE_UNAVAILABLE"},
61-
{HttpStatus::HTTP_STATUS_GATEWAY_TIMEOUT, "HTTP_GATEWAY_TIME_OUT"},
62-
{HttpStatus::HTTP_STATUS_INSUFFICIENT_STORAGE, "HTTP_INSUFFICIENT_STORAGE"},
31+
{HttpStatus::HTTP_STATUS_CONTINUE, "HTTP_CONTINUE"},
32+
{HttpStatus::HTTP_STATUS_SWITCHING_PROTOCOL, "HTTP_SWITCHING_PROTOCOLS"},
33+
{HttpStatus::HTTP_STATUS_OK, "HTTP_OK"},
34+
{HttpStatus::HTTP_STATUS_CREATED, "HTTP_CREATED"},
35+
{HttpStatus::HTTP_STATUS_ACCEPTED, "HTTP_ACCEPTED"},
36+
{HttpStatus::HTTP_STATUS_NO_CONTENT, "HTTP_NO_CONTENT"},
37+
{HttpStatus::HTTP_STATUS_PARTIAL_CONTENT, "HTTP_PARTIAL_CONTENT"},
38+
{HttpStatus::HTTP_STATUS_MOVED_PERMANENTLY, "HTTP_MOVED_PERMANENTLY"},
39+
{HttpStatus::HTTP_STATUS_MOVED_TEMPORARILY, "HTTP_MOVED_TEMPORARILY"},
40+
{HttpStatus::HTTP_STATUS_SEE_OTHER, "HTTP_SEE_OTHER"},
41+
{HttpStatus::HTTP_STATUS_NOT_MODIFIED, "HTTP_NOT_MODIFIED"},
42+
{HttpStatus::HTTP_STATUS_TEMPORARY_REDIRECT, "HTTP_TEMPORARY_REDIRECT"},
43+
{HttpStatus::HTTP_STATUS_BAD_REQUEST, "HTTP_BAD_REQUEST"},
44+
{HttpStatus::HTTP_STATUS_UNAUTHORIZED, "HTTP_UNAUTHORIZED"},
45+
{HttpStatus::HTTP_STATUS_FORBIDDEN, "HTTP_FORBIDDEN"},
46+
{HttpStatus::HTTP_STATUS_NOT_FOUND, "HTTP_NOT_FOUND"},
47+
{HttpStatus::HTTP_STATUS_METHOD_NOT_ALLOWED, "HTTP_NOT_ALLOWED"},
48+
{HttpStatus::HTTP_STATUS_REQUEST_TIMEOUT, "HTTP_REQUEST_TIME_OUT"},
49+
{HttpStatus::HTTP_STATUS_CONFLICT, "HTTP_CONFLICT"},
50+
{HttpStatus::HTTP_STATUS_LENGTH_REQUIRED, "HTTP_LENGTH_REQUIRED"},
51+
{HttpStatus::HTTP_STATUS_PRECONDITION_FAILED, "HTTP_PRECONDITION_FAILED"},
52+
{HttpStatus::HTTP_STATUS_REQUEST_ENTITY_TOO_LARGE,
53+
"HTTP_REQUEST_ENTITY_TOO_LARGE"},
54+
{HttpStatus::HTTP_STATUS_REQUEST_URI_TOO_LONG,
55+
"HTTP_REQUEST_URI_TOO_LARGE"},
56+
{HttpStatus::HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE,
57+
"HTTP_UNSUPPORTED_MEDIA_TYPE"},
58+
{HttpStatus::HTTP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE,
59+
"HTTP_RANGE_NOT_SATISFIABLE"},
60+
{HttpStatus::HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE,
61+
"HTTP_REQUEST_HEADER_TOO_LARGE"},
62+
{HttpStatus::HTTP_STATUS_INTERNAL_SERVER_ERROR,
63+
"HTTP_INTERNAL_SERVER_ERROR"},
64+
{HttpStatus::HTTP_STATUS_NOT_IMPLEMENTED, "HTTP_NOT_IMPLEMENTED"},
65+
{HttpStatus::HTTP_STATUS_BAD_GATEWAY, "HTTP_BAD_GATEWAY"},
66+
{HttpStatus::HTTP_STATUS_SERVICE_UNAVAILABLE, "HTTP_SERVICE_UNAVAILABLE"},
67+
{HttpStatus::HTTP_STATUS_GATEWAY_TIMEOUT, "HTTP_GATEWAY_TIME_OUT"},
68+
{HttpStatus::HTTP_STATUS_INSUFFICIENT_STORAGE, "HTTP_INSUFFICIENT_STORAGE"},
6369
};
6470

6571
static mrb_value ts_mrb_get_ts_mruby_name(mrb_state *mrb, mrb_value self) {
@@ -131,18 +137,19 @@ static mrb_value ts_mrb_errlogger(mrb_state *mrb, mrb_value self) {
131137
mrb_get_args(mrb, "*", &argv, &argc);
132138

133139
if (argc != 2) {
134-
TS_ERROR(TS_MRUBY_PLUGIN_NAME, "%s ERROR %s: argument is not 2", TS_MRUBY_PLUGIN_NAME,
135-
__func__);
140+
TS_ERROR(TS_MRUBY_PLUGIN_NAME, "%s ERROR %s: argument is not 2",
141+
TS_MRUBY_PLUGIN_NAME, __func__);
136142
return self;
137143
}
138144
if (mrb_type(argv[0]) != MRB_TT_FIXNUM) {
139-
TS_ERROR(TS_MRUBY_PLUGIN_NAME, "%s ERROR %s: argv[0] is not integer", TS_MRUBY_PLUGIN_NAME,
140-
__func__);
145+
TS_ERROR(TS_MRUBY_PLUGIN_NAME, "%s ERROR %s: argv[0] is not integer",
146+
TS_MRUBY_PLUGIN_NAME, __func__);
141147
return self;
142148
}
143149
log_level = mrb_fixnum(argv[0]);
144150
if (log_level < 0) {
145-
TS_ERROR(TS_MRUBY_PLUGIN_NAME, "%s ERROR %s: log level is not positive number",
151+
TS_ERROR(TS_MRUBY_PLUGIN_NAME,
152+
"%s ERROR %s: log level is not positive number",
146153
TS_MRUBY_PLUGIN_NAME, __func__);
147154
return self;
148155
}
@@ -181,7 +188,8 @@ static mrb_value ts_mrb_redirect(mrb_state *mrb, mrb_value self) {
181188
}
182189

183190
// save location uri
184-
const string redirectUri(static_cast<char *>(RSTRING_PTR(uri)), RSTRING_LEN(uri));
191+
const string redirectUri(static_cast<char *>(RSTRING_PTR(uri)),
192+
RSTRING_LEN(uri));
185193
if (redirectUri.size() == 0) {
186194
return mrb_nil_value();
187195
}

0 commit comments

Comments
 (0)