fcgi 0.9.1 → 0.9.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: be3a36a6ec0bff57b024aee3540e6c5dd755e314
+  data.tar.gz: 3a6f6137b7012ba0a429a67247c682a933167950
+SHA512:
+  metadata.gz: a3b52ffbf272b3401bfe5f3fb0a0213d730c69eb971ec790144dff1517c157e63aa23c336e6b849749637d0d14cb9f1e69d1b465937295c54505df956866f2cc
+  data.tar.gz: 951c84b5af5de03c78e464f90a4974b537edc68ab020f1ec4a75e879e7413abb657c1ae6e033a74ecfdb788e5f4f2528bae6461114489bce3418fc5a60c745bd

data/README.rdoc

@@ -1,6 +1,6 @@
 = fcgi - The New generation of FastCGI library for Ruby.
 
-Version 0.9.1
+Version 0.9.2
 
 == Depends
 
@@ -12,7 +12,7 @@ Version 0.9.1
 
 == Install
 
-  $ gem install ruby-fcgi-ng
+  $ gem install fcgi
 
 == Usage
 === Class Method
@@ -100,7 +100,7 @@ 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>
+             0.9   Copyright (C) 2013 mva <mva@mva.name> Alpha, LLC
 
   fastcgi.rb 0.7   Copyright (C) 2001 Eli Green
   fcgi.rb    0.8   Copyright (C) 2002 MoonWolf <moonwolf@moonwolf.com>

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/ext/fcgi/fcgi.c

@@ -35,6 +35,11 @@ static VALUE eFCGIStreamProtocolError;
 static VALUE eFCGIStreamParamsError;
 static VALUE eFCGIStreamCallSeqError;
 
+typedef struct fcgi_stream_data {
+  VALUE req;
+  FCGX_Stream *stream;
+} fcgi_stream_data;
+
 typedef struct fcgi_data {
   FCGX_Request *req;
   VALUE in;
@@ -43,9 +48,18 @@ typedef struct fcgi_data {
   VALUE env;
 } fcgi_data;
 
+static void fcgi_stream_mark(fcgi_stream_data *stream_data)
+{
+  rb_gc_mark(stream_data->req);
+}
+
+static void fcgi_stream_free(fcgi_stream_data *stream_data)
+{
+  free(stream_data);
+}
+
 static void fcgi_mark(fcgi_data *data)
 {
-/*  rb_gc_mark(data->req); */
   rb_gc_mark(data->in);
   rb_gc_mark(data->out);
   rb_gc_mark(data->err);
@@ -54,6 +68,7 @@ static void fcgi_mark(fcgi_data *data)
 
 static void fcgi_free_req(fcgi_data *data)
 {
+  FCGX_Free(data->req, 1);
   free(data->req);
   free(data);
 }
@@ -74,13 +89,14 @@ static VALUE fcgi_s_accept(VALUE self)
 
   FD_ZERO(&readfds);
   FD_SET(req->listen_sock, &readfds);
-  if (rb_thread_select(req->listen_sock+1, &readfds, NULL, NULL, NULL) < 1) {
+  if (select(req->listen_sock+1, &readfds, NULL, NULL, NULL) < 1) {
     return Qnil;
   }
 
   status = FCGX_Accept_r(req);
   if (status >= 0) {
     fcgi_data *data;
+    fcgi_stream_data *stream_data;
     char      **env;
     VALUE     obj,key, value;
     char      *pkey,*pvalue;
@@ -96,9 +112,15 @@ static VALUE fcgi_s_accept(VALUE self)
 
     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);
-    data->out = Data_Wrap_Struct(cFCGIStream, 0, 0, req->out);
-    data->err = Data_Wrap_Struct(cFCGIStream, 0, 0, req->err);
+    data->in = Data_Make_Struct(cFCGIStream, fcgi_stream_data, fcgi_stream_mark, fcgi_stream_free, stream_data);
+    stream_data->stream = req->in;
+    stream_data->req = obj;
+    data->out = Data_Make_Struct(cFCGIStream, fcgi_stream_data, fcgi_stream_mark, fcgi_stream_free, stream_data);
+    stream_data->stream = req->out;
+    stream_data->req = obj;
+    data->err = Data_Make_Struct(cFCGIStream, fcgi_stream_data, fcgi_stream_mark, fcgi_stream_free, stream_data);
+    stream_data->stream = req->err;
+    stream_data->req = obj;
     data->env = rb_hash_new();
     env = req->envp;
     for (; *env; env++) {
@@ -115,6 +137,8 @@ static VALUE fcgi_s_accept(VALUE self)
 
     return obj;
   } else {
+    FCGX_Free(req, 1);
+    free(req);
     return Qnil;
   }
 }
@@ -173,9 +197,24 @@ static VALUE fcgi_env(VALUE self)
 static VALUE fcgi_finish(VALUE self)
 {
   fcgi_data *data;
+  fcgi_stream_data *stream_data;
 
   Data_Get_Struct(self, fcgi_data, data);
 
+  if (Qnil != data->in) {
+    Data_Get_Struct(data->in, fcgi_stream_data, stream_data);
+    stream_data->req = Qnil; stream_data->stream = NULL;
+  }
+  if (Qnil != data->out) {
+    Data_Get_Struct(data->out, fcgi_stream_data, stream_data);
+    stream_data->req = Qnil; stream_data->stream = NULL;
+  }
+  if (Qnil != data->err) {
+    Data_Get_Struct(data->err, fcgi_stream_data, stream_data);
+    stream_data->req = Qnil; stream_data->stream = NULL;
+  }
+
+  data->in = data->out = data->err = Qnil;
   FCGX_Finish_r(data->req);
 
   return Qtrue;
@@ -186,8 +225,7 @@ static VALUE fcgi_finish(VALUE self)
 	extern int errno; \
   if (err) {\
     if (err > 0) {\
-			errno = err;\
-      rb_sys_fail(NULL);\
+      rb_raise(eFCGIStreamError, "unknown error (syscall error)");\
     }\
     else {\
       switch (err) {\
@@ -211,13 +249,20 @@ static VALUE fcgi_finish(VALUE self)
   }\
 }
 
+#define Data_Get_Stream(value, stream) do {\
+    fcgi_stream_data* _fsd;\
+    Data_Get_Struct(value, fcgi_stream_data, _fsd);\
+    if (NULL == (stream = _fsd->stream))\
+      rb_raise(eFCGIStreamError, "stream invalid as fastcgi request is already finished");\
+  } while (0)
+
 static VALUE fcgi_stream_putc(VALUE self, VALUE ch)
 {
   FCGX_Stream *stream;
   int c;
 
   rb_secure(4);
-  Data_Get_Struct(self, FCGX_Stream, stream);
+  Data_Get_Stream(self, stream);
   if ((c = FCGX_PutChar(NUM2INT(ch), stream)) == EOF)
     CHECK_STREAM_ERROR(stream);
   return INT2NUM(c);
@@ -229,7 +274,7 @@ static VALUE fcgi_stream_write(VALUE self, VALUE str)
   int len;
 
   rb_secure(4);
-  Data_Get_Struct(self, FCGX_Stream, stream);
+  Data_Get_Stream(self, stream);
   str = rb_obj_as_string(str);
   len = FCGX_PutStr(RSTRING_PTR(str), RSTRING_LEN(str), stream);
   if (len == EOF) CHECK_STREAM_ERROR(stream);
@@ -335,7 +380,7 @@ static VALUE fcgi_stream_flush(VALUE self)
 {
   FCGX_Stream *stream;
 
-  Data_Get_Struct(self, FCGX_Stream, stream);
+  Data_Get_Stream(self, stream);
   if (FCGX_FFlush(stream) == EOF)
     CHECK_STREAM_ERROR(stream);
   return Qnil;
@@ -346,7 +391,7 @@ static VALUE fcgi_stream_getc(VALUE self)
   FCGX_Stream *stream;
   int c;
 
-  Data_Get_Struct(self, FCGX_Stream, stream);
+  Data_Get_Stream(self, stream);
   if ((c = FCGX_GetChar(stream)) == EOF) {
     CHECK_STREAM_ERROR(stream);
     return Qnil;
@@ -364,7 +409,7 @@ static VALUE fcgi_stream_ungetc(VALUE self, VALUE ch)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
-  Data_Get_Struct(self, FCGX_Stream, stream);
+  Data_Get_Stream(self, stream);
   c = FCGX_UnGetChar(NUM2INT(ch), stream);
   CHECK_STREAM_ERROR(stream);
   return INT2NUM(c);
@@ -380,7 +425,7 @@ static VALUE fcgi_stream_gets(VALUE self) {
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
 
-  Data_Get_Struct(self, FCGX_Stream, stream);
+  Data_Get_Stream(self, stream);
 
   for (;;) {
     if (FCGX_GetLine(buff, BUFSIZ, stream) == NULL) {
@@ -407,7 +452,7 @@ static VALUE fcgi_stream_read(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
 
-  Data_Get_Struct(self, FCGX_Stream, stream);
+  Data_Get_Stream(self, stream);
 
   if (argc==0) {
     buff = ALLOC_N(char, 16384);
@@ -459,7 +504,7 @@ static VALUE fcgi_stream_eof(VALUE self)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
   }
-  Data_Get_Struct(self, FCGX_Stream, stream);
+  Data_Get_Stream(self, stream);
   return FCGX_HasSeenEOF(stream) ? Qtrue : Qfalse;
 }
 
@@ -470,7 +515,7 @@ static VALUE fcgi_stream_close(VALUE self)
   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
     rb_raise(rb_eSecurityError, "Insecure: can't close");
   }
-  Data_Get_Struct(self, FCGX_Stream, stream);
+  Data_Get_Stream(self, stream);
   if (FCGX_FClose(stream) == EOF)
     CHECK_STREAM_ERROR(stream);
   return Qnil;
@@ -480,7 +525,7 @@ static VALUE fcgi_stream_closed(VALUE self)
 {
   FCGX_Stream *stream;
 
-  Data_Get_Struct(self, FCGX_Stream, stream);
+  Data_Get_Stream(self, stream);
   return stream->isClosed ? Qtrue : Qfalse;
 }
 

data/fcgi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{fcgi}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.authors = [%q{mva}]
   s.date = %q{2013-02-20}

data/lib/fcgi.rb

@@ -1,6 +1,6 @@
 =begin
 
-fcgi.rb 0.9.0 - fcgi.so compatible pure-ruby FastCGI library
+fcgi.rb 0.9.2 - fcgi.so compatible pure-ruby FastCGI library
 
 fastcgi.rb Copyright (C) 2001 Eli Green
 fcgi.rb    Copyright (C) 2002-2003 MoonWolf <moonwolf@moonwolf.com>
@@ -18,12 +18,12 @@ begin
 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?
       begin
         s = Socket.for_fd($stdin.fileno)
@@ -113,7 +113,7 @@ rescue LoadError # Load the pure ruby version instead
           exit 0 if graceful
         end
       end
-      
+
       def session
         sock, addr = *@server.accept
         return unless sock
@@ -368,7 +368,7 @@ rescue LoadError # Load the pure ruby version instead
 
       attr_reader :role
       attr_reader :flags
-      
+
       def make_body
         [@role, @flags, 0, 0, 0, 0, 0].pack(BODY_FORMAT)
       end
@@ -448,14 +448,14 @@ rescue LoadError # Load the pure ruby version instead
         end
         result
       end
-      
+
       def self.read_pair(buf)
         nlen = read_length(buf)
         vlen = read_length(buf)
         [buf.slice!(0, nlen), buf.slice!(0, vlen)]
       end
-      
-      
+
+
       if "".respond_to?(:bytes) # Ruby 1.9 string semantics
         def self.read_length(buf)
           if buf[0].bytes.first >> 7 == 0
@@ -587,7 +587,7 @@ end # begin
 class FCGI
   def self.each_cgi(*args)
     require 'cgi'
-    
+
     eval(<<-EOS,TOPLEVEL_BINDING)
     class CGI
       public :env_table
@@ -622,17 +622,17 @@ class FCGI
       end # FCGI::CGI class
     end # FCGI class
     EOS
-    
+
     if FCGI::is_cgi?
       yield ::CGI.new(*args)
     else
       exit_requested = false
       FCGI::each do |request|
-        
+
         $stdout, $stderr = request.out, request.err
-        
+
         yield CGI.new(request, *args)
-        
+
         request.finish
       end
     end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcgi
 version: !ruby/object:Gem::Version
-  version: 0.9.1
-  prerelease: 
+  version: 0.9.2
 platform: ruby
 authors:
 - mva
@@ -38,28 +37,27 @@ files:
 - test/test_fcgi.rb
 homepage: http://github.com/alphallc/ruby-fcgi-ng
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 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: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: FastCGI library for Ruby.
 test_files:
 - test/helper.rb