urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-05 02:57:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #976 from joemfb/http-idempotent-resp

Browse Source 
makes http response %thou effectively idempotent
This commit is contained in:
Joe Bryan 2018-05-07 18:55:50 -07:00 committed by GitHub
commit b4df1bca18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/vere/vere.h
View File

@ -36,11 +36,20 @@
c3_y hun_y[0]; c3_y hun_y[0];
} u3_hbod; } u3_hbod;
/* u3_rsat: http request state.
*/
typedef enum {
u3_rsat_init = 0, // initialized
u3_rsat_plan = 1, // planned
u3_rsat_ripe = 2 // responded
} u3_rsat;
/* u3_hreq: incoming http request. /* u3_hreq: incoming http request.
*/ */
typedef struct _u3_hreq { typedef struct _u3_hreq {
h2o_req_t* rec_u; // h2o request h2o_req_t* rec_u; // h2o request
c3_w seq_l; // sequence within connection c3_w seq_l; // sequence within connection
u3_rsat sat_e; // request state
struct _u3_hcon* hon_u; // connection backlink struct _u3_hcon* hon_u; // connection backlink
struct _u3_hreq* nex_u; // next in connection's list struct _u3_hreq* nex_u; // next in connection's list
} u3_hreq; } u3_hreq;

14
vere/http.c
View File

@ -232,6 +232,7 @@ _http_req_new(u3_hcon* hon_u, h2o_req_t* rec_u)
{ {
u3_hreq* req_u = c3_malloc(sizeof(*req_u)); u3_hreq* req_u = c3_malloc(sizeof(*req_u));
req_u->rec_u = rec_u; req_u->rec_u = rec_u;
req_u->sat_e = u3_rsat_init;
_http_req_link(hon_u, req_u); _http_req_link(hon_u, req_u);
return req_u; return req_u;
@ -263,6 +264,9 @@ _http_req_kill(u3_hreq* req_u)
static void static void
_http_req_dispatch(u3_hreq* req_u, u3_noun req) _http_req_dispatch(u3_hreq* req_u, u3_noun req)
{ {
c3_assert(u3_rsat_init == req_u->sat_e);
req_u->sat_e = u3_rsat_plan;
u3_noun pox = _http_req_to_duct(req_u); u3_noun pox = _http_req_to_duct(req_u);
u3_noun typ = _(req_u->hon_u->htp_u->lop) ? c3__chis : c3__this; u3_noun typ = _(req_u->hon_u->htp_u->lop) ? c3__chis : c3__this;
@ -295,6 +299,16 @@ _http_hgen_dispose(void* ptr_v)
static void static void
_http_req_respond(u3_hreq* req_u, u3_noun sas, u3_noun hed, u3_noun bod) _http_req_respond(u3_hreq* req_u, u3_noun sas, u3_noun hed, u3_noun bod)
{ {
// XX ideally
//c3_assert(u3_rsat_plan == req_u->sat_e);
if ( u3_rsat_plan != req_u->sat_e ) {
//uL(fprintf(uH, "duplicate response\n"));
return;
}
req_u->sat_e = u3_rsat_ripe;
h2o_req_t* rec_u = req_u->rec_u; h2o_req_t* rec_u = req_u->rec_u;
rec_u->res.status = sas; rec_u->res.status = sas;