agoo 2.9.0 → 2.10.0

data/ext/agoo/text.c

@@ -44,12 +44,13 @@ json_size(const char *str, size_t len) {
 
 agooText
 agoo_text_create(const char *str, int len) {
-    agooText	t = (agooText)AGOO_MALLOC(sizeof(struct _agooText) - AGOO_TEXT_MIN_SIZE + len + 1);
+    size_t	alen = (AGOO_TEXT_MIN_SIZE <= len) ? len : AGOO_TEXT_MIN_SIZE;
+    agooText	t = (agooText)AGOO_MALLOC(sizeof(struct _agooText) + alen + 1);
 
     if (NULL != t) {
 	t->next = NULL;
 	t->len = len;
-	t->alen = len;
+	t->alen = alen;
 	t->bin = false;
 	atomic_init(&t->ref_cnt, 0);
 	memcpy(t->text, str, len);
@@ -77,12 +78,13 @@ agoo_text_dup(agooText t0) {
 
 agooText
 agoo_text_allocate(int len) {
-    agooText	t = (agooText)AGOO_MALLOC(sizeof(struct _agooText) - AGOO_TEXT_MIN_SIZE + len + 1);
+    size_t	alen = (AGOO_TEXT_MIN_SIZE <= len) ? len : AGOO_TEXT_MIN_SIZE;
+    agooText	t = (agooText)AGOO_MALLOC(sizeof(struct _agooText) + alen + 1);
 
     if (NULL != t) {
 	t->next = NULL;
 	t->len = 0;
-	t->alen = len;
+	t->alen = alen;
 	t->bin = false;
 	atomic_init(&t->ref_cnt, 0);
 	*t->text = '\0';

data/ext/agoo/websocket.c

@@ -28,7 +28,7 @@ agooText
 agoo_ws_add_headers(agooReq req, agooText t) {
     int		klen = 0;
     const char	*key;
-    
+
     t = agoo_text_append(t, up_con, sizeof(up_con) - 1);
     if (NULL != (key = agoo_con_header_value(req->header.start, req->header.len, "Sec-WebSocket-Key", &klen)) &&
 	klen + sizeof(ws_magic) < MAX_KEY_LEN) {
@@ -84,7 +84,7 @@ agoo_ws_decode(char *buf, size_t mlen) {
     bool	is_masked;
     uint8_t	*payload;
     uint64_t	plen;
-    
+
     b++; // op
     is_masked = 0x80 & *b;
     plen = 0x7F & *b;
@@ -105,7 +105,7 @@ agoo_ws_decode(char *buf, size_t mlen) {
     if (is_masked) {
 	uint8_t		mask[4];
 	uint64_t	i;
-	
+
 	for (i = 0; i < 4; i++, b++) {
 	    mask[i] = *b;
 	}
@@ -167,7 +167,7 @@ agoo_ws_calc_len(agooCon c, uint8_t *buf, size_t cnt) {
 bool
 agoo_ws_create_req(agooCon c, long mlen) {
     uint8_t	op = 0x0F & *c->buf;
-    
+
     if (NULL == (c->req = agoo_req_create(mlen))) {
 	agoo_log_cat(&agoo_error_cat, "Out of memory attempting to allocate request.");
 	return true;
@@ -200,7 +200,7 @@ void
 agoo_ws_req_close(agooCon c) {
     if (NULL != c->up && agoo_server.ctx_nil_value != c->up->ctx && c->up->on_close) {
 	agooReq	req = agoo_req_create(0);
-	    
+
 	req->up = c->up;
 	req->method = AGOO_ON_CLOSE;
 	req->hook = agoo_hook_create(AGOO_NONE, NULL, c->up->ctx, PUSH_HOOK, &agoo_server.eval_queue);
@@ -212,37 +212,27 @@ agoo_ws_req_close(agooCon c) {
 void
 agoo_ws_ping(agooCon c) {
     agooRes	res;
-    
+
     if (NULL == (res = agoo_res_create(c))) {
 	agoo_log_cat(&agoo_error_cat, "Memory allocation of response failed on connection %llu.", (unsigned long long)c->id);
     } else {
-	if (NULL == c->res_tail) {
-	    c->res_head = res;
-	} else {
-	    c->res_tail->next = res;
-	}
-	c->res_tail = res;
 	res->close = false;
 	res->con_kind = AGOO_CON_WS;
 	res->ping = true;
+	agoo_con_res_append(c, res);
     }
 }
 
 void
 agoo_ws_pong(agooCon c) {
     agooRes	res;
-    
+
     if (NULL == (res = agoo_res_create(c))) {
 	agoo_log_cat(&agoo_error_cat, "Memory allocation of response failed on connection %llu.", (unsigned long long)c->id);
     } else {
-	if (NULL == c->res_tail) {
-	    c->res_head = res;
-	} else {
-	    c->res_tail->next = res;
-	}
-	c->res_tail = res;
 	res->close = false;
 	res->con_kind = AGOO_CON_WS;
 	res->pong = true;
+	agoo_con_res_append(c, res);
     }
 }

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.9.0'
+  VERSION = '2.10.0'
 end

data/test/rack_handler_test.rb

@@ -24,7 +24,11 @@ class RackHandlerTest < Minitest::Test
     def call(req)
       if 'GET' == req['REQUEST_METHOD']
 	[ 200,
-	  { 'Content-Type' => 'application/json' },
+	  { 'Content-Type' => 'application/json',
+	    'Set-Cookie' => %|favorite=chocolate
+size=big
+|
+	  },
 	  [ Oj.dump(req.to_h, mode: :null) ]
 	]
       elsif 'POST' == req['REQUEST_METHOD']
@@ -90,6 +94,7 @@ class RackHandlerTest < Minitest::Test
     res = Net::HTTP.start(uri.hostname, uri.port) { |h|
       h.request(req)
     }
+    assert_equal('favorite=chocolate, size=big', res['set-cookie'])
     content = res.body
     obj = Oj.load(content, mode: :strict)
     expect = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -78,6 +78,8 @@ files:
 - ext/agoo/gqlintro.h
 - ext/agoo/gqljson.c
 - ext/agoo/gqljson.h
+- ext/agoo/gqlsub.c
+- ext/agoo/gqlsub.h
 - ext/agoo/gqlvalue.c
 - ext/agoo/gqlvalue.h
 - ext/agoo/graphql.c