Skip to content

new HTTP API bugfixes #4882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 14, 2017
Merged

new HTTP API bugfixes #4882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a360449
net: http: dont add CRLF to protocol
mike-scott Nov 9, 2017
0380bd2
net: http: honor CONFIG_HTTP_CLIENT_NETWORK_TIMEOUT setting
mike-scott Nov 10, 2017
4e946d2
net: http: client: remove payload send_chunk logic
mike-scott Nov 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/net/http_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ static inline int http_client_send_get_req(struct http_ctx *http_ctx,
.method = HTTP_GET,
.url = url,
.host = host,
.protocol = " " HTTP_PROTOCOL HTTP_CRLF,
.protocol = " " HTTP_PROTOCOL,
.header_fields = extra_header_fields,
};

Expand Down
4 changes: 2 additions & 2 deletions samples/net/http_client/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ static int do_sync_http_req(struct http_ctx *ctx,

req.method = method;
req.url = url;
req.protocol = " " HTTP_PROTOCOL HTTP_CRLF;
req.protocol = " " HTTP_PROTOCOL;

NET_INFO("[%d] Send %s", count, url);

Expand Down Expand Up @@ -295,7 +295,7 @@ static int do_async_http_req(struct http_ctx *ctx,

req.method = method;
req.url = url;
req.protocol = " " HTTP_PROTOCOL HTTP_CRLF;
req.protocol = " " HTTP_PROTOCOL;

k_sem_init(&waiter.wait, 0, 1);

Expand Down
23 changes: 9 additions & 14 deletions subsys/net/lib/http/http_app_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
#define HTTP_CONTENT_LEN "Content-Length"
#define HTTP_CONT_LEN_SIZE 6

/* Default network activity timeout in seconds */
#define HTTP_NETWORK_TIMEOUT K_SECONDS(CONFIG_HTTP_CLIENT_NETWORK_TIMEOUT)

int client_reset(struct http_ctx *ctx)
{
http_parser_init(&ctx->http.parser, HTTP_RESPONSE);
Expand Down Expand Up @@ -120,7 +123,6 @@ int http_request(struct http_ctx *ctx, struct http_request *req, s32_t timeout,

if (req->payload && req->payload_size) {
char content_len_str[HTTP_CONT_LEN_SIZE];
int i;

ret = snprintk(content_len_str, HTTP_CONT_LEN_SIZE,
"%u", req->payload_size);
Expand All @@ -140,17 +142,10 @@ int http_request(struct http_ctx *ctx, struct http_request *req, s32_t timeout,
goto out;
}

for (i = 0; i < req->payload_size;) {
ret = http_send_chunk(ctx,
req->payload + i,
req->payload_size - i,
user_data);
if (ret < 0) {
NET_ERR("Cannot send data to peer (%d)", ret);
return ret;
}

i += ret;
ret = http_prepare_and_send(ctx, req->payload,
req->payload_size, user_data);
if (ret < 0) {
goto out;
}
} else {
ret = http_add_header(ctx, HTTP_EOF, user_data);
Expand Down Expand Up @@ -235,7 +230,7 @@ int http_client_send_req(struct http_ctx *ctx,

ctx->http.rsp.cb = cb;

ret = net_app_connect(&ctx->app_ctx, timeout);
ret = net_app_connect(&ctx->app_ctx, HTTP_NETWORK_TIMEOUT);
if (ret < 0) {
NET_DBG("Cannot connect to server (%d)", ret);
return ret;
Expand All @@ -244,7 +239,7 @@ int http_client_send_req(struct http_ctx *ctx,
/* We might wait longer than timeout if the first connection
* establishment takes long time (like with HTTPS)
*/
if (k_sem_take(&ctx->http.connect_wait, timeout)) {
if (k_sem_take(&ctx->http.connect_wait, HTTP_NETWORK_TIMEOUT)) {
NET_DBG("Connection timed out");
ret = -ETIMEDOUT;
goto out;
Expand Down