agoo 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 877d87f4ad733eff5852199868bf95e03280c295a5a0e5c02a8c45863a8f1725
-  data.tar.gz: 6c27c6124b1fb7b8a21c8abb821984c5525129d3ef22d8f61288d1a01fb8ff03
+  metadata.gz: 017722eeae76195c26f2282976788f75f4104499603f00c3644383ea366071a5
+  data.tar.gz: e89000afbdc9a9727a68461b493b729977475b1f497811f35aa44d6910d62064
 SHA512:
-  metadata.gz: f4219cd58299df917205fcc340b4ce8f5b2dd0874b75c17006955a4bc87e1d4642903d98683f5cf8ffc302941a24b24c4c2933d862f1dd6449399d1120de4c03
-  data.tar.gz: a4221a53bf7ca5fa5f3364ba5cf2f72343153e1b1247220a4cc6de4aef735b6f6b30dd5a3f29e79a79103db719e1e505fd7e7a537ad9ee49dccb6608a3be24eb
+  metadata.gz: cf56a6b3e9bcdc8f35093f7a7119b2f07bf5b673986e97710918f62d002ba4d02b5de1fc75b1725cb663d14bb85ae7b2d538ffe2d285579052620b2a754f42db
+  data.tar.gz: 1f49fe3e014610b5c77ac96edf500dbf68fa2bf9678051e74c227246e2c9f054431479f4d599aee72eb0d74749e1cc5519fb4060a380b452be7a5ed0e7dcdd12

data/ext/agoo/con.c

@@ -76,7 +76,7 @@ con_header_value(const char *header, int hlen, const char *key, int *vlen) {
     return NULL;
 }
 
-static bool
+static long
 bad_request(Con c, int status, int line) {
     Res		res;
     const char *msg = http_code_message(status);
@@ -97,7 +97,7 @@ bad_request(Con c, int status, int line) {
 	res->close = true;
 	res_set_message(res, message);
     }
-    return true;
+    return -1;
 }
 
 static bool
@@ -111,8 +111,12 @@ should_close(const char *header, int hlen) {
     return false;
 }
 
-// Returns true if request has handled.
-static bool
+// Returns:
+//  0 - when header has not been read
+//  message length - when length can be determined
+//  -1 on a bad request
+//  negative of message length - when message is handled here.
+static long
 con_header_read(Con c) {
     Server	server = c->server;
     char	*hend = strstr(c->buf, "\r\n\r\n");
@@ -123,14 +127,14 @@ con_header_read(Con c) {
     char	*qend;
     char	*b;
     size_t	clen = 0;
-    size_t	mlen;
+    long	mlen;
     Hook	hook = NULL;
 
     if (NULL == hend) {
 	if (sizeof(c->buf) - 1 <= c->bcnt) {
 	    return bad_request(c, 431, __LINE__);
 	}
-	return false;
+	return 0;
     }
     if (server->req_cat.on) {
 	*hend = '\0';
@@ -222,6 +226,7 @@ con_header_read(Con c) {
     } else {
 	qend = b;
     }
+    mlen = hend - c->buf + 4 + clen;
     if (NULL == (hook = hook_find(server->hooks, method, path, pend))) {
 	if (GET == method) {
 	    struct _Err	err = ERR_INIT;
@@ -253,19 +258,23 @@ con_header_read(Con c) {
 	    text_ref(p->resp);
 	    res_set_message(res, p->resp);
 
-	    return true;
+	    return -mlen;
 	}
     }
 HOOKED:
     // Create request and populate.
-    mlen = hend - c->buf + 4 + clen;
     if (NULL == (c->req = (Req)malloc(mlen + sizeof(struct _Req) - 8 + 1))) {
 	return bad_request(c, 413, __LINE__);
     }
-    memcpy(c->req->msg, c->buf, c->bcnt);
-    if (c->bcnt < mlen) {
-	memset(c->req->msg + c->bcnt, 0, mlen - c->bcnt);
+    if ((long)c->bcnt <= mlen) {
+	memcpy(c->req->msg, c->buf, c->bcnt);
+	if ((long)c->bcnt < mlen) {
+	    memset(c->req->msg + c->bcnt, 0, mlen - c->bcnt);
+	}
+    } else {
+	memcpy(c->req->msg, c->buf, mlen);
     }
+    c->req->msg[mlen] = '\0';
     c->req->server = server;
     c->req->method = method;
     c->req->path.start = c->req->msg + (path - c->buf);
@@ -286,14 +295,14 @@ HOOKED:
 	c->req->handler = Qnil;
 	c->req->handler_type = NO_HOOK;
     }
-    return false;
+    return mlen;
 }
 
 // return true to remove/close connection
 static bool
 con_read(Con c) {
     ssize_t	cnt;
-
+    
     if (NULL != c->req) {
 	cnt = recv(c->sock, c->req->msg + c->bcnt, c->req->mlen - c->bcnt, 0);
     } else {
@@ -312,47 +321,61 @@ con_read(Con c) {
 	return true;
     }
     c->bcnt += cnt;
-    // Terminate with \0 for debug and strstr() check
-    if (NULL == c->req) {
-	c->buf[c->bcnt] = '\0';
-	if (con_header_read(c)) { // already handled
-	    c->bcnt = 0;
-	    *c->buf = '\0';
-	    // TBD handle extra data in buf
-
-	    return false;
+    while (true) {
+	if (NULL == c->req) {
+	    long	mlen;
+	    
+	    // Terminate with \0 for debug and strstr() check
+	    c->buf[c->bcnt] = '\0';
+	    if (0 > (mlen = con_header_read(c))) {
+		if (-mlen < (long)c->bcnt) {
+		    mlen = -mlen;
+		    memmove(c->buf, c->buf + mlen, c->bcnt - mlen);
+		    c->bcnt -= mlen;
+		} else {
+		    c->bcnt = 0;
+		    *c->buf = '\0';
+		    return false;
+		}
+		continue;
+	    }
 	}
-    }
-    if (NULL != c->req) {
-	c->req->msg[c->bcnt] = '\0';
-	if (c->req->mlen <= c->bcnt) {
-	    Res	res;
+	if (NULL != c->req) {
+	    if (c->req->mlen <= c->bcnt) {
+		Res	res;
 
-	    if (c->server->debug_cat.on && NULL != c->req && NULL != c->req->body.start) {
-		log_cat(&c->server->debug_cat, "request on %llu: %s", c->iid, c->req->body.start);
-	    }
-	    if (NULL == (res = res_create())) {
-		c->req = NULL;
-		log_cat(&c->server->error_cat, "memory allocation of response failed on connection %llu.", c->iid);
-		return bad_request(c, 500, __LINE__);
-	    } else {
-		if (NULL == c->res_tail) {
-		    c->res_head = res;
+		if (c->server->debug_cat.on && NULL != c->req && NULL != c->req->body.start) {
+		    log_cat(&c->server->debug_cat, "request on %llu: %s", c->iid, c->req->body.start);
+		}
+		if (NULL == (res = res_create())) {
+		    c->req = NULL;
+		    log_cat(&c->server->error_cat, "memory allocation of response failed on connection %llu.", c->iid);
+		    return bad_request(c, 500, __LINE__);
 		} else {
-		    c->res_tail->next = res;
+		    if (NULL == c->res_tail) {
+			c->res_head = res;
+		    } else {
+			c->res_tail->next = res;
+		    }
+		    c->res_tail = res;
+		    res->close = should_close(c->req->header.start, c->req->header.len);
 		}
-		c->res_tail = res;
-		res->close = should_close(c->req->header.start, c->req->header.len);
+		c->req->res = res;
+		queue_push(&c->server->eval_queue, (void*)c->req);
+		if (c->req->mlen < c->bcnt) {
+		    memmove(c->buf, c->buf + c->req->mlen, c->bcnt - c->req->mlen);
+		    c->bcnt -= c->req->mlen;
+		} else {
+		    c->bcnt = 0;
+		    *c->buf = '\0';
+		    c->req = NULL;
+		    break;
+		}
+		c->req = NULL;
+		continue;
 	    }
-	    c->req->res = res;
-	    queue_push(&c->server->eval_queue, (void*)c->req);
-	    c->req = NULL;
-	    c->bcnt = 0;
-	    *c->buf = '\0';
-	    // TBD handle extra data in buf
-
-	    return false;
 	}
+	break;
     }
     return false;
 }

data/ext/agoo/con.h

@@ -22,9 +22,7 @@ typedef struct _Con {
     char		buf[MAX_HEADER_SIZE];
     size_t		bcnt;
 
-    ssize_t		msize; // size of complete message
     ssize_t		mcnt;  // how much has been read so far
-
     ssize_t		wcnt;  // how much has been written
 
     Server		server;

data/ext/agoo/queue.c

@@ -1,10 +1,12 @@
 // Copyright 2015, 2016, 2018 by Peter Ohler, All Rights Reserved
 
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <unistd.h>
+#include <pthread.h>
 
 #include "dtime.h"
 #include "queue.h"

data/ext/agoo/server.c

@@ -208,6 +208,7 @@ server_new(int argc, VALUE *argv, VALUE self) {
     }
     queue_multi_init(&s->con_queue, 256, false, false);
     queue_multi_init(&s->eval_queue, 1024, false, true);
+
     cache_init(&s->pages);
     the_server = s;
     
@@ -512,7 +513,6 @@ handle_wab(void *x) {
 }
 static void
 handle_protected(Req req) {
-    
     switch (req->handler_type) {
     case BASE_HOOK:
 	rb_thread_call_with_gvl(handle_base, req);

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/test/base_handler_test.rb

@@ -44,7 +44,7 @@ class BaseHandlerTest < Minitest::Test
 
   def test_base_handler
     begin
-      server = Agoo::Server.new(6464, 'root',
+      server = Agoo::Server.new(6470, 'root',
 				pedantic: false,
 				log_dir: '',
 				thread_count: 1,
@@ -79,7 +79,7 @@ class BaseHandlerTest < Minitest::Test
   end
   
   def eval_test
-    uri = URI('http://localhost:6464/tellme?a=1')
+    uri = URI('http://localhost:6470/tellme?a=1')
     req = Net::HTTP::Get.new(uri)
     # Set the headers the way we want them.
     req['Accept-Encoding'] = '*'
@@ -101,7 +101,7 @@ class BaseHandlerTest < Minitest::Test
       "REQUEST_METHOD" => "GET",
       "SCRIPT_NAME" => "/tellme",
       "SERVER_NAME" => "localhost",
-      "SERVER_PORT" => "6464",
+      "SERVER_PORT" => "6470",
       "rack.errors" => nil,
       "rack.input" => nil,
       "rack.multiprocess" => false,
@@ -121,7 +121,7 @@ class BaseHandlerTest < Minitest::Test
   end
 
   def post_test
-    uri = URI('http://localhost:6464/makeme')
+    uri = URI('http://localhost:6470/makeme')
     req = Net::HTTP::Post.new(uri)
     # Set the headers the way we want them.
     req['Accept-Encoding'] = '*'
@@ -135,7 +135,7 @@ class BaseHandlerTest < Minitest::Test
   end
   
   def put_test
-    uri = URI('http://localhost:6464/makeme')
+    uri = URI('http://localhost:6470/makeme')
     req = Net::HTTP::Put.new(uri)
     # Set the headers the way we want them.
     req['Accept-Encoding'] = '*'
@@ -151,7 +151,7 @@ class BaseHandlerTest < Minitest::Test
   end
 
   def wild_one_test
-    uri = URI('http://localhost:6464/wild/abc/one')
+    uri = URI('http://localhost:6470/wild/abc/one')
     req = Net::HTTP::Get.new(uri)
     res = Net::HTTP.start(uri.hostname, uri.port) { |h|
       h.request(req)
@@ -160,7 +160,7 @@ class BaseHandlerTest < Minitest::Test
   end
 
   def wild_all_test
-    uri = URI('http://localhost:6464/wild/all/x/y')
+    uri = URI('http://localhost:6470/wild/all/x/y')
     req = Net::HTTP::Get.new(uri)
     res = Net::HTTP.start(uri.hostname, uri.port) { |h|
       h.request(req)

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
-dependencies: []
+date: 2018-02-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
 description: A fast HTTP server supporting rack.
 email: peter@ohler.com
 executables: