File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -205,7 +205,8 @@ bool ProcessFactory::finish(SendData *resp) {
205
205
resp->info .len ,
206
206
session_id);
207
207
return false ;
208
- } else if (conn->overflow ) {
208
+ } else if (conn->overflow &&
209
+ (resp->info .type == SW_SERVER_EVENT_SEND_DATA && resp->info .type == SW_SERVER_EVENT_SEND_FILE)) {
209
210
if (server_->send_yield && process_is_supported_send_yield (server_, conn)) {
210
211
swoole_set_last_error (SW_ERROR_OUTPUT_SEND_YIELD);
211
212
} else {
Original file line number Diff line number Diff line change @@ -1055,8 +1055,7 @@ void Server::start_heartbeat_thread() {
1055
1055
ev.type = SW_SERVER_EVENT_CLOSE_FORCE;
1056
1056
// convert fd to session_id, in order to verify the connection before the force close connection
1057
1057
ev.fd = session_id;
1058
- Socket *_pipe_sock = get_reactor_pipe_socket (session_id, conn->reactor_id );
1059
- _pipe_sock->send_blocking ((void *) &ev, sizeof (ev));
1058
+ get_reactor_pipe_socket (session_id, conn->reactor_id )->send_blocking (&ev, sizeof (ev));
1060
1059
});
1061
1060
sleep (heartbeat_check_interval);
1062
1061
}
You can’t perform that action at this time.
0 commit comments