Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

http: pipelining: fixes from xenial sai

Browse source
This commit is contained in:
Andy Green 2020-04-15 19:16:29 +01:00
parent 63c8a23776
commit eca75ee14d
4 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/core-net/vhost.c
View file

@ -1424,6 +1424,10 @@ lws_get_vhost_by_name(struct lws_context *context, const char *name)
* *
* This was originally in the client code but since the list is held on the * This was originally in the client code but since the list is held on the
* vhost (to ensure the same client tls ctx is involved) it's cleaner in vhost.c * vhost (to ensure the same client tls ctx is involved) it's cleaner in vhost.c
*
* ACTIVE_CONNS_QUEUED: We're queued on an active connection, set *nwsi to that
* ACTIVE_CONNS_MUXED: We are joining an active mux conn *nwsi as a child
* ACTIVE_CONNS_SOLO: There's no existing conn to join either way
*/ */
int int

15
lib/roles/http/client/client-handshake.c
View file

@ -192,7 +192,8 @@ send_hs:
} else { } else {
lwsl_info("%s: wsi %p: %s %s client created own conn (raw %d) vh %sm st 0x%x\n", lwsl_info("%s: wsi %p: %s %s client created own conn (raw %d) vh %sm st 0x%x\n",
__func__, wsi, wsi->role_ops->name, __func__, wsi, wsi->role_ops->name,
wsi->protocol->name, rawish, wsi->vhost->name, lwsi_state(wsi)); wsi->protocol->name, rawish, wsi->vhost->name,
lwsi_state(wsi));
/* we are making our own connection */ /* we are making our own connection */
@ -231,9 +232,10 @@ send_hs:
} }
#endif #endif
if (!rawish) if (!rawish) {
if (lwsi_state(wsi) != LRS_H1C_ISSUE_HANDSHAKE2)
lwsi_set_state(wsi, LRS_H1C_ISSUE_HANDSHAKE); lwsi_set_state(wsi, LRS_H1C_ISSUE_HANDSHAKE);
else { } else {
/* for a method = "RAW" connection, this makes us /* for a method = "RAW" connection, this makes us
* established */ * established */
@ -848,6 +850,13 @@ lws_client_connect_2_dnsreq(struct lws *wsi)
return wsi; return wsi;
case ACTIVE_CONNS_QUEUED: case ACTIVE_CONNS_QUEUED:
if (lwsi_state(wsi) == LRS_UNCONNECTED) {
if (lwsi_role_h2(w))
lwsi_set_state(wsi, LRS_H2_WAITING_TO_SEND_HEADERS);
else
lwsi_set_state(wsi, LRS_H1C_ISSUE_HANDSHAKE2);
}
return lws_client_connect_4_established(wsi, w, 0); return lws_client_connect_4_established(wsi, w, 0);
} }

3
lib/roles/http/client/client-http.c
View file

@ -471,7 +471,8 @@ client_http_body_sent:
return lws_client_interpret_server_handshake(wsi); return lws_client_interpret_server_handshake(wsi);
bail3: bail3:
lwsl_info("closing conn at LWS_CONNMODE...SERVER_REPLY\n"); lwsl_info("%s: closing conn at LWS_CONNMODE...SERVER_REPLY, wsi %p, state 0x%x\n",
__func__, wsi, lwsi_state(wsi));
if (cce) if (cce)
lwsl_info("reason: %s\n", cce); lwsl_info("reason: %s\n", cce);
lws_inform_client_conn_fail(wsi, (void *)cce, strlen(cce)); lws_inform_client_conn_fail(wsi, (void *)cce, strlen(cce));

6
minimal-examples/http-client/minimal-http-client-multi/minimal-http-client-multi.c
View file

@ -44,7 +44,7 @@ static int completed, failed, numbered, stagger_idx, posting, count = COUNT;
static lws_sorted_usec_list_t sul_stagger; static lws_sorted_usec_list_t sul_stagger;
static struct lws_client_connect_info i; static struct lws_client_connect_info i;
static struct lws *client_wsi[COUNT]; static struct lws *client_wsi[COUNT];
static char urlpath[64]; static char urlpath[64], intr;
static struct lws_context *context; static struct lws_context *context;
/* we only need this for tracking POST emit state */ /* we only need this for tracking POST emit state */
@ -198,7 +198,7 @@ finished:
lwsl_user("Done: all OK\n"); lwsl_user("Done: all OK\n");
else else
lwsl_err("Done: failed: %d\n", failed); lwsl_err("Done: failed: %d\n", failed);
//interrupted = 1; intr = 1;
/* /*
* This is how we can exit the event loop even when it's an * This is how we can exit the event loop even when it's an
* event library backing it... it will start and stage the * event library backing it... it will start and stage the
@ -459,7 +459,7 @@ int main(int argc, const char **argv)
100 * LWS_US_PER_MS); 100 * LWS_US_PER_MS);
start = us(); start = us();
while (!lws_service(context, 0)) while (!intr && !lws_service(context, 0))
; ;
lwsl_user("Duration: %lldms\n", (us() - start) / 1000); lwsl_user("Duration: %lldms\n", (us() - start) / 1000);