From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: Roman <roman.habibov@tarantool.org>, "tarantool-patches@freelists.org" <tarantool-patches@freelists.org> Subject: [tarantool-patches] Re: [PATCH] httpc: add checking of headers in httpc:request Date: Fri, 22 Feb 2019 19:01:37 +0300 [thread overview] Message-ID: <dccea1b7-4f6f-78f7-446e-9ccf69b48fce@tarantool.org> (raw) In-Reply-To: <1550573375.20050.0@smtp.mail.ru> Hi! Thanks for the fixes! See 3 comments below. On 19/02/2019 13:49, Roman wrote: > > Hi! Thanks for review. > > On Сб, фев 16, 2019 at 12:17 AM, Vladislav Shpilevoy <v.shpilevoy@tarantool.org> wrote: >> Hi! >> >> 5. Out of 80 symbols. \x7f\x7f 2. Still out of 80. >> >> My text editor shows 70 symbols. >> >> Then there is something wrong with your editor, sorry. https://github.com/tarantool/tarantool/blob/romanhabibov/gh-3679-httpc-request/src/lua/httpc.c#L180 Lets count. Here you have 6 tabs - 6 * 8 = 48 symbols. Then you have 55 symbols of "headers must be string or table with \"__tostring\""); 48 + 55 = 103. Also, the error string is not aligned by opening parenthesis. In your email I see, that you have 4 symbols tab, what gives you 79 symbols, but tab width in this file should be 8. So probably you mistakenly set tab width to 4 and the editor shows you < 80 width. Please, fix. > Ok. Done. 1. Now you have leading whitespace on line 182. It is clearly visible in git diff as a bright red point. Please, do self-review before sending a patch. > > commit c9802592b27cb6986e3e72eb948d8dbfb21baa7e > Author: Roman Khabibov <roman.habibov@tarantool.org> > Date: Wed Dec 26 17:49:34 2018 +0300 > > httpc: add checking of headers in httpc:request > Add preprocessing of the request headers. Each header must be 'string' or 'table' > with '__tostring' metamethod. > Closes #3679 > > diff --git a/src/lua/httpc.c b/src/lua/httpc.c > index 5f4e2e912..fb012f58b 100644 > --- a/src/lua/httpc.c > +++ b/src/lua/httpc.c > @@ -173,6 +173,18 @@ luaT_httpc_request(lua_State *L) > if (!lua_isnil(L, -1)) { > lua_pushnil(L); > while (lua_next(L, -2) != 0) { > + int header_type = lua_type(L, -1); > + if (header_type != LUA_TSTRING) { > + char *err_msg = "headers must be " \ > + "string or table with \"__tostring\""; 2. Please, do not assign a const char string to a 'char *' variable. Use 'const char *'. Also, please, properly align strings. This part should look like this: if (header_type != LUA_TSTRING) { const char *err_msg = "headers must be string or table with "\ "\"__tostring\""; if (header_type != LUA_TTABLE) { Wrapped string is aligned by the beginning. > + if (header_type != LUA_TTABLE) { > + return luaL_error(L, err_msg); > + } else if (!luaL_getmetafield(L, -1, > + "__tostring")) { > + return luaL_error(L, err_msg); > + } > + lua_pop(L, 1); > + } 3. Obviously, there is still something wrong with indentation of your editor/email agent/whatever else can remove tabs. Please, cope with it. Before sending a next version into the list, send it to yourself and check if now the indentation is good. > if (httpc_set_header(req, "%s: %s", > lua_tostring(L, -2), > lua_tostring(L, -1)) < 0) {
next prev parent reply other threads:[~2019-02-22 16:01 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-21 18:18 [tarantool-patches] " Roman Khabibov 2018-12-23 3:19 ` [tarantool-patches] " Alexander Turenko 2018-12-26 15:56 ` Roman 2018-12-29 10:30 ` Vladislav Shpilevoy 2019-01-09 13:29 ` Roman 2019-01-24 14:54 ` Roman 2019-01-29 19:44 ` Vladislav Shpilevoy 2019-01-29 20:32 ` Alexander Turenko 2019-01-31 23:47 ` Roman 2019-02-05 11:42 ` Vladislav Shpilevoy 2019-02-11 23:24 ` Roman 2019-02-15 21:17 ` Vladislav Shpilevoy 2019-02-19 10:49 ` Roman 2019-02-22 16:01 ` Vladislav Shpilevoy [this message] 2019-02-23 21:38 ` Roman Khabibov 2019-02-23 22:43 ` Roman Khabibov 2019-02-25 13:04 ` Vladislav Shpilevoy 2019-02-25 14:51 ` Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=dccea1b7-4f6f-78f7-446e-9ccf69b48fce@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=roman.habibov@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='[tarantool-patches] Re: [PATCH] httpc: add checking of headers in httpc:request' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox