cleanup zombie code left after removing vectors for request buf

master
emil 3 years ago
parent 2c76926e83
commit 2caf4de75a

@ -345,7 +345,7 @@ http_session_log_malformed_request(struct http_session *session)
/** /**
* Receive and Parse the Request for the current sandbox * Receive and Parse the Request for the current sandbox
* @return 0 if message parsing complete, -1 on error, -ENOMEM if buffers run out of space, -3 EAGAIN if would block * @return 0 if message parsing complete, -1 on error, -EAGAIN if would block
*/ */
static inline int static inline int
http_session_receive_request(struct http_session *session, void_star_cb on_eagain) http_session_receive_request(struct http_session *session, void_star_cb on_eagain)
@ -401,10 +401,6 @@ done:
err_eagain: err_eagain:
rc = -EAGAIN; rc = -EAGAIN;
goto done; goto done;
err_nobufs:
http_session_log_malformed_request(session);
rc = -ENOMEM;
goto done;
err: err:
http_session_log_malformed_request(session); http_session_log_malformed_request(session);
rc = -1; rc = -1;

@ -199,13 +199,6 @@ on_client_request_receiving(struct http_session *session)
} else if (unlikely(rc == -EAGAIN)) { } else if (unlikely(rc == -EAGAIN)) {
/* session blocked and registered to epoll so continue to next handle */ /* session blocked and registered to epoll so continue to next handle */
return; return;
} else if (unlikely(rc == -ENOMEM)) {
/* Failed to grow request buffer */
debuglog("Failed to grow http request buffer\n");
session->state = HTTP_SESSION_EXECUTION_COMPLETE;
http_session_set_response_header(session, 500);
on_client_response_header_sending(session);
return;
} else if (rc < 0) { } else if (rc < 0) {
debuglog("Failed to receive or parse request\n"); debuglog("Failed to receive or parse request\n");
session->state = HTTP_SESSION_EXECUTION_COMPLETE; session->state = HTTP_SESSION_EXECUTION_COMPLETE;

@ -21,7 +21,7 @@ static inline void
sandbox_log_allocation(struct sandbox *sandbox) sandbox_log_allocation(struct sandbox *sandbox)
{ {
#ifdef LOG_SANDBOX_ALLOCATION #ifdef LOG_SANDBOX_ALLOCATION
debuglog("Sandbox %lu: of %s:%d\n", sandbox->id, sandbox->module->name, sandbox->module->port); debuglog("Sandbox %lu: of %s %s\n", sandbox->id, sandbox->tenant->name, sandbox->route->route);
#endif #endif
} }

Loading…
Cancel
Save