walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

libevent-client: Fix bug that path is broken if URI does not contain path part

This commit is contained in:
Tatsuhiro Tsujikawa 2015-06-01 00:22:35 +09:00
parent ee4d53a9e4
commit 0cb4750e3c
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/libevent-client.c
View File

@ -100,7 +100,8 @@ static http2_stream_data *create_http2_stream_data(const char *uri,
":%u", u->port); ":%u", u->port);
} }
stream_data->pathlen = 0; /* If we don't have path in URI, we use "/" as path. */
stream_data->pathlen = 1;
if (u->field_set & (1 << UF_PATH)) { if (u->field_set & (1 << UF_PATH)) {
stream_data->pathlen = u->field_data[UF_PATH].len; stream_data->pathlen = u->field_data[UF_PATH].len;
} }
@ -108,19 +109,22 @@ static http2_stream_data *create_http2_stream_data(const char *uri,
/* +1 for '?' character */ /* +1 for '?' character */
stream_data->pathlen += u->field_data[UF_QUERY].len + 1; stream_data->pathlen += u->field_data[UF_QUERY].len + 1;
} }
if (stream_data->pathlen > 0) {
stream_data->path = malloc(stream_data->pathlen); stream_data->path = malloc(stream_data->pathlen);
if (u->field_set & (1 << UF_PATH)) { if (u->field_set & (1 << UF_PATH)) {
memcpy(stream_data->path, &uri[u->field_data[UF_PATH].off], memcpy(stream_data->path, &uri[u->field_data[UF_PATH].off],
u->field_data[UF_PATH].len); u->field_data[UF_PATH].len);
} else {
stream_data->path[0] = '/';
} }
if (u->field_set & (1 << UF_QUERY)) { if (u->field_set & (1 << UF_QUERY)) {
memcpy(stream_data->path + u->field_data[UF_PATH].len + 1, stream_data->path[stream_data->pathlen - u->field_data[UF_QUERY].len - 1] =
'?';
memcpy(stream_data->path + stream_data->pathlen -
u->field_data[UF_QUERY].len,
&uri[u->field_data[UF_QUERY].off], u->field_data[UF_QUERY].len); &uri[u->field_data[UF_QUERY].off], u->field_data[UF_QUERY].len);
} }
} else {
stream_data->path = NULL;
}
return stream_data; return stream_data;
} }