iodine 0.7.34 → 0.7.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37df76fb8d575cf00bba0d36342aa6eabd5fba95a4d2940b61ce9b3026082dc1
-  data.tar.gz: 0a5f7fe186c7c824d15959cbabaa71edaffc8159780a7054a54bf959f36b465a
+  metadata.gz: f07c471ae04fb0a960e636a064b6d37bb6c122397a08cbcd6b8bfd346c0404c3
+  data.tar.gz: c5be46ad5c0c11905e302993ae5658aff5dd2d3e12a5a7aa2158000ae3bbed30
 SHA512:
-  metadata.gz: 304dda003c1272727bc279126cc008c27cff83233080ede66817dcb1a3849e149f4b64765642705020013e8d7817726dcbb7039eff8809cf63229cff861a3be7
-  data.tar.gz: 27cdeee27782a72ea42c931fb43f09660a8627fdb26c9afb4ce084047b0a10b4e8648adb660f796c1ac12db05fdf011306e2b0dfeaae57212b0f45a21503e39c
+  metadata.gz: 4dccb90c6164381e2645514a4f1d5710c8edc94765f102fab56e27e4a5f91a598df7daeb3aa1519aa62e7f88c76fc87793f1a41ec6b7fcdb80ce206297afd9a5
+  data.tar.gz: 773ba1086531e10702ae59c27b7ef52d6ebf9fdc9616b7fe8dfe73b680ed5792705549bbb1aff3c21b32d3ae177aff1de40c8d7d7042afef358d7b9d404433a8

data/.travis.yml

@@ -24,7 +24,7 @@ addons:
 script:
   - echo CFLAGS = $CFLAGS
   - echo cflags = $cflags
+  - bundle exec rake compile && bundle exec rspec --format documentation
   - gem uninstall -x iodine
   - rake build
   - find pkg/iodine-*.gem -exec gem install -V {} +
-  - bundle exec rspec --format documentation

data/CHANGELOG.md

@@ -6,6 +6,12 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ## Changes:
 
+#### Change log v.0.7.35
+
+**Fix**: fix memory leak in the x-sendfile path where Ruby objects no longer in use would still be protected by iodine.
+
+**Update**: (`iodine`) add the `Iodine.running?` method. Credit to Ian Ker-Seymer (@ianks) for PR #78.
+
 #### Change log v.0.7.34
 
 **Security**: (`facil.io`, `http`) updated to facil.io 0.7.3, incorporating it's bug fixes and security updates.

data/Rakefile

@@ -1,14 +1,13 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
 require "rake/extensiontask"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
 end
 
-task :default => [:compile, :test]
+task :default => [:compile, :spec]
 
 Rake::ExtensionTask.new "iodine" do |ext|
   ext.lib_dir = "lib/iodine"

data/ext/iodine/iodine.c

@@ -302,6 +302,17 @@ static VALUE iodine_worker_is(VALUE self) {
   return fio_is_master() ? Qtrue : Qfalse;
 }
 
+/**
+ * Returns `true` if Iodine is currently running a server
+ */
+static VALUE iodine_running(VALUE self) {
+  if (fio_is_running()) {
+    return Qtrue;
+  } else {
+    return Qfalse;
+  }
+}
+
 /* *****************************************************************************
 CLI parser (Ruby's OptParser is more limiting than I knew...)
 ***************************************************************************** */
@@ -1292,6 +1303,7 @@ void Init_iodine(void) {
   rb_define_module_function(IodineModule, "on_idle", iodine_sched_on_idle, 0);
   rb_define_module_function(IodineModule, "master?", iodine_master_is, 0);
   rb_define_module_function(IodineModule, "worker?", iodine_worker_is, 0);
+  rb_define_module_function(IodineModule, "running?", iodine_running, 0);
   rb_define_module_function(IodineModule, "listen", iodine_listen, 1);
   rb_define_module_function(IodineModule, "connect", iodine_connect, 1);
 

data/ext/iodine/iodine_http.c

@@ -268,7 +268,7 @@ static int iodine_copy2env_task(FIOBJ o, void *env_) {
     hname = HTTP_CONNECTION;
   } else if (tmp.len == 4 && !memcmp("host", tmp.data, 4)) {
     hname = HTTP_HOST;
-  } else if (tmp.len > 59) {
+  } else if (tmp.len > 123) {
     char *buf = fio_malloc(tmp.len + 5);
     memcpy(buf, "HTTP_", 5);
     for (size_t i = 0; i < tmp.len; ++i) {
@@ -277,7 +277,7 @@ static int iodine_copy2env_task(FIOBJ o, void *env_) {
     hname = rb_enc_str_new(buf, tmp.len + 5, IodineBinaryEncoding);
     fio_free(buf);
   } else {
-    char buf[64];
+    char buf[128];
     memcpy(buf, "HTTP_", 5);
     for (size_t i = 0; i < tmp.len; ++i) {
       buf[i + 5] = (tmp.data[i] == '-') ? '_' : to_upper(tmp.data[i]);
@@ -695,7 +695,7 @@ static inline void *iodine_handle_request_in_GVL(void *handle_) {
     rb_hash_foreach(response_headers, for_each_header_data, (VALUE)(h));
     IodineStore.remove(response_headers);
     // send the file directly and finish
-    return NULL;
+    goto finish;
   }
   // review each header and write it to the response.
   rb_hash_foreach(response_headers, for_each_header_data, (VALUE)(h));
@@ -707,6 +707,7 @@ static inline void *iodine_handle_request_in_GVL(void *handle_) {
   if (ruby2c_response_send(handle, rbresponse, env))
     goto internal_error;
 
+finish:
   IodineStore.remove(rbresponse);
   IodineStore.remove(env);
   return NULL;

data/ext/iodine/iodine_mustache.c

@@ -17,13 +17,20 @@ C <=> Ruby Data allocation
 ***************************************************************************** */
 
 static size_t iodine_mustache_data_size(const void *c_) {
-  return sizeof(mustache_s *);
+  return sizeof(mustache_s *) +
+         (((mustache_s **)c_)[0]
+              ? (((mustache_s **)c_)[0]->u.read_only.data_length +
+                 (((mustache_s **)c_)[0]->u.read_only.intruction_count *
+                  sizeof(struct mustache__instruction_s)))
+              : 0);
   (void)c_;
 }
 
 static void iodine_mustache_data_free(void *c_) {
   mustache_free(((mustache_s **)c_)[0]);
+  FIO_LOG_DEBUG("deallocated mustache data at: %p", ((void **)c_)[0]);
   free((void *)c_);
+  FIO_LOG_DEBUG("deallocated mustache pointer at: %p", c_);
   (void)c_;
 }
 
@@ -43,6 +50,7 @@ static const rb_data_type_t iodine_mustache_data_type = {
 static VALUE iodine_mustache_data_alloc_c(VALUE self) {
   void *m = malloc(sizeof(mustache_s *));
   ((mustache_s **)m)[0] = NULL;
+  FIO_LOG_DEBUG("allocated mustache pointer at: %p", m);
   return TypedData_Wrap_Struct(self, &iodine_mustache_data_type, m);
 }
 
@@ -310,9 +318,11 @@ static VALUE iodine_mustache_new(int argc, VALUE *argv, VALUE self) {
                      .data = (template == Qnil ? NULL : RSTRING_PTR(template)),
                      .data_len = (template == Qnil ? 0 : RSTRING_LEN(template)),
                      .err = &err);
-
   if (!*m)
     goto error;
+
+  FIO_LOG_DEBUG("allocated / loaded mustache data at: %p", (void *)*m);
+
   return self;
 error:
   switch (err) {

data/iodine.gemspec

@@ -40,6 +40,8 @@ Gem::Specification.new do |spec|
   # spec.add_development_dependency 'bundler', '>= 1.10', '< 2.0'
   spec.add_development_dependency 'rake', '~> 12.0', '< 13.0'
   spec.add_development_dependency 'minitest', '>=5', '< 6.0'
+  spec.add_development_dependency 'rspec', '>=3.9.0', '< 4.0'
+  spec.add_development_dependency 'spec', '>=5.3.0', '< 6.0'
   spec.add_development_dependency 'rake-compiler', '>= 1', '< 2.0'
 
   spec.post_install_message = "Thank you for installing Iodine #{Iodine::VERSION}.\n" +

data/lib/iodine.rb

@@ -1,8 +1,8 @@
 require 'socket'  # TCPSocket is used internally for Hijack support
 # require 'openssl' # For SSL/TLS support using OpenSSL
 
-require 'iodine/version'
-require 'iodine/iodine'
+require_relative './iodine/version'
+require_relative './iodine/iodine' # loading a binary C extension
 
 # Iodine is an HTTP / WebSocket server as well as an Evented Network Tool Library. In essense, Iodine is a Ruby port for the [facil.io](http://facil.io) C library.
 #

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.7.34'.freeze
+  VERSION = '0.7.35'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.34
+  version: 0.7.35
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,6 +50,46 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +243,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
 post_install_message: |-
-  Thank you for installing Iodine 0.7.34.
+  Thank you for installing Iodine 0.7.35.
   Remember: if iodine supports your business, it's is only fair to give value back (code contributions / donations).
 rdoc_options: []
 require_paths: