mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-01-31 11:37:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Accept table arg in redbean Fetch() API (#218)

Browse source
This commit is contained in:
Paul Kulchenko 2021-07-28 09:33:10 -07:00 committed by GitHub
parent a73e808b25
commit 0b317523a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/http/gethttpmethod.c
View file

@ -20,10 +20,14 @@
#include "net/http/http.h" #include "net/http/http.h"
/** /**
* Returns small number for HTTP method, or 0 if not found. * Converts HTTP method string into internal index
*
* @param len if -1 implies strlen
* @return small number for HTTP method, or 0 if not found.
*/ */
int GetHttpMethod(const char *str, size_t len) { int GetHttpMethod(const char *str, size_t len) {
const struct HttpMethodSlot *slot; const struct HttpMethodSlot *slot;
if (len == -1) len = str ? strlen(str) : 0;
if ((slot = LookupHttpMethod(str, len))) { if ((slot = LookupHttpMethod(str, len))) {
return slot->code; return slot->code;
} else { } else {

41
tool/net/redbean.c
View file

@ -3686,33 +3686,48 @@ static int LuaFetch(lua_State *L) {
bool usessl; bool usessl;
uint32_t ip; uint32_t ip;
struct Url url; struct Url url;
int t, ret, sock, method; int t, ret, sock, methodidx;
char *host, *port; char *host, *port;
struct TlsBio *bio; struct TlsBio *bio;
struct Buffer inbuf; struct Buffer inbuf;
struct addrinfo *addr; struct addrinfo *addr;
struct HttpMessage msg; struct HttpMessage msg;
struct HttpUnchunker u; struct HttpUnchunker u;
const char *urlarg, *request, *body; const char *urlarg, *request, *body, *method;
size_t urlarglen, requestlen; char *conlenhdr = "";
size_t g, i, n, hdrsize, paylen; size_t urlarglen, requestlen, paylen, bodylen;
size_t g, i, n, hdrsize;
struct addrinfo hints = {.ai_family = AF_INET, struct addrinfo hints = {.ai_family = AF_INET,
.ai_socktype = SOCK_STREAM, .ai_socktype = SOCK_STREAM,
.ai_protocol = IPPROTO_TCP, .ai_protocol = IPPROTO_TCP,
.ai_flags = AI_NUMERICSERV}; .ai_flags = AI_NUMERICSERV};
/* /*
* Get args. * Get args: url [, body | {method = "PUT", body = "..."}]
*/ */
urlarg = luaL_checklstring(L, 1, &urlarglen); urlarg = luaL_checklstring(L, 1, &urlarglen);
if (lua_isnoneornil(L, 2)) { if (lua_istable(L, 2)) {
lua_settop(L, 2); // discard any extra arguments
lua_getfield(L, 2, "body");
body = luaL_optlstring(L, -1, "", &bodylen);
lua_getfield(L, 2, "method");
// use GET by default if no method is provided
method = strtoupper(luaL_optstring(L, -1, kHttpMethod[kHttpGet]));
lua_settop(L, 2); // drop all added elements to keep the stack balanced
} else if (lua_isnoneornil(L, 2)) {
body = ""; body = "";
method = kHttpGet; bodylen = 0;
method = kHttpMethod[kHttpGet];
} else { } else {
size_t bodylen;
body = luaL_checklstring(L, 2, &bodylen); body = luaL_checklstring(L, 2, &bodylen);
method = kHttpPost; method = kHttpMethod[kHttpPost];
} }
// provide Content-Length header unless it's zero and not expected
methodidx = GetHttpMethod(method, -1);
if (bodylen > 0 ||
!(methodidx == kHttpGet || methodidx == kHttpHead ||
methodidx == kHttpTrace || methodidx == kHttpDelete || methodidx == kHttpConnect))
conlenhdr = gc(xasprintf("Content-Length: %d\r\n", bodylen));
/* /*
* Parse URL. * Parse URL.
@ -3768,9 +3783,11 @@ static int LuaFetch(lua_State *L) {
"Host: %s:%s\r\n" "Host: %s:%s\r\n"
"Connection: close\r\n" "Connection: close\r\n"
"User-Agent: %s\r\n" "User-Agent: %s\r\n"
"%s"
"\r\n%s", "\r\n%s",
kHttpMethod[method], gc(EncodeUrl(&url, 0)), host, method, gc(EncodeUrl(&url, 0)),
port, brand, body)); host, port,
brand, conlenhdr, body));
requestlen = strlen(request); requestlen = strlen(request);
/* /*
@ -3831,7 +3848,7 @@ static int LuaFetch(lua_State *L) {
/* /*
* Send HTTP Message. * Send HTTP Message.
*/ */
DEBUGF("client sending %s request", kHttpMethod[method]); DEBUGF("client sending %s request", method);
if (usessl) { if (usessl) {
ret = mbedtls_ssl_write(&sslcli, request, requestlen); ret = mbedtls_ssl_write(&sslcli, request, requestlen);
if (ret != requestlen) { if (ret != requestlen) {