From: Christopher Faulet Date: Fri, 31 Jul 2015 12:26:57 +0000 (+0200) Subject: BUG/MINOR: http: Add OPTIONS in supported http methods (found by find_http_meth) X-Git-Tag: v1.6.0~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d57ad648735d228a3fb238d18aa31adfb42e791c;p=thirdparty%2Fhaproxy.git BUG/MINOR: http: Add OPTIONS in supported http methods (found by find_http_meth) The 'OPTIONS' method was not in the list of supported HTTP methods and find_http_meth return HTTP_METH_OTHER instead of HTTP_METH_OPTIONS. [wt: this fix needs to be backported at least to 1.5, 1.4 and 1.3] --- diff --git a/src/proto_http.c b/src/proto_http.c index 6d4a6b3674..32b9063a99 100644 --- a/src/proto_http.c +++ b/src/proto_http.c @@ -458,6 +458,9 @@ const struct http_method_desc http_methods[26][3] = { ['H' - 'A'] = { [0] = { .meth = HTTP_METH_HEAD , .len=4, .text="HEAD" }, }, + ['O' - 'A'] = { + [0] = { .meth = HTTP_METH_OPTIONS , .len=7, .text="OPTIONS" }, + }, ['P' - 'A'] = { [0] = { .meth = HTTP_METH_POST , .len=4, .text="POST" }, [1] = { .meth = HTTP_METH_PUT , .len=3, .text="PUT" },