fcgi 0.8.8 → 0.9.1

data/LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2009 saks
+Copyright (c) 2013 mva
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{README → README.rdoc}

@@ -1,6 +1,6 @@
-= fcgi - FastCGI library for Ruby
+= fcgi - The New generation of FastCGI library for Ruby.
 
-Version 0.8.7
+Version 0.9.1
 
 == Depends
 
@@ -12,11 +12,7 @@ Version 0.8.7
 
 == Install
 
-  $ ruby install.rb config
-    (Pure Ruby Version: ruby install.rb config --without-ext)
-    (Some systems need: ruby install.rb config -- --with-fcgi-include=/usr/local/include --with-fcgi-lib=/usr/local/lib)
-  $ ruby install.rb setup
-  # ruby install.rb install
+  $ gem install ruby-fcgi-ng
 
 == Usage
 === Class Method
@@ -42,7 +38,6 @@ Version 0.8.7
     used in this way, as it dynamically adds a large number of methods
     to itself each time a new instance is created.
 
-
 === Instance Method
 --- FCGI#finish
     Finish
@@ -60,11 +55,12 @@ Version 0.8.7
     Returns Environment(Hash)
 
 == Sample
+
 Using the FastCGI native interface:
 
   #!/usr/bin/ruby
   require "fcgi"
-  
+
   FCGI.each {|request|
     out = request.out
     out.print "Content-Type: text/plain\r\n"
@@ -104,7 +100,9 @@ standard CGI library.
 
   fcgi.c     0.1   Copyright (C) 1998-1999  Network Applied Communication Laboratory, Inc.
              0.8   Copyright (C) 2002 MoonWolf <moonwolf@moonwolf.com>
+             0.9   Copyright (C) 2013 MoonWolf <mva@mva.name>
 
   fastcgi.rb 0.7   Copyright (C) 2001 Eli Green
   fcgi.rb    0.8   Copyright (C) 2002 MoonWolf <moonwolf@moonwolf.com>
   fcgi.rb    0.8.5 Copyright (C) 2004 Minero Aoki
+

data/README.signals

@@ -44,8 +44,8 @@ thread is supposed to write a message every 10 seconds, but under older
 versions of ruby-fcgi it does not do so if it is waiting for a new request.
 
   #!/usr/local/bin/ruby
-  require "fcgi" 
-  
+  require "fcgi"
+
   Thread.new do
     f = File.new("/tmp/fcgi.log","a")
     f.sync=true

data/VERSION

@@ -0,0 +1 @@
+0.9.1

data/ext/fcgi/Makefile

@@ -0,0 +1 @@
+# Use ruby extconf.rb to generate makefile

data/ext/fcgi/fcgi.c

@@ -11,12 +11,21 @@
 #include <fcntl.h>
 
 #include "ruby.h"
+
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(str) (RSTRING(str)->ptr)
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(str) (RSTRING(str)->len)
+#endif
+
 #ifdef HAVE_FASTCGI_FCGIAPP_H
 #include <fastcgi/fcgiapp.h>
 #else
 #include "fcgiapp.h"
 #endif
 
+
 static VALUE cFCGI;
 static VALUE eFCGIError;
 static VALUE cFCGIStream;
@@ -54,9 +63,9 @@ static VALUE fcgi_s_accept(VALUE self)
   int status;
   FCGX_Request *req;
   fd_set readfds;
-  
+
   req = ALLOC(FCGX_Request);
-  
+
   status = FCGX_InitRequest(req,0,0);
   if (status != 0) {
     rb_raise(eFCGIError, "FCGX_Init() failed");
@@ -68,7 +77,7 @@ static VALUE fcgi_s_accept(VALUE self)
   if (rb_thread_select(req->listen_sock+1, &readfds, NULL, NULL, NULL) < 1) {
     return Qnil;
   }
-  
+
   status = FCGX_Accept_r(req);
   if (status >= 0) {
     fcgi_data *data;
@@ -84,7 +93,7 @@ static VALUE fcgi_s_accept(VALUE self)
     if (flags & O_NONBLOCK) {
        fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
     }
-    
+
     obj = Data_Make_Struct(self, fcgi_data, fcgi_mark, fcgi_free_req, data);
     data->req = req;
     data->in  = Data_Wrap_Struct(cFCGIStream, 0, 0, req->in);
@@ -103,7 +112,7 @@ static VALUE fcgi_s_accept(VALUE self)
       OBJ_TAINT(value);
       rb_hash_aset(data->env, key, value);
     }
-    
+
     return obj;
   } else {
     return Qnil;
@@ -113,7 +122,7 @@ static VALUE fcgi_s_accept(VALUE self)
 static VALUE fcgi_s_each(VALUE self)
 {
   VALUE fcgi;
-  
+
   while ((fcgi = fcgi_s_accept(self)) != Qnil) {
     rb_yield(fcgi);
   }
@@ -164,11 +173,11 @@ static VALUE fcgi_env(VALUE self)
 static VALUE fcgi_finish(VALUE self)
 {
   fcgi_data *data;
-  
+
   Data_Get_Struct(self, fcgi_data, data);
-  
+
   FCGX_Finish_r(data->req);
-  
+
   return Qtrue;
 }
 
@@ -266,16 +275,19 @@ static VALUE fcgi_stream_printf(int argc, VALUE *argv, VALUE out)
 
 static VALUE fcgi_stream_puts _((int, VALUE*, VALUE));
 
-static VALUE fcgi_stream_puts_ary(VALUE ary, VALUE out)
+static VALUE fcgi_stream_puts_ary(VALUE ary, VALUE out, int recur)
 {
   VALUE tmp;
   int i;
 
+  if (recur) {
+    tmp = rb_str_new2("[...]");
+    fcgi_stream_puts(1, &tmp, out);
+    return Qnil;
+  }
+
   for (i=0; i<RARRAY_LEN(ary); i++) {
     tmp = RARRAY_PTR(ary)[i];
-    if (rb_inspecting_p(tmp)) {
-      tmp = rb_str_new2("[...]");
-    }
     fcgi_stream_puts(1, &tmp, out);
   }
   return Qnil;
@@ -297,7 +309,7 @@ static VALUE fcgi_stream_puts(int argc, VALUE *argv, VALUE out)
       line = rb_str_new2("nil");
       break;
     case T_ARRAY:
-      rb_protect_inspect(fcgi_stream_puts_ary, argv[i], out);
+      rb_exec_recursive(fcgi_stream_puts_ary, argv[i], out);
       continue;
     default:
       line = argv[i];
@@ -358,11 +370,10 @@ static VALUE fcgi_stream_ungetc(VALUE self, VALUE ch)
   return INT2NUM(c);
 }
 
-static VALUE fcgi_stream_gets(VALUE self)
-{
+static VALUE fcgi_stream_gets(VALUE self) {
   FCGX_Stream *stream;
   char buff[BUFSIZ];
-  VALUE str = rb_str_new("", 0);
+  VALUE str = rb_str_new(0,0);
   OBJ_TAINT(str);
 
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
@@ -408,7 +419,7 @@ static VALUE fcgi_stream_read(int argc, VALUE *argv, VALUE self)
     }
     str = rb_str_new(buff, n);
     OBJ_TAINT(str);
-    
+
     while(!FCGX_HasSeenEOF(stream)) {
       n = FCGX_GetStr(buff, 16384, stream);
       CHECK_STREAM_ERROR(stream);
@@ -508,9 +519,9 @@ static VALUE fcgi_stream_setsync(VALUE self,VALUE sync)
 
 
 void Init_fcgi() {
-  
+
   FCGX_Init();
-  
+
   cFCGI = rb_define_class("FCGI", rb_cObject);
   eFCGIError =rb_define_class_under(cFCGI, "Error", rb_eStandardError);
   rb_define_singleton_method(cFCGI, "accept", fcgi_s_accept, 0);
@@ -522,7 +533,7 @@ void Init_fcgi() {
   rb_define_method(cFCGI, "err", fcgi_err, 0);
   rb_define_method(cFCGI, "env", fcgi_env, 0);
   rb_define_method(cFCGI, "finish", fcgi_finish, 0);
-  
+
   cFCGIStream = rb_define_class_under(cFCGI, "Stream", rb_cObject);
   eFCGIStreamError =rb_define_class_under(cFCGIStream, "Error", rb_eStandardError);
   eFCGIStreamUnsupportedVersionError =

data/fcgi.gemspec

@@ -0,0 +1,33 @@
+Gem::Specification.new do |s|
+  s.name = %q{fcgi}
+  s.version = "0.9.1"
+
+  s.authors = [%q{mva}]
+  s.date = %q{2013-02-20}
+  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.email = %q{mva@mva.name}
+  s.extensions = [%q{ext/fcgi/extconf.rb}]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc",
+    "README.signals"
+  ]
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.files = [
+    "VERSION",
+    "ext/fcgi/MANIFEST",
+    "ext/fcgi/Makefile",
+    "ext/fcgi/extconf.rb",
+    "ext/fcgi/fcgi.c",
+    "lib/fcgi.rb",
+    "fcgi.gemspec"
+  ]
+  s.test_files = [
+    "test/helper.rb",
+    "test/test_fcgi.rb"
+  ]
+  s.homepage = %q{http://github.com/alphallc/ruby-fcgi-ng}
+  s.require_paths = [%q{lib}]
+  s.summary = %q{FastCGI library for Ruby.}
+end
+

data/lib/fcgi.rb

@@ -1,25 +1,30 @@
 =begin
 
-fcgi.rb 0.8.5 - fcgi.so compatible pure-ruby FastCGI library
+fcgi.rb 0.9.0 - fcgi.so compatible pure-ruby FastCGI library
 
 fastcgi.rb Copyright (C) 2001 Eli Green
 fcgi.rb    Copyright (C) 2002-2003 MoonWolf <moonwolf@moonwolf.com>
 fcgi.rb    Copyright (C) 2004 Minero Aoki
+fcgi.rb    Copyright (C) 2011 saks and Julik Tarkhanov
+fcgi.rb    Copyright (C) 2012-2013 mva
 
 =end
 trap('SIGTERM') { exit }
 trap('SIGPIPE','IGNORE')
 
 begin
-  raise LoadError if defined?(FCGI_PURE_RUBY) && FCGI_PURE_RUBY
+  raise LoadError if ENV["USE_PURE_RUBY_FCGI"]
   require "fcgi.so"
-rescue LoadError
+rescue LoadError # Load the pure ruby version instead
+  # At this point we do have STDERR so put it to some good use
+  $stderr.puts "Your FCGI gem does not contain the FCGI shared library, running pure ruby instead"
+  
   require 'socket'
   require 'stringio'
-
+  
   class FCGI
-
-    def self::is_cgi?
+    
+    def self.is_cgi?
       begin
         s = Socket.for_fd($stdin.fileno)
         s.getpeername
@@ -31,21 +36,21 @@ rescue LoadError
       end
     end
 
-    def self::each(&block)
+    def self.each(&block)
       f = default_connection()
       Server.new(f).each_request(&block)
     ensure
       f.close if f
     end
 
-    def self::each_request(&block)
+    def self.each_request(&block)
       f = default_connection()
       Server.new(f).each_request(&block)
     ensure
       f.close if f
     end
 
-    def self::default_connection
+    def self.default_connection
       ::Socket.for_fd($stdin.fileno)
     end
 
@@ -306,11 +311,11 @@ rescue LoadError
       HEADER_FORMAT = 'CCnnCC'
       HEADER_LENGTH = 8
 
-      def self::parse_header(buf)
+      def self.parse_header(buf)
         return *buf.unpack(HEADER_FORMAT)
       end
 
-      def self::class_for(type)
+      def self.class_for(type)
         RECORD_CLASS[type]
       end
 
@@ -385,7 +390,7 @@ rescue LoadError
       # uint8_t  reserved[3];
       BODY_FORMAT = 'NCC3'
 
-      def self::parse(id, body)
+      def self.parse(id, body)
         appstatus, protostatus, *reserved = *body.unpack(BODY_FORMAT)
         new(id, appstatus, protostatus)
       end
@@ -411,7 +416,7 @@ rescue LoadError
       # uint8_t reserved[7];
       BODY_FORMAT = 'CC7'
 
-      def self::parse(id, body)
+      def self.parse(id, body)
         type, *reserved = *body.unpack(BODY_FORMAT)
         new(id, type)
       end
@@ -431,11 +436,11 @@ rescue LoadError
     end
 
     class ValuesRecord < Record
-      def self::parse(id, body)
+      def self.parse(id, body)
         new(id, parse_values(body))
       end
 
-      def self::parse_values(buf)
+      def self.parse_values(buf)
         result = {}
         until buf.empty?
           name, value = *read_pair(buf)
@@ -444,16 +449,28 @@ rescue LoadError
         result
       end
       
-      def self::read_pair(buf)
+      def self.read_pair(buf)
         nlen = read_length(buf)
         vlen = read_length(buf)
-        return buf.slice!(0, nlen), buf.slice!(0, vlen)
+        [buf.slice!(0, nlen), buf.slice!(0, vlen)]
       end
       
-      def self::read_length(buf)
-        if buf[0] >> 7 == 0
-        then buf.slice!(0,1)[0]
-        else buf.slice!(0,4).unpack('N')[0] & ((1<<31) - 1)
+      
+      if "".respond_to?(:bytes) # Ruby 1.9 string semantics
+        def self.read_length(buf)
+          if buf[0].bytes.first >> 7 == 0
+            buf.slice!(0,1)[0].bytes.first
+          else
+            buf.slice!(0,4).unpack('N')[0] & ((1<<31) - 1)
+          end
+        end
+      else # Ruby 1.8 string
+        def self.read_length(buf)
+          if buf[0] >> 7 == 0
+            buf.slice!(0,1)[0].bytes.first
+          else
+            buf.slice!(0,4).unpack('N')[0] & ((1<<31) - 1)
+          end
         end
       end
 
@@ -502,7 +519,7 @@ rescue LoadError
     end
 
     class GenericDataRecord < Record
-      def self::parse(id, body)
+      def self.parse(id, body)
         new(id, body)
       end
 
@@ -520,7 +537,11 @@ rescue LoadError
       private
 
       def make_body
-        @flagment
+        if @flagment.respond_to? 'force_encoding' then
+          return @flagment.dup.force_encoding('BINARY')
+        else
+          return @flagment
+        end
       end
     end
 
@@ -564,13 +585,13 @@ end # begin
 # are defined within module 'CGI', even if you have subclassed it
 
 class FCGI
-  def self::each_cgi(*args)
+  def self.each_cgi(*args)
     require 'cgi'
     
     eval(<<-EOS,TOPLEVEL_BINDING)
     class CGI
       public :env_table
-      def self::remove_params
+      def self.remove_params
         if (const_defined?(:CGI_PARAMS))
           remove_const(:CGI_PARAMS)
           remove_const(:CGI_COOKIES)
@@ -606,13 +627,14 @@ class FCGI
       yield ::CGI.new(*args)
     else
       exit_requested = false
-      FCGI::each {|request|
+      FCGI::each do |request|
+        
         $stdout, $stderr = request.out, request.err
-
+        
         yield CGI.new(request, *args)
         
         request.finish
-      }
+      end
     end
   end
 end

data/test/helper.rb

@@ -0,0 +1,9 @@
+require 'rubygems'
+require 'test/unit'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'fcgi'
+
+class Test::Unit::TestCase
+end

data/test/test_fcgi.rb

@@ -0,0 +1,7 @@
+require 'helper'
+
+class TestFcgi < Test::Unit::TestCase
+  def test_something_for_real
+    flunk "hey buddy, you should probably rename this file and start testing for real"
+  end
+end

metadata

@@ -1,55 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fcgi
-version: !ruby/object:Gem::Version 
-  version: 0.8.8
+version: !ruby/object:Gem::Version
+  version: 0.9.1
+  prerelease: 
 platform: ruby
-authors: []
-
-autorequire: fcgi
+authors:
+- mva
+autorequire: 
 bindir: bin
-cert_chain: 
-date: 2009-11-13 07:23:00 -05:00
-default_executable: 
+cert_chain: []
+date: 2013-02-20 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. For more information, see http://www.fastcgi.com/.
-email: 
+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.
+email: mva@mva.name
 executables: []
-
-extensions: 
+extensions:
 - ext/fcgi/extconf.rb
-extra_rdoc_files: []
-
-files: 
-- lib/fcgi.rb
+extra_rdoc_files:
+- LICENSE
+- README.rdoc
+- README.signals
+files:
+- VERSION
+- ext/fcgi/MANIFEST
+- ext/fcgi/Makefile
 - ext/fcgi/extconf.rb
 - ext/fcgi/fcgi.c
-- ext/fcgi/MANIFEST
-- ChangeLog
-- README
+- lib/fcgi.rb
+- fcgi.gemspec
+- LICENSE
+- README.rdoc
 - README.signals
-has_rdoc: false
-homepage: 
+- test/helper.rb
+- test/test_fcgi.rb
+homepage: http://github.com/alphallc/ruby-fcgi-ng
 licenses: []
-
 post_install_message: 
-rdoc_options: []
-
-require_paths: 
+rdoc_options:
+- --charset=UTF-8
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-required_rubygems_version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: fcgi
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 1
+specification_version: 3
 summary: FastCGI library for Ruby.
-test_files: []
-
+test_files:
+- test/helper.rb
+- test/test_fcgi.rb

data/ChangeLog

@@ -1,30 +0,0 @@
-Sun Jun 25 12:46:14 JST 2006  moonwolf@moonwolf.com
-  * patch from http://www.kbmj.com/tech/index.php?itemid=26
-  * patch from http://sean.treadway.info/articles/2005/12/24/open-season-for-eagain
-
-Fri Apr  1 10:20:14 JST 2005  sugi@nemui.org
-  * Include errno.h
-
-Fri Apr  1 08:09:13 JST 2005  aredridel@nbtsc.org
-  * Report actual errors
-  
-  Adds reporting of errors fcgi experiences. Credit to David Heinemier Hansson 
-  for discovery.
-
-Fri Apr  1 08:08:07 JST 2005  aredridel@nbtsc.org
-  * FHS Include Paths
-
-Wed Mar 30 21:45:11 JST 2005  sugi@nemui.org
-  * 16k+request-memleak
-  fix memory leak when 16k+/reqest.
-  from http://enigo.com/projects/iowa/fcgipatch.html
-
-Wed Mar 30 21:43:02 JST 2005  sugi@nemui.org
-  * fix-check_stream_error
-  Simple fix in CHECK_STREAM_ERROR for Potential DoS
-  see http://groups-beta.google.com/group/comp.lang.ruby/browse_thread/thread/f51e79974a454b70/54fe207411e9eb05
-  for details.
-
-Wed Mar 30 21:40:22 JST 2005  sugi@nemui.org
-  * init-from-0.8.5
-  Initalize DARCS repository from MoonWolf's 0.8.5 release.