Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libwebsockets
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Fork
libwebsockets
Commits
5f74010e
Commit
5f74010e
authored
7 years ago
by
Andy Green
Browse files
Options
Downloads
Patches
Plain Diff
service: only apply trunc holds rx rule for http2
parent
d2ec3295
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/service.c
+18
-12
18 additions, 12 deletions
lib/service.c
with
18 additions
and
12 deletions
lib/service.c
+
18
−
12
View file @
5f74010e
...
@@ -528,10 +528,15 @@ next_child:
...
@@ -528,10 +528,15 @@ next_child:
notify:
notify:
#endif
#endif
wsi
->
handling_pollout
=
0
;
wsi
->
leave_pollout_active
=
0
;
wsi
->
leave_pollout_active
=
0
;
return
lws_calllback_as_writeable
(
wsi
);
n
=
lws_calllback_as_writeable
(
wsi
);
wsi
->
handling_pollout
=
0
;
if
(
wsi
->
leave_pollout_active
)
lws_change_pollfd
(
wsi
,
0
,
LWS_POLLOUT
);
return
n
;
/*
/*
* since these don't disable the POLLOUT, they are always doing the
* since these don't disable the POLLOUT, they are always doing the
...
@@ -1343,14 +1348,16 @@ lws_service_fd_tsi(struct lws_context *context, struct lws_pollfd *pollfd, int t
...
@@ -1343,14 +1348,16 @@ lws_service_fd_tsi(struct lws_context *context, struct lws_pollfd *pollfd, int t
break
;
break
;
#if defined(LWS_WITH_HTTP2)
#if defined(LWS_WITH_HTTP2)
wsi1
=
lws_get_network_wsi
(
wsi
);
if
(
wsi
->
http2_substream
||
wsi
->
upgraded_to_http2
)
{
if
(
wsi1
&&
wsi1
->
trunc_len
)
wsi1
=
lws_get_network_wsi
(
wsi
);
/* We cannot deal with any kind of new RX
if
(
wsi1
&&
wsi1
->
trunc_len
)
* because we are dealing with a partial send
/* We cannot deal with any kind of new RX
* (new RX may trigger new http_action() that expect
* because we are dealing with a partial send
* to be able to send)
* (new RX may trigger new http_action() that
*/
* expect to be able to send)
break
;
*/
break
;
}
#endif
#endif
/* 2: RX Extension needs to be drained
/* 2: RX Extension needs to be drained
...
@@ -1386,8 +1393,7 @@ lws_service_fd_tsi(struct lws_context *context, struct lws_pollfd *pollfd, int t
...
@@ -1386,8 +1393,7 @@ lws_service_fd_tsi(struct lws_context *context, struct lws_pollfd *pollfd, int t
if
(
wsi
->
rxflow_buffer
)
{
if
(
wsi
->
rxflow_buffer
)
{
lwsl_info
(
"draining rxflow (len %d)
\n
"
,
lwsl_info
(
"draining rxflow (len %d)
\n
"
,
wsi
->
rxflow_len
-
wsi
->
rxflow_pos
wsi
->
rxflow_len
-
wsi
->
rxflow_pos
);
);
assert
(
wsi
->
rxflow_pos
<
wsi
->
rxflow_len
);
assert
(
wsi
->
rxflow_pos
<
wsi
->
rxflow_len
);
/* well, drain it */
/* well, drain it */
eff_buf
.
token
=
(
char
*
)
wsi
->
rxflow_buffer
+
eff_buf
.
token
=
(
char
*
)
wsi
->
rxflow_buffer
+
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment