generic-sessions update

Generic sessions has been overdue some love to align it with
the progress in the rest of lws.

1) Strict Content Security Policy
2) http2 compatibility
3) fixes and additions for use in a separate process via unix domain socket
4) work on ws and http proxying in lws
5) add minimal example

1 files changed, 25 insertions, 17 deletions

diff --git a/lib/roles/h1/ops-h1.c b/lib/roles/h1/ops-h1.c
index 19860b53..ad8a0baf 100644
--- a/lib/roles/h1/ops-h1.c
+++ b/lib/roles/h1/ops-h1.c
@@ -116,7 +116,7 @@ lws_read_h1(struct lws *wsi, unsigned char *buf, lws_filepos_t len)
 
 	case LRS_BODY:
 http_postbody:
-		lwsl_notice("%s: http post body: remain %d\n", __func__,
+		lwsl_debug("%s: http post body: remain %d\n", __func__,
 			    (int)wsi->http.rx_content_remain);
 
 		if (!wsi->http.rx_content_remain)
@@ -659,27 +659,35 @@ rops_handle_POLLOUT_h1(struct lws *wsi)
 	if (lwsi_state(wsi) == LRS_ISSUE_HTTP_BODY) {
 #if defined(LWS_WITH_HTTP_PROXY)
 		if (wsi->http.proxy_clientside) {
-			unsigned char *buf;
+			unsigned char *buf, prebuf[LWS_PRE + 1024];
 			size_t len = lws_buflist_next_segment_len(
 					&wsi->parent->http.buflist_post_body, &buf);
 			int n;
 
-			lwsl_debug("%s: %p: proxying body %d %d %d %d %d\n",
-					__func__, wsi, (int)len,
-					(int)wsi->http.tx_content_length,
-					(int)wsi->http.tx_content_remain,
-					(int)wsi->http.rx_content_length,
-					(int)wsi->http.rx_content_remain
-					);
-
-			n = lws_write(wsi, buf, len, LWS_WRITE_HTTP);
-			if (n < 0) {
-				lwsl_err("%s: PROXY_BODY: write failed\n",
-					 __func__);
-				return -1;
-			}
+			if (len) {
+
+				if (len > sizeof(prebuf) - LWS_PRE)
+					len = sizeof(prebuf) - LWS_PRE;
+
+				memcpy(prebuf + LWS_PRE, buf, len);
 
-			lws_buflist_use_segment(&wsi->parent->http.buflist_post_body, len);
+				lwsl_debug("%s: %p: proxying body %d %d %d %d %d\n",
+						__func__, wsi, (int)len,
+						(int)wsi->http.tx_content_length,
+						(int)wsi->http.tx_content_remain,
+						(int)wsi->http.rx_content_length,
+						(int)wsi->http.rx_content_remain
+						);
+
+				n = lws_write(wsi, prebuf + LWS_PRE, len, LWS_WRITE_HTTP);
+				if (n < 0) {
+					lwsl_err("%s: PROXY_BODY: write %d failed\n",
+						 __func__, (int)len);
+					return LWS_HP_RET_BAIL_DIE;
+				}
+
+				lws_buflist_use_segment(&wsi->parent->http.buflist_post_body, len);
+			}
 
 			if (wsi->parent->http.buflist_post_body)
 				lws_callback_on_writable(wsi);