fcgi 0.9.2.1 → 0.9.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1387d847e81c0bee272b0fae6c040e24503147b8
-  data.tar.gz: 71dbe8e5af257cee1c73d0bebc286dc7af86439d
+SHA256:
+  metadata.gz: bb36e2d30016bac819a6aec9d30890bcca7750ec82862e099f89ae341049ed7c
+  data.tar.gz: af9e34e45aa8cb7673f721439e765e82e31ed8fd910987d294801335ce17fa0d
 SHA512:
-  metadata.gz: a2009fff645f8571a4d4e71085b021defab6bc3e7073305fc3d3b08c9ed00261b9e050568df5bcabc93bcebd03dbfa98fb58d8e2055b7c87c57fcf762c638b20
-  data.tar.gz: fec23575158c5bb3d68c7c483ba27eb6493b97f571c2117213f9a99ec992f80c334b662038252b8e22d5fa8785e9690393cacac55376f1798b993ec368fc647c
+  metadata.gz: 79f085764709841d49d4c6e91fc8188a5ba952a7e11f544addde2602d7a8e325bc346613d6c12bf3ade8cb09e0269d79c28a49a71ed369ef833542c3da2ff736
+  data.tar.gz: 0c02df774067bab5dcc11f065bee1f55e941900f5602ce60deceef24df78c1588cbefd1cae67926d3335c4e1aa1e360c25ffc3c2daeffe19e973ee5f9b98d912

data/ext/fcgi/fcgi.c

@@ -12,6 +12,9 @@
 #include <fcntl.h>
 
 #include "ruby.h"
+#ifdef HAVE_RUBY_VERSION_H
+#include "ruby/version.h"
+#endif
 
 #ifndef RSTRING_PTR
 #define RSTRING_PTR(str) (RSTRING(str)->ptr)
@@ -78,7 +81,7 @@ static VALUE fcgi_s_accept(VALUE self)
 {
   int status;
   FCGX_Request *req;
-  fd_set readfds;
+  rb_fdset_t readfds;
 
   req = ALLOC(FCGX_Request);
 
@@ -88,9 +91,9 @@ static VALUE fcgi_s_accept(VALUE self)
     return Qnil;
   }
 
-  FD_ZERO(&readfds);
-  FD_SET(req->listen_sock, &readfds);
-  if (select(req->listen_sock+1, &readfds, NULL, NULL, NULL) < 1) {
+  rb_fd_init(&readfds);
+  rb_fd_set(req->listen_sock, &readfds);
+  if (rb_thread_fd_select(readfds.maxfd, &readfds, NULL, NULL, NULL) < 1) {
     return Qnil;
   }
 
@@ -262,7 +265,9 @@ static VALUE fcgi_stream_putc(VALUE self, VALUE ch)
   FCGX_Stream *stream;
   int c;
 
+#if !defined(RUBY_API_VERSION_MAJOR) || (RUBY_API_VERSION_MAJOR < 3)
   rb_secure(4);
+#endif
   Data_Get_Stream(self, stream);
   if ((c = FCGX_PutChar(NUM2INT(ch), stream)) == EOF)
     CHECK_STREAM_ERROR(stream);
@@ -274,7 +279,9 @@ static VALUE fcgi_stream_write(VALUE self, VALUE str)
   FCGX_Stream *stream;
   int len;
 
+#if !defined(RUBY_API_VERSION_MAJOR) || (RUBY_API_VERSION_MAJOR < 3)
   rb_secure(4);
+#endif
   Data_Get_Stream(self, stream);
   str = rb_obj_as_string(str);
   len = FCGX_PutStr(RSTRING_PTR(str), RSTRING_LEN(str), stream);
@@ -407,9 +414,11 @@ static VALUE fcgi_stream_ungetc(VALUE self, VALUE ch)
   FCGX_Stream *stream;
   int c;
 
+#if !defined(RUBY_API_VERSION_MAJOR) || (RUBY_API_VERSION_MAJOR < 3)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
+#endif
   Data_Get_Stream(self, stream);
   c = FCGX_UnGetChar(NUM2INT(ch), stream);
   CHECK_STREAM_ERROR(stream);
@@ -422,9 +431,11 @@ static VALUE fcgi_stream_gets(VALUE self) {
   VALUE str = rb_str_new(0,0);
   OBJ_TAINT(str);
 
+#if !defined(RUBY_API_VERSION_MAJOR) || (RUBY_API_VERSION_MAJOR < 3)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
+#endif
 
   Data_Get_Stream(self, stream);
 
@@ -449,9 +460,11 @@ static VALUE fcgi_stream_read(int argc, VALUE *argv, VALUE self)
   char *buff;
   int n;
 
+#if !defined(RUBY_API_VERSION_MAJOR) || (RUBY_API_VERSION_MAJOR < 3)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
+#endif
 
   Data_Get_Stream(self, stream);
 
@@ -502,9 +515,11 @@ static VALUE fcgi_stream_eof(VALUE self)
 {
   FCGX_Stream *stream;
 
+#if !defined(RUBY_API_VERSION_MAJOR) || (RUBY_API_VERSION_MAJOR < 3)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
+#endif
   Data_Get_Stream(self, stream);
   return FCGX_HasSeenEOF(stream) ? Qtrue : Qfalse;
 }
@@ -513,9 +528,11 @@ static VALUE fcgi_stream_close(VALUE self)
 {
   FCGX_Stream *stream;
 
+#if !defined(RUBY_API_VERSION_MAJOR) || (RUBY_API_VERSION_MAJOR < 3)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: can't close");
   }
+#endif
   Data_Get_Stream(self, stream);
   if (FCGX_FClose(stream) == EOF)
     CHECK_STREAM_ERROR(stream);
@@ -532,33 +549,41 @@ static VALUE fcgi_stream_closed(VALUE self)
 
 static VALUE fcgi_stream_binmode(VALUE self)
 {
+#if !defined(RUBY_API_VERSION_MAJOR) || (RUBY_API_VERSION_MAJOR < 3)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
+#endif
   return self;
 }
 
 static VALUE fcgi_stream_isatty(VALUE self)
 {
+#if !defined(RUBY_API_VERSION_MAJOR) || (RUBY_API_VERSION_MAJOR < 3)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
+#endif
   return Qfalse;
 }
 
 static VALUE fcgi_stream_sync(VALUE self)
 {
+#if !defined(RUBY_API_VERSION_MAJOR) || (RUBY_API_VERSION_MAJOR < 3)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
+#endif
   return Qfalse;
 }
 
 static VALUE fcgi_stream_setsync(VALUE self,VALUE sync)
 {
+#if !defined(RUBY_API_VERSION_MAJOR) || (RUBY_API_VERSION_MAJOR < 3)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
+#endif
   return Qfalse;
 }
 

data/fcgi.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name = %q{fcgi}
-  s.version = "0.9.2.1"
+  s.version = "0.9.2.2"
   s.license = "MIT"
 
   s.authors = [%q{mva}]
-  s.date = %q{2013-09-30}
-  s.description = %q{FastCGI is a language independent, scalable, open extension to CGI that provides high performance without the limitations of server specific APIs. This version aims to be compatible with both 1.8.x and 1.9.x versions of Ruby, and also will be ported to 2.0.x.}
+  s.date = %q{2022-10-17}
+  s.description = %q{FastCGI is a language independent, scalable, open extension to CGI that provides high performance without the limitations of server specific APIs. This version aims to be compatible with both 1.8.x and 1.9.x versions of Ruby, and also will be ported to 2.0.x. It has been hacked to work with Ruby 3.0.x.}
   s.email = %q{mva@mva.name}
   s.extensions = [%q{ext/fcgi/extconf.rb}]
   s.extra_rdoc_files = [

data/lib/fcgi.rb

@@ -115,7 +115,7 @@ rescue LoadError # Load the pure ruby version instead
       end
 
       def session
-        sock, addr = *@server.accept
+        sock, _ = *@server.accept
         return unless sock
         fsock = FastCGISocket.new(sock)
         req = next_request(fsock)
@@ -196,7 +196,7 @@ rescue LoadError # Load the pure ruby version instead
       def read_record
         header = @socket.read(Record::HEADER_LENGTH) or return nil
         return nil unless header.size == Record::HEADER_LENGTH
-        version, type, reqid, clen, padlen, reserved = *Record.parse_header(header)
+        _, type, reqid, clen, padlen, _ = *Record.parse_header(header)
         Record.class_for(type).parse(reqid, read_record_body(clen, padlen))
       end
 
@@ -356,7 +356,7 @@ rescue LoadError # Load the pure ruby version instead
       BODY_FORMAT = 'nCC5'
 
       def BeginRequestRecord.parse(id, body)
-        role, flags, *reserved = *body.unpack(BODY_FORMAT)
+        role, flags, *_ = *body.unpack(BODY_FORMAT)
         new(id, role, flags)
       end
 
@@ -626,7 +626,6 @@ class FCGI
     if FCGI::is_cgi?
       yield ::CGI.new(*args)
     else
-      exit_requested = false
       FCGI::each do |request|
 
         $stdout, $stderr = request.out, request.err

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: fcgi
 version: !ruby/object:Gem::Version
-  version: 0.9.2.1
+  version: 0.9.2.2
 platform: ruby
 authors:
 - mva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies: []
 description: FastCGI is a language independent, scalable, open extension to CGI that
   provides high performance without the limitations of server specific APIs. This
   version aims to be compatible with both 1.8.x and 1.9.x versions of Ruby, and also
-  will be ported to 2.0.x.
+  will be ported to 2.0.x. It has been hacked to work with Ruby 3.0.x.
 email: mva@mva.name
 executables: []
 extensions:
@@ -23,41 +23,40 @@ extra_rdoc_files:
 - README.rdoc
 - README.signals
 files:
+- LICENSE
+- README.rdoc
+- README.signals
 - VERSION
 - ext/fcgi/MANIFEST
 - ext/fcgi/Makefile
 - ext/fcgi/extconf.rb
 - ext/fcgi/fcgi.c
-- lib/fcgi.rb
 - fcgi.gemspec
-- LICENSE
-- README.rdoc
-- README.signals
+- lib/fcgi.rb
 - test/helper.rb
 - test/test_fcgi.rb
 homepage: http://github.com/alphallc/ruby-fcgi-ng
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
-signing_key: 
+rubygems_version: 3.3.8
+signing_key:
 specification_version: 4
 summary: FastCGI library for Ruby.
 test_files: