nghttp2/nghttp2
1
0
Fork 0
mirror of https://github.com/nghttp2/nghttp2.git synced 2025-12-06 18:18:52 +08:00
Code Issues Projects Releases Wiki Activity

Remove nghttp2_submit_* API functions which has char **nv parameter

Browse Source 
The nghttp2_submit_{request,response}2 functions are renamed as
nghttp2_submit_{request, response}.
This commit is contained in:
Tatsuhiro Tsujikawa
2013-12-08 21:19:33 +09:00
parent d6212a6055
commit 6c77cec270
16 changed files with 315 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
examples/client.c
View File

@@ -51,6 +51,14 @@ enum {
WANT_WRITE
};
#define MAKE_NV(NAME, VALUE) \
{(uint8_t*)NAME, (uint8_t*)VALUE, \
(uint16_t)(sizeof(NAME) - 1), (uint16_t)(sizeof(VALUE) - 1) }
#define MAKE_NV_CS(NAME, VALUE) \
{(uint8_t*)NAME, (uint8_t*)VALUE, \
(uint16_t)(sizeof(NAME) - 1), (uint16_t)(strlen(VALUE)) }
struct Connection {
SSL *ssl;
nghttp2_session *session;
@@ -515,16 +523,17 @@ static void submit_request(struct Connection *connection, struct Request *req)
{
int pri = 0;
int rv;
const char *nv[13];
/* Make sure that the last item is NULL */
nv[0] = ":method"; nv[1] = "GET";
nv[2] = ":path"; nv[3] = req->path;
nv[4] = ":scheme"; nv[5] = "https";
nv[6] = ":host"; nv[7] = req->hostport;
nv[8] = "accept"; nv[9] = "*/*";
nv[10] = "user-agent"; nv[11] = "nghttp2/"NGHTTP2_VERSION;
nv[12] = NULL;
rv = nghttp2_submit_request(connection->session, pri, nv, NULL, req);
const nghttp2_nv nva[] = {
/* Make sure that the last item is NULL */
MAKE_NV(":method", "GET"),
MAKE_NV_CS(":path", req->path),
MAKE_NV(":scheme", "https"),
MAKE_NV_CS(":host", req->hostport),
MAKE_NV("accept", "*/*"),
MAKE_NV("user-agent", "nghttp2/"NGHTTP2_VERSION)
};
rv = nghttp2_submit_request(connection->session, pri,
nva, sizeof(nva)/sizeof(nva[0]), NULL, req);
if(rv != 0) {
diec("nghttp2_submit_request", rv);
}