stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

adopt: LWS_SERVER_OPTION_ONLY_RAW to indicate a vhost only serves raw

Browse source
This commit is contained in:
Andy Green 2017-04-06 07:57:45 +08:00
parent a7326fc8b5
commit 6cae994750
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libwebsockets.h
View file

@ -1696,6 +1696,10 @@ enum lws_context_options {
/**< (VH) if invalid http is coming in the first line, */
LWS_SERVER_OPTION_LIBEVENT = (1 << 21),
/**< (CTX) Use libevent event loop */
LWS_SERVER_OPTION_ONLY_RAW = (1 << 22),
/**< (VH) All connections to this vhost / port are RAW as soon as
* the connection is accepted, no HTTP is going to be coming.
*/
/****** add new things just above ---^ ******/
};

9
lib/server.c
View file

@ -2018,6 +2018,8 @@ lws_server_socket_service(struct lws_context *context, struct lws *wsi,
struct lws_context_per_thread *pt = &context->pt[(int)wsi->tsi];
lws_sockfd_type accept_fd = LWS_SOCK_INVALID;
struct allocated_headers *ah;
lws_sock_file_fd_type fd;
int opts = LWS_ADOPT_SOCKET | LWS_ADOPT_ALLOW_SSL;
#if LWS_POSIX
struct sockaddr_in cli_addr;
socklen_t clilen;
@ -2301,7 +2303,12 @@ try_pollout:
break;
}
if (!lws_adopt_socket_vhost(wsi->vhost, accept_fd))
if (!(wsi->vhost->options & LWS_SERVER_OPTION_ONLY_RAW))
opts |= LWS_ADOPT_HTTP;
fd.sockfd = accept_fd;
if (!lws_adopt_descriptor_vhost(wsi->vhost, opts, fd,
NULL, NULL))
/* already closed cleanly as necessary */
return 1;