iodine 0.7.16 → 0.7.17

data/ext/iodine/fio_tmpfile.h

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz Segev, 2018
+Copyright: Boaz Segev, 2018-2019
 License: MIT
 */
 #ifndef H_FIO_TMPFILE_H

data/ext/iodine/fiobj.h

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 #ifndef H_FIOBJ_H

data/ext/iodine/fiobj_ary.c

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 #include <fio.h>

data/ext/iodine/fiobj_ary.h

@@ -1,6 +1,6 @@
 #ifndef FIOBJ_ARRAY_H
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 

data/ext/iodine/fiobj_data.c

@@ -1,7 +1,7 @@
 #if defined(__unix__) || defined(__APPLE__) || defined(__linux__) ||           \
     defined(__CYGWIN__) /* require POSIX */
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 #ifndef _GNU_SOURCE

data/ext/iodine/fiobj_data.h

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 #if !defined(H_FIOBJ_IO_H) && (defined(__unix__) || defined(__APPLE__) ||      \

data/ext/iodine/fiobj_hash.c

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 

data/ext/iodine/fiobj_hash.h

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 #ifndef H_FIOBJ_HASH_H

data/ext/iodine/fiobj_json.c

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 #include <fiobj_json.h>
@@ -511,7 +511,7 @@ void fiobj_test_json(void) {
   TEST_ASSERT(o, "JSON object missing!\n");
   TEST_ASSERT(FIOBJ_TYPE_IS(o, FIOBJ_T_HASH),
               "JSON root not a dictionary (not a hash)!\n");
-  FIOBJ tmp = fiobj_hash_get2(o, fio_siphash("array", 5));
+  FIOBJ tmp = fiobj_hash_get2(o, fiobj_hash_string("array", 5));
   TEST_ASSERT(FIOBJ_TYPE_IS(tmp, FIOBJ_T_ARRAY),
               "JSON 'array' not an Array!\n");
   TEST_ASSERT(fiobj_obj2num(fiobj_ary_index(tmp, 0)) == 1,
@@ -524,24 +524,26 @@ void fiobj_test_json(void) {
               "JSON 'array' index 3 type error!\n");
   TEST_ASSERT(!memcmp("boom", fiobj_obj2cstr(fiobj_ary_index(tmp, 3)).data, 4),
               "JSON 'array' index 3 error!\n");
-  tmp = fiobj_hash_get2(o, fio_siphash("my", 2));
+  tmp = fiobj_hash_get2(o, fiobj_hash_string("my", 2));
   TEST_ASSERT(FIOBJ_TYPE_IS(tmp, FIOBJ_T_HASH),
               "JSON 'my:secret' not a Hash!\n");
-  TEST_ASSERT(FIOBJ_TYPE_IS(fiobj_hash_get2(tmp, fio_siphash("secret", 6)),
-                            FIOBJ_T_NUMBER),
-              "JSON 'my:secret' doesn't hold a number!\n");
-  TEST_ASSERT(fiobj_obj2num(fiobj_hash_get2(tmp, fio_siphash("secret", 6))) ==
-                  42,
-              "JSON 'my:secret' not 42!\n");
-  TEST_ASSERT(fiobj_hash_get2(o, fio_siphash("true", 4)) == fiobj_true(),
+  TEST_ASSERT(
+      FIOBJ_TYPE_IS(fiobj_hash_get2(tmp, fiobj_hash_string("secret", 6)),
+                    FIOBJ_T_NUMBER),
+      "JSON 'my:secret' doesn't hold a number!\n");
+  TEST_ASSERT(
+      fiobj_obj2num(fiobj_hash_get2(tmp, fiobj_hash_string("secret", 6))) == 42,
+      "JSON 'my:secret' not 42!\n");
+  TEST_ASSERT(fiobj_hash_get2(o, fiobj_hash_string("true", 4)) == fiobj_true(),
               "JSON 'true' not true!\n");
-  TEST_ASSERT(fiobj_hash_get2(o, fio_siphash("false", 5)) == fiobj_false(),
+  TEST_ASSERT(fiobj_hash_get2(o, fiobj_hash_string("false", 5)) ==
+                  fiobj_false(),
               "JSON 'false' not false!\n");
-  TEST_ASSERT(fiobj_hash_get2(o, fio_siphash("null", 4)) == fiobj_null(),
+  TEST_ASSERT(fiobj_hash_get2(o, fiobj_hash_string("null", 4)) == fiobj_null(),
               "JSON 'null' not null!\n");
-  tmp = fiobj_hash_get2(o, fio_siphash("float", 5));
+  tmp = fiobj_hash_get2(o, fiobj_hash_string("float", 5));
   TEST_ASSERT(FIOBJ_TYPE_IS(tmp, FIOBJ_T_FLOAT), "JSON 'float' not a float!\n");
-  tmp = fiobj_hash_get2(o, fio_siphash("string", 6));
+  tmp = fiobj_hash_get2(o, fiobj_hash_string("string", 6));
   TEST_ASSERT(FIOBJ_TYPE_IS(tmp, FIOBJ_T_STRING),
               "JSON 'string' not a string!\n");
   TEST_ASSERT(!strcmp(fiobj_obj2cstr(tmp).data, "I \"wrote\" this."),
@@ -558,11 +560,11 @@ void fiobj_test_json(void) {
       "JSON update failed to parse data.");
   fiobj_free(tmp);
 
-  tmp = fiobj_hash_get2(o, fio_siphash("array", 5));
+  tmp = fiobj_hash_get2(o, fiobj_hash_string("array", 5));
   TEST_ASSERT(FIOBJ_TYPE_IS(tmp, FIOBJ_T_ARRAY),
               "JSON updated 'array' not an Array!\n");
   TEST_ASSERT(fiobj_ary_count(tmp) == 3, "JSON updated 'array' not updated?");
-  tmp = fiobj_hash_get2(o, fio_siphash("float", 5));
+  tmp = fiobj_hash_get2(o, fiobj_hash_string("float", 5));
   TEST_ASSERT(FIOBJ_TYPE_IS(tmp, FIOBJ_T_FLOAT),
               "JSON updated (old) 'float' missing!\n");
   fiobj_free(o);

data/ext/iodine/fiobj_json.h

@@ -2,7 +2,7 @@
 #define H_FIOBJ_JSON_H
 
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 

data/ext/iodine/fiobj_mustache.c

@@ -1,3 +1,7 @@
+/*
+Copyright: Boaz Segev, 2018-2019
+License: MIT
+*/
 #define INCLUDE_MUSTACHE_IMPLEMENTATION 1
 #include <mustache_parser.h>
 

data/ext/iodine/fiobj_mustache.h

@@ -1,3 +1,7 @@
+/*
+Copyright: Boaz Segev, 2018-2019
+License: MIT
+*/
 #ifndef H_FIOBJ_MUSTACHE_H
 #define H_FIOBJ_MUSTACHE_H
 

data/ext/iodine/fiobj_numbers.c

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 

data/ext/iodine/fiobj_numbers.h

@@ -1,7 +1,7 @@
 #ifndef H_FIOBJ_NUMBERS_H
 #define H_FIOBJ_NUMBERS_H
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 

data/ext/iodine/fiobj_str.c

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 
@@ -324,13 +324,13 @@ size_t fiobj_str_concat(FIOBJ dest, FIOBJ obj) {
 uint64_t fiobj_str_hash(FIOBJ o) {
   assert(FIOBJ_TYPE_IS(o, FIOBJ_T_STRING));
   // if (obj2str(o)->is_small) {
-  //   return fio_siphash(STR_INTENAL_STR(o), STR_INTENAL_LEN(o));
+  //   return fiobj_hash_string(STR_INTENAL_STR(o), STR_INTENAL_LEN(o));
   // } else
   if (obj2str(o)->hash) {
     return obj2str(o)->hash;
   }
   fio_str_info_s state = fio_str_info(&obj2str(o)->str);
-  obj2str(o)->hash = fio_siphash(state.data, state.len);
+  obj2str(o)->hash = fiobj_hash_string(state.data, state.len);
   return obj2str(o)->hash;
 }
 

data/ext/iodine/fiobj_str.h

@@ -1,6 +1,6 @@
 #ifndef H_FIOBJ_STR_H
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 #define H_FIOBJ_STR_H

data/ext/iodine/fiobject.c

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 

data/ext/iodine/fiobject.h

@@ -1,6 +1,6 @@
 #ifndef H_FIOBJECT_H
 /*
-Copyright: Boaz Segev, 2017-2018
+Copyright: Boaz Segev, 2017-2019
 License: MIT
 */
 
@@ -27,6 +27,8 @@ types, abstracting some complexity and making dynamic type related tasks easier.
 
 #include <fio_siphash.h>
 
+#include <fio.h>
+
 #if !defined(__GNUC__) && !defined(__clang__) && !defined(FIO_GNUC_BYPASS)
 #define __attribute__(...)
 #define __has_include(...) 0
@@ -552,7 +554,11 @@ FIO_INLINE uint64_t fiobj_obj2hash(const FIOBJ o) {
   if (!FIOBJ_IS_ALLOCATED(o))
     return (uint64_t)o;
   fio_str_info_s s = fiobj_obj2cstr(o);
-  return fio_siphash(s.data, s.len);
+  return FIO_HASH_FN(s.data, s.len, &fiobj_each2, &fiobj_free_complex_object);
+}
+
+FIO_INLINE uint64_t fiobj_hash_string(const void *data, size_t len) {
+  return FIO_HASH_FN(data, len, &fiobj_each2, &fiobj_free_complex_object);
 }
 
 /**

data/ext/iodine/http.c

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz Segev, 2016-2018
+Copyright: Boaz Segev, 2016-2019
 License: MIT
 
 Feel free to copy, use and enjoy according to the license provided.
@@ -28,42 +28,19 @@ SSL/TLS patch
  * The first protocol added will act as the default protocol to be selected.
  */
 void __attribute__((weak))
-fio_tls_proto_add(void *tls, const char *protocol_name,
-                  void (*callback)(intptr_t uuid, void *udata)) {
+fio_tls_alpn_add(void *tls, const char *protocol_name,
+                 void (*callback)(intptr_t uuid, void *udata_connection,
+                                  void *udata_tls),
+                 void *udata_tls, void (*on_cleanup)(void *udata_tls)) {
   FIO_LOG_FATAL("HTTP SSL/TLS required but unavailable!");
   exit(-1);
   (void)tls;
   (void)protocol_name;
   (void)callback;
+  (void)on_cleanup;
+  (void)udata_tls;
 }
-#pragma weak fio_tls_proto_add
-
-void __attribute__((weak))
-fio_tls_accept(intptr_t uuid, void *tls, void *udata) {
-  FIO_LOG_FATAL("HTTP SSL/TLS required but unavailable!");
-  exit(-1);
-  (void)uuid;
-  (void)tls;
-  (void)udata;
-}
-#pragma weak fio_tls_accept
-
-/**
- * Establishes an SSL/TLS connection as an SSL/TLS Server, using the specified
- * conetext / settings object.
- *
- * The `uuid` should be a socket UUID that is already connected to a peer (i.e.,
- * the result of `fio_accept`).
- */
-void __attribute__((weak))
-fio_tls_connect(intptr_t uuid, void *tls, void *udata) {
-  FIO_LOG_FATAL("HTTP SSL/TLS required but unavailable!");
-  exit(-1);
-  (void)uuid;
-  (void)tls;
-  (void)udata;
-}
-#pragma weak fio_tls_connect
+#pragma weak fio_tls_alpn_add
 
 /* *****************************************************************************
 Small Helpers
@@ -73,7 +50,7 @@ static inline int hex2byte(uint8_t *dest, const uint8_t *source);
 static inline void add_content_length(http_s *r, uintptr_t length) {
   static uint64_t cl_hash = 0;
   if (!cl_hash)
-    cl_hash = fio_siphash("content-length", 14);
+    cl_hash = fiobj_hash_string("content-length", 14);
   if (!fiobj_hash_get2(r->private_data.out_headers, cl_hash)) {
     fiobj_hash_set(r->private_data.out_headers, HTTP_HEADER_CONTENT_LENGTH,
                    fiobj_num_new(length));
@@ -82,7 +59,7 @@ static inline void add_content_length(http_s *r, uintptr_t length) {
 static inline void add_content_type(http_s *r) {
   static uint64_t ct_hash = 0;
   if (!ct_hash)
-    ct_hash = fio_siphash("content-type", 12);
+    ct_hash = fiobj_hash_string("content-type", 12);
   if (!fiobj_hash_get2(r->private_data.out_headers, ct_hash)) {
     fiobj_hash_set(r->private_data.out_headers, HTTP_HEADER_CONTENT_TYPE,
                    http_mimetype_find2(r->path));
@@ -95,10 +72,10 @@ static fio_lock_i date_lock;
 static inline void add_date(http_s *r) {
   static uint64_t date_hash = 0;
   if (!date_hash)
-    date_hash = fio_siphash("date", 4);
+    date_hash = fiobj_hash_string("date", 4);
   static uint64_t mod_hash = 0;
   if (!mod_hash)
-    mod_hash = fio_siphash("last-modified", 13);
+    mod_hash = fiobj_hash_string("last-modified", 13);
 
   if (fio_last_tick().tv_sec > last_date_added) {
     fio_lock(&date_lock);
@@ -312,13 +289,23 @@ int http_set_cookie(http_s *h, http_cookie_args_s cookie) {
     }
   } else
     cookie.max_age = -1;
+
+  if (http_settings(h) && http_settings(h)->is_client) {
+    if (!cookie.value) {
+      fiobj_free(c);
+      return -1;
+    }
+    set_header_add(h->private_data.out_headers, HTTP_HEADER_COOKIE, c);
+    return 0;
+  }
+
   t.data[len++] = ';';
   t.data[len++] = ' ';
 
   if (h->status_str || !h->status) { /* on first request status == 0 */
     static uint64_t cookie_hash;
     if (!cookie_hash)
-      cookie_hash = fio_siphash("cookie", 6);
+      cookie_hash = fiobj_hash_string("cookie", 6);
     FIOBJ tmp = fiobj_hash_get2(h->private_data.out_headers, cookie_hash);
     if (!tmp) {
       set_header_add(h->private_data.out_headers, HTTP_HEADER_COOKIE, c);
@@ -419,10 +406,10 @@ int http_sendfile2(http_s *h, const char *prefix, size_t prefix_len,
   struct stat file_data = {.st_size = 0};
   static uint64_t accept_enc_hash = 0;
   if (!accept_enc_hash)
-    accept_enc_hash = fio_siphash("accept-encoding", 15);
+    accept_enc_hash = fiobj_hash_string("accept-encoding", 15);
   static uint64_t range_hash = 0;
   if (!range_hash)
-    range_hash = fio_siphash("range", 5);
+    range_hash = fiobj_hash_string("range", 5);
 
   /* create filename string */
   FIOBJ filename = fiobj_str_tmp();
@@ -503,7 +490,7 @@ found_file:
   /* set & test etag */
   uint64_t etag = (uint64_t)file_data.st_size;
   etag ^= (uint64_t)file_data.st_mtime;
-  etag = fio_siphash(&etag, sizeof(uint64_t));
+  etag = fiobj_hash_string(&etag, sizeof(uint64_t));
   FIOBJ etag_str = fiobj_str_buf(32);
   fiobj_str_resize(etag_str,
                    fio_base64_encode(fiobj_obj2cstr(etag_str).data,
@@ -514,7 +501,7 @@ found_file:
   {
     static uint64_t none_match_hash = 0;
     if (!none_match_hash)
-      none_match_hash = fio_siphash("if-none-match", 13);
+      none_match_hash = fiobj_hash_string("if-none-match", 13);
     FIOBJ tmp2 = fiobj_hash_get2(h->headers, none_match_hash);
     if (tmp2 && fiobj_iseq(tmp2, etag_str)) {
       h->status = 304;
@@ -528,7 +515,7 @@ found_file:
   {
     static uint64_t ifrange_hash = 0;
     if (!ifrange_hash)
-      ifrange_hash = fio_siphash("if-range", 8);
+      ifrange_hash = fiobj_hash_string("if-range", 8);
     FIOBJ tmp = fiobj_hash_get2(h->headers, ifrange_hash);
     if (tmp && fiobj_iseq(tmp, etag_str)) {
       fiobj_hash_delete2(h->headers, range_hash);
@@ -907,28 +894,28 @@ static void http_settings_free(http_settings_s *s) {
 Listening to HTTP connections
 ***************************************************************************** */
 
-static void http_on_server_protocol_http1(intptr_t uuid, void *set) {
-  fio_protocol_s *pr = http1_new(uuid, set, NULL, 0);
-  if (!pr)
-    fio_close(uuid);
-}
+static uint8_t fio_http_at_capa = 0;
 
-static void http_on_open(intptr_t uuid, void *set) {
-  static uint8_t at_capa;
+static void http_on_server_protocol_http1(intptr_t uuid, void *set,
+                                          void *ignr_) {
   fio_timeout_set(uuid, ((http_settings_s *)set)->timeout);
   if (fio_uuid2fd(uuid) >= ((http_settings_s *)set)->max_clients) {
-    if (!at_capa)
+    if (!fio_http_at_capa)
       FIO_LOG_WARNING("HTTP server at capacity");
-    at_capa = 1;
+    fio_http_at_capa = 1;
     http_send_error2(uuid, 503, set);
     fio_close(uuid);
     return;
   }
-  at_capa = 0;
-  if (((http_settings_s *)set)->tls)
-    fio_tls_accept(uuid, ((http_settings_s *)set)->tls, set);
-  else
-    http_on_server_protocol_http1(uuid, set);
+  fio_http_at_capa = 0;
+  fio_protocol_s *pr = http1_new(uuid, set, NULL, 0);
+  if (!pr)
+    fio_close(uuid);
+  (void)ignr_;
+}
+
+static void http_on_open(intptr_t uuid, void *set) {
+  http_on_server_protocol_http1(uuid, set, NULL);
 }
 
 static void http_on_finish(intptr_t uuid, void *set) {
@@ -961,10 +948,11 @@ intptr_t http_listen(const char *port, const char *binding,
   http_settings_s *settings = http_settings_new(arg_settings);
   settings->is_client = 0;
   if (settings->tls) {
-    fio_tls_proto_add(settings->tls, "http/1.1", http_on_server_protocol_http1);
+    fio_tls_alpn_add(settings->tls, "http/1.1", http_on_server_protocol_http1,
+                     NULL, NULL);
   }
 
-  return fio_listen(.port = port, .address = binding,
+  return fio_listen(.port = port, .address = binding, .tls = arg_settings.tls,
                     .on_finish = http_on_finish, .on_open = http_on_open,
                     .udata = settings);
 }
@@ -1008,9 +996,11 @@ static void http_on_open_client_perform(http_settings_s *set) {
   http_s *h = set->udata;
   set->on_response(h);
 }
-static void http_on_open_client_http1(intptr_t uuid, void *set_) {
+static void http_on_open_client_http1(intptr_t uuid, void *set_,
+                                      void *ignore_) {
   http_settings_s *set = set_;
   http_s *h = set->udata;
+  fio_timeout_set(uuid, set->timeout);
   fio_protocol_s *pr = http1_new(uuid, set, NULL, 0);
   if (!pr) {
     fio_close(uuid);
@@ -1025,15 +1015,11 @@ static void http_on_open_client_http1(intptr_t uuid, void *set_) {
   h->private_data.flag = (uintptr_t)pr;
   h->private_data.vtbl = http1_vtable();
   http_on_open_client_perform(set);
+  (void)ignore_;
 }
 
 static void http_on_open_client(intptr_t uuid, void *set_) {
-  http_settings_s *set = set_;
-  fio_timeout_set(uuid, set->timeout);
-  if (set->tls)
-    fio_tls_connect(uuid, set->tls, set_);
-  else
-    http_on_open_client_http1(uuid, set);
+  http_on_open_client_http1(uuid, set_, NULL);
 }
 
 static void http_on_client_failed(intptr_t uuid, void *set_) {
@@ -1048,6 +1034,7 @@ static void http_on_client_failed(intptr_t uuid, void *set_) {
   (void)uuid;
 }
 
+intptr_t http_connect__(void); /* sublime text marker */
 /**
  * Connects to an HTTP server as a client.
  *
@@ -1062,9 +1049,9 @@ static void http_on_client_failed(intptr_t uuid, void *set_) {
  * Returns -1 on error and 0 on success. the `on_finish` callback is always
  * called.
  */
-#undef http_connect
-intptr_t http_connect(const char *address,
-                      struct http_settings_s arg_settings) {
+intptr_t http_connect FIO_IGNORE_MACRO(const char *url,
+                                       const char *unix_address,
+                                       struct http_settings_s arg_settings) {
   if (!arg_settings.on_response && !arg_settings.on_upgrade) {
     FIO_LOG_ERROR("http_connect requires either an on_response "
                   " or an on_upgrade callback.\n");
@@ -1072,71 +1059,69 @@ intptr_t http_connect(const char *address,
     goto on_error;
   }
   size_t len;
-  char *a, *p;
+  char *a = NULL, *p = NULL;
   uint8_t is_websocket = 0;
   uint8_t is_secure = 0;
   FIOBJ path = FIOBJ_INVALID;
-  if (!address || (len = strlen(address)) <= 5) {
+  if (!url && !unix_address) {
     FIO_LOG_ERROR("http_connect requires a valid address.");
     errno = EINVAL;
     goto on_error;
   }
-  // TODO: use http_url_parse
-  if (!strncasecmp(address, "ws", 2)) {
-    is_websocket = 1;
-    address += 2;
-    len -= 2;
-  } else if (len >= 7 && !strncasecmp(address, "http", 4)) {
-    address += 4;
-    len -= 4;
-  } else {
-    FIO_LOG_ERROR("http_connect requires a valid address.");
-    errno = EINVAL;
-    goto on_error;
-  }
-  /* parse address */
-  if (address[0] == 's') {
-    /* TODO: SSL/TLS */
-    is_secure = 1;
-    FIO_LOG_ERROR("http_connect doesn't support TLS/SSL just yet.");
-    errno = EINVAL;
-    goto on_error;
-  } else if (len <= 3 || strncmp(address, "://", 3)) {
-    FIO_LOG_ERROR("http_connect requires a valid address.");
-    errno = EINVAL;
-    goto on_error;
-  } else {
-    len -= 3;
-    address += 3;
-    a = fio_malloc(len + 1);
-    FIO_ASSERT_ALLOC(a);
-    memcpy(a, address, len + 1);
-  }
-  p = memchr(a, '/', len);
-  if (p) {
-    if (len - (p - a))
-      path = fiobj_str_new(p, len - (p - a));
-    len = p - a;
-    *p = 0;
-  }
-  p = memchr(a, ':', len);
-  if (p) {
-    len = p - a;
-    *p = 0;
-    if (a + len == p + 1) {
-      p = NULL;
+  if (url) {
+    fio_url_s u = fio_url_parse(url, strlen(url));
+    if (u.scheme.data &&
+        (u.scheme.len == 2 || (u.scheme.len == 3 && u.scheme.data[2] == 's')) &&
+        u.scheme.data[0] == 'w' && u.scheme.data[1] == 's') {
+      is_websocket = 1;
+      is_secure = (u.scheme.len == 3);
+    } else if (u.scheme.data &&
+               (u.scheme.len == 4 ||
+                (u.scheme.len == 5 && u.scheme.data[4] == 's')) &&
+               u.scheme.data[0] == 'h' && u.scheme.data[1] == 't' &&
+               u.scheme.data[2] == 't' && u.scheme.data[3] == 'p') {
+      is_secure = (u.scheme.len == 5);
+    }
+    if (is_secure && !arg_settings.tls) {
+      FIO_LOG_ERROR("Secure connections (%.*s) require a TLS object.",
+                    (int)u.scheme.len, u.scheme.data);
+      errno = EINVAL;
+      goto on_error;
+    }
+    if (u.path.data) {
+      path = fiobj_str_new(
+          u.path.data, strlen(u.path.data)); /* copy query and target as well */
+    }
+    if (unix_address) {
+      a = (char *)unix_address;
+      len = strlen(a);
     } else {
-      p++;
-      if (!len) {
-        a = (char *)"localhost";
-        len = 9;
+      if (!u.host.data) {
+        FIO_LOG_ERROR("http_connect requires a valid address.");
+        errno = EINVAL;
+        goto on_error;
+      }
+      /***** no more error handling, since memory is allocated *****/
+      /* copy address */
+      a = fio_malloc(u.host.len + 1);
+      memcpy(a, u.host.data, u.host.len);
+      a[u.host.len] = 0;
+      len = u.host.len;
+      /* copy port */
+      if (u.port.data) {
+        p = fio_malloc(u.port.len + 1);
+        memcpy(p, u.port.data, u.port.len);
+        p[u.port.len] = 0;
+      } else if (is_secure) {
+        p = fio_malloc(3 + 1);
+        memcpy(p, "443", 3);
+        p[3] = 0;
+      } else {
+        p = fio_malloc(2 + 1);
+        memcpy(p, "80", 2);
+        p[2] = 0;
       }
     }
-  } else {
-    if (is_secure)
-      p = (char *)"443";
-    else
-      p = (char *)"80";
   }
 
   /* set settings */
@@ -1144,9 +1129,10 @@ intptr_t http_connect(const char *address,
     arg_settings.timeout = 30;
   http_settings_s *settings = http_settings_new(arg_settings);
   settings->is_client = 1;
-  if (settings->tls) {
-    fio_tls_proto_add(settings->tls, "http/1.1", http_on_open_client_http1);
-  }
+  // if (settings->tls) {
+  //   fio_tls_alpn_add(settings->tls, "http/1.1", http_on_open_client_http1,
+  //                     NULL, NULL);
+  // }
 
   if (!arg_settings.ws_timeout)
     settings->ws_timeout = 0; /* allow server to dictate timeout */
@@ -1159,29 +1145,32 @@ intptr_t http_connect(const char *address,
   h->status = 0;
   h->path = path;
   settings->udata = h;
+  settings->tls = arg_settings.tls;
   http_set_header2(h, (fio_str_info_s){.data = (char *)"host", .len = 4},
                    (fio_str_info_s){.data = a, .len = len});
   intptr_t ret;
   if (is_websocket) {
     /* force HTTP/1.1 */
     ret = fio_connect(.address = a, .port = p, .on_fail = http_on_client_failed,
-                      .on_connect = http_on_open_client, .udata = settings);
+                      .on_connect = http_on_open_client, .udata = settings,
+                      .tls = arg_settings.tls);
     (void)0;
   } else {
     /* Allow for any HTTP version */
     ret = fio_connect(.address = a, .port = p, .on_fail = http_on_client_failed,
-                      .on_connect = http_on_open_client, .udata = settings);
+                      .on_connect = http_on_open_client, .udata = settings,
+                      .tls = arg_settings.tls);
     (void)0;
   }
-  fio_free(a);
+  if (a != unix_address)
+    fio_free(a);
+  fio_free(p);
   return ret;
 on_error:
   if (arg_settings.on_finish)
     arg_settings.on_finish(&arg_settings);
   return -1;
 }
-#define http_connect(address, ...)                                             \
-  http_connect((address), (struct http_settings_s){__VA_ARGS__})
 
 /* *****************************************************************************
 HTTP Websocket Connect
@@ -1213,7 +1202,7 @@ static void on_websocket_http_connection_finished(http_settings_s *settings) {
 int websocket_connect(const char *address, websocket_settings_s settings) {
   websocket_settings_s *s = fio_malloc(sizeof(*s));
   *s = settings;
-  return http_connect(address, .on_request = on_websocket_http_connected,
+  return http_connect(address, NULL, .on_request = on_websocket_http_connected,
                       .on_response = on_websocket_http_connected,
                       .on_finish = on_websocket_http_connection_finished,
                       .udata = s);
@@ -1671,7 +1660,8 @@ rebase:
     /* ensure array exists and it's an array + set nested_ary */
     const size_t len = ((cut1[-1] == ']') ? (size_t)((cut1 - 1) - name)
                                           : (size_t)(cut1 - name));
-    const uint64_t hash = fio_siphash(name, len); /* hash the current name */
+    const uint64_t hash =
+        fiobj_hash_string(name, len); /* hash the current name */
     nested_ary = fiobj_hash_get2(dest, hash);
     if (!nested_ary) {
       /* create a new nested array */
@@ -1708,7 +1698,8 @@ rebase:
     /* we have name[key]... */
     const size_t len = ((cut1[-1] == ']') ? (size_t)((cut1 - 1) - name)
                                           : (size_t)(cut1 - name));
-    const uint64_t hash = fio_siphash(name, len); /* hash the current name */
+    const uint64_t hash =
+        fiobj_hash_string(name, len); /* hash the current name */
     FIOBJ tmp = fiobj_hash_get2(dest, hash);
     if (!tmp) {
       /* hash doesn't exist, create it */
@@ -1762,7 +1753,7 @@ place_in_array:
   if (name[name_len - 1] == ']')
     --name_len;
   {
-    uint64_t hash = fio_siphash(name, name_len);
+    uint64_t hash = fiobj_hash_string(name, name_len);
     FIOBJ ary = fiobj_hash_get2(dest, hash);
     if (!ary) {
       FIOBJ key = encoded ? http_urlstr2fiobj(name, name_len)
@@ -1948,7 +1939,7 @@ int http_parse_body(http_s *h) {
   if (!h->body)
     return -1;
   if (!content_type_hash)
-    content_type_hash = fio_siphash("content-type", 12);
+    content_type_hash = fiobj_hash_string("content-type", 12);
   FIOBJ ct = fiobj_hash_get2(h->headers, content_type_hash);
   fio_str_info_s content_type = fiobj_obj2cstr(ct);
   if (content_type.len < 16)
@@ -2500,206 +2491,6 @@ ssize_t http_decode_path_unsafe(char *dest, const char *url_data) {
   *pos = 0;
   return pos - dest;
 }
-/* *****************************************************************************
-HTTP URL parsing
-***************************************************************************** */
-
-/**
- * Parses the URI returning it's components and their lengths (no decoding
- * performed, doesn't accept decoded URIs).
- *
- * The returned string are NOT NUL terminated, they are merely locations within
- * the original string.
- *
- * This function expects any of the following formats:
- *
- * * `/complete_path?query#target`
- *
- *   i.e.: /index.html?page=1#list
- *
- * * `host:port/complete_path?query#target`
- *
- *   i.e.:
- *      example.com/index.html
- *      example.com:8080/index.html
- *
- * * `schema://user:password@host:port/path?query#target`
- *
- *   i.e.: http://example.com/index.html?page=1#list
- *
- * Invalid formats might produce unexpected results. No error testing performed.
- */
-http_url_s http_url_parse(const char *url, size_t length) {
-  const char *end = url + length;
-  http_url_s result = {.scheme = {.data = (char *)url, .len = 0}};
-  if (length == 0) {
-    return result;
-  }
-  if (url[0] == '/') {
-    result.scheme.data = NULL;
-    goto parse_path;
-  }
-  /* test for scheme */
-  while (url < end && *url != ':' && *url != '/' && *url != '@') {
-    ++url;
-  }
-  result.scheme.len = url - result.scheme.data;
-  if (url + 3 >= end || url[1] != '/' || url[2] != '/') { /* host only? */
-    url = result.scheme.data;
-    result.scheme = (fio_str_info_s){.data = NULL};
-    goto after_scheme;
-  }
-
-  url += 3;
-
-after_scheme:
-  result.user.data = (char *)url;
-  while (url < end) {
-    switch (*url) {
-    case '/':
-      /* no user name or password (or port) */
-      result.host.data = result.user.data;
-      result.user.data = NULL;
-      result.host.len = url - result.host.data;
-      goto parse_path;
-      break;
-    case '@':
-      /* user name only, no password */
-      result.user.len = url - result.user.data;
-      ++url;
-      goto parse_host;
-      break;
-    case ':':
-      /* user name and password (or host:port...) */
-      result.user.len = url - result.user.data;
-      ++url;
-      goto parse_password;
-      break;
-    default:
-      ++url;
-      break;
-    }
-  }
-  if (url == end) { /* possibily: http://example.com  */
-    result.host.data = result.user.data;
-    result.user.data = NULL;
-    result.host.len = url - result.host.data;
-    return result;
-  }
-
-parse_password:
-  result.password.data = (char *)url;
-  while (url < end) {
-    switch (*url) {
-    case '/':
-      /* this wasn't a user:password, but host:port */
-      result.host = result.user;
-      result.port = result.password;
-      result.port.len = url - result.port.data;
-      result.user = result.password = (fio_str_info_s){.data = NULL};
-      goto parse_path;
-      break;
-    case '@':
-      /* done */
-      result.password.len = url - result.password.data;
-      ++url;
-      goto after_pass;
-    default:
-      ++url;
-      break;
-    }
-  }
-after_pass:
-  if (url == end) { /* possibily: http://example.com:port  */
-    result.host = result.user;
-    result.port = result.password;
-    result.port.len = url - result.port.data;
-    result.user = result.password = (fio_str_info_s){.data = NULL};
-    return result;
-  }
-parse_host:
-  /* host:port parsing */
-  result.host.data = (char *)url;
-  while (url < end) {
-    switch (*url) {
-    case '/':
-      /* host only */
-      result.host.len = url - result.host.data;
-      goto parse_path;
-      break;
-    case ':':
-      /* done */
-      result.host.len = url - result.host.data;
-      ++url;
-      goto after_host;
-      break;
-    default:
-      ++url;
-      break;
-    }
-  }
-after_host:
-
-  if (url == end) { /* scheme://host only? */
-    result.host.len = end - result.host.data;
-    return result;
-  }
-  result.port.data = (char *)url;
-  while (url < end && *url != '/') {
-    ++url;
-  }
-  result.port.len = url - result.port.data;
-
-  if (url == end) { /* scheme://host:port only? */
-    return result;
-  }
-
-  if (url == end) { /* scheme://host only? */
-    return result;
-  }
-/* path, query and target parsing */
-parse_path:
-  result.path.data = (char *)url;
-  while (url < end && *url != '?') {
-    ++url;
-  }
-  result.path.len = url - result.path.data;
-  if (url == end) {
-    return result;
-  }
-  ++url;
-  result.query.data = (char *)url;
-  while (url < end && *url != '#') {
-    ++url;
-  }
-  result.query.len = url - result.query.data;
-  if (url == end) {
-    return result;
-  }
-  ++url;
-  result.target.data = (char *)url;
-  result.target.len = end - result.target.data;
-
-  /* set any empty values to NULL */
-  if (!result.scheme.len)
-    result.scheme.data = NULL;
-  if (!result.user.len)
-    result.user.data = NULL;
-  if (!result.password.len)
-    result.password.data = NULL;
-  if (!result.host.len)
-    result.host.data = NULL;
-  if (!result.port.len)
-    result.port.data = NULL;
-  if (!result.path.len)
-    result.path.data = NULL;
-  if (!result.query.len)
-    result.query.data = NULL;
-  if (!result.target.len)
-    result.target.data = NULL;
-
-  return result;
-}
 
 /* *****************************************************************************
 Lookup Tables / functions
@@ -2719,7 +2510,7 @@ static fio_mime_set_s mime_types = FIO_SET_INIT;
 /** Registers a Mime-Type to be associated with the file extension. */
 void http_mimetype_register(char *file_ext, size_t file_ext_len,
                             FIOBJ mime_type_str) {
-  uintptr_t hash = fio_siphash(file_ext, file_ext_len);
+  uintptr_t hash = fiobj_hash_string(file_ext, file_ext_len);
   if (mime_type_str == FIOBJ_INVALID) {
     fio_mime_set_remove(&mime_types, hash, FIOBJ_INVALID, NULL);
   } else {
@@ -2739,7 +2530,7 @@ void http_mimetype_register(char *file_ext, size_t file_ext_len,
  *  Remember to call `fiobj_free`.
  */
 FIOBJ http_mimetype_find(char *file_ext, size_t file_ext_len) {
-  uintptr_t hash = fio_siphash(file_ext, file_ext_len);
+  uintptr_t hash = fiobj_hash_string(file_ext, file_ext_len);
   return fiobj_dup(fio_mime_set_find(&mime_types, hash, FIOBJ_INVALID));
 }