summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
1fca4b9)
The commit
0ebdff94d461abd4328cf45a6281c15139a045eb of
libmicrohttpd fixed a bug but introduced a double free
of hreq resource attached to the connection. That commit
is between versions 0.9.59 and 0.9.60 of libmicrohttpd.
Now, hreq is freed in 'end_handler' of afb-hsrv.c
Change-Id: Ia865d65c5f9ef5ce787eb6545802ac8ea37ae468
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
/* global variables */
static struct afb_wsj1 *wsj1;
static struct afb_proto_ws *pws;
/* global variables */
static struct afb_wsj1 *wsj1;
static struct afb_proto_ws *pws;
static int exonrep;
static int callcount;
static int human;
static int exonrep;
static int callcount;
static int human;
{
char *name = strrchr(arg0, '/');
name = name ? name + 1 : arg0;
{
char *name = strrchr(arg0, '/');
name = name ? name + 1 : arg0;
- fprintf(status ? stderr : stdout, "usage: %s [-H [-r]] uri [api verb [data]]\n", name);
- fprintf(status ? stderr : stdout, " %s -d [-H [-r]] uri [verb [data]]\n", name);
+ fprintf(status ? stderr : stdout, "usage: %s [-H [-r]] [-b] uri [api verb [data]]\n", name);
+ fprintf(status ? stderr : stdout, " %s -d [-H [-r]] [-b] uri [verb [data]]\n", name);
else if (!strcmp(av[1], "--direct")) /* request for direct api */
direct = 1;
else if (!strcmp(av[1], "--direct")) /* request for direct api */
direct = 1;
+ else if (!strcmp(av[1], "--break")) /* request to break connection */
+ breakcon = 1;
+
/* emit usage and exit */
else
usage(!!strcmp(av[1], "--help"), a0);
/* emit usage and exit */
else
usage(!!strcmp(av[1], "--help"), a0);
case 'H': human = 1; break;
case 'r': raw = 1; break;
case 'd': direct = 1; break;
case 'H': human = 1; break;
case 'r': raw = 1; break;
case 'd': direct = 1; break;
+ case 'b': breakcon = 1; break;
default: usage(av[1][rc] != 'h', a0);
}
}
default: usage(av[1][rc] != 'h', a0);
}
}
wsj1_event(verb, object);
else
wsj1_call(api, verb, object);
wsj1_event(verb, object);
else
wsj1_call(api, verb, object);
+ if (breakcon)
+ exit(0);
}
/* called when something happens on stdin */
}
/* called when something happens on stdin */
fprintf(stderr, "calling %s(%s) failed: %m\n", verb, object?:"");
dec_callcount();
}
fprintf(stderr, "calling %s(%s) failed: %m\n", verb, object?:"");
dec_callcount();
}
+ if (breakcon)
+ exit(0);
}
/* called when pws hangsup */
}
/* called when pws hangsup */
close_websocket(urh);
}
}
close_websocket(urh);
}
}
+#if MHD_VERSION <= 0x00095900
afb_hreq_unref(memo->hreq);
afb_hreq_unref(memo->hreq);