fcgi 0.8.5 → 0.8.6

data/ChangeLog

@@ -0,0 +1,26 @@
+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.

data/Makefile

@@ -0,0 +1,131 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = ext/fcgi
+topdir = /opt/local/lib/ruby/1.8/powerpc-darwin8.1.0
+hdrdir = $(topdir)
+VPATH = $(srcdir)
+prefix = $(DESTDIR)/opt/local
+exec_prefix = $(prefix)
+sitedir = $(prefix)/lib/ruby/site_ruby
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+builddir = $(ac_builddir)
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+vendordir = $(prefix)/lib/ruby/vendor_ruby
+compile_dir = $(DESTDIR)/opt/local/var/db/dports/build/file._opt_local_var_db_dports_sources_rsync.rsync.opendarwin.org_dpupdate_dports_lang_ruby/work/ruby-1.8.2
+datadir = $(prefix)/share
+includedir = $(prefix)/include
+infodir = $(prefix)/info
+top_builddir = $(ac_top_builddir)
+sysconfdir = $(prefix)/etc
+mandir = $(DESTDIR)/opt/local/share/man
+libdir = $(exec_prefix)/lib
+sharedstatedir = $(prefix)/com
+oldincludedir = $(DESTDIR)/usr/include
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorarchdir = $(vendorlibdir)/$(vendorarch)
+bindir = $(exec_prefix)/bin
+localstatedir = $(prefix)/var
+vendorlibdir = $(vendordir)/$(ruby_version)
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = gcc
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+CFLAGS   =  -fno-common -O -pipe -I/opt/local/include  -fno-common -pipe -fno-common 
+CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) -DHAVE_FCGIAPP_H -O -pipe -I/opt/local/include
+CXXFLAGS = $(CFLAGS) 
+DLDFLAGS = -L/opt/local/lib  
+LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = $(RUBY_INSTALL_NAME)
+arch = powerpc-darwin8.1.0
+sitearch = powerpc-darwin8.1.0
+vendorarch = powerpc-darwin8.1.0
+ruby_version = 1.8
+ruby = /opt/local/bin/ruby
+RUBY = $(ruby)
+RM = $(RUBY) -run -e rm -- -f
+MAKEDIRS = $(RUBY) -run -e mkdir -- -p
+INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755
+INSTALL_DATA = $(RUBY) -run -e install -- -vpm 0644
+
+#### End of system configuration section. ####
+
+
+LIBPATH =  -L"$(libdir)"
+DEFFILE = 
+
+CLEANFILES = 
+DISTCLEANFILES = 
+
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED) -lfcgi  -ldl -lobjc  
+OBJS = fcgi.o
+TARGET = fcgi
+DLLIB = $(TARGET).bundle
+STATIC_LIB = $(TARGET).a
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+CLEANLIBS     = "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB)
+CLEANOBJS     = "*.{o,a,s[ol],pdb,bak}"
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@$(RM) Makefile extconf.h conftest.* mkmf.log
+		@$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: $(RUBYARCHDIR)
+install: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB) $(RUBYARCHDIR)
+	@$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+$(RUBYARCHDIR):
+	@$(MAKEDIRS) $(RUBYARCHDIR)
+
+site-install: install
+
+.SUFFIXES: .c .cc .m .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.c.o:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
+$(DLLIB): $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) $(DLDFLAGS) $(LIBPATH) -o $(DLLIB) $(OBJS) $(LOCAL_LIBS) $(LIBS)
+
+$(STATIC_LIB): $(OBJS)
+	$(AR) cru $@ $(OBJS)
+	@-ranlib $(DLLIB) 2> /dev/null || true
+

data/README

@@ -5,7 +5,7 @@ Version 0.8.5
 == Depends
 
 === C version
-  * http://www.fastcgi.com/#TheDevKit
+  * ((<libfcgi|URL:http://www.fastcgi.com/#TheDevKit>))(FastCGI Developer's Kit)
 
 === Pure Ruby Version
   * StringIO
@@ -97,8 +97,8 @@ standard CGI library.
 
 == License
 
-* http://www.ruby-lang.org/ja/LICENSE.txt (Japanese)
-* http://www.ruby-lang.org/en/LICENSE.txt (English)
+* ((<URL:http://www.ruby-lang.org/ja/LICENSE.txt>)) (Japanese)
+* ((<URL:http://www.ruby-lang.org/en/LICENSE.txt>)) (English)
 
 == Copyright
 
@@ -108,4 +108,3 @@ standard CGI library.
   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

@@ -0,0 +1,76 @@
+= Handling of SIGUSR1
+
+When you request a 'graceful' restart of Apache, mod_fastcgi sends a SIGUSR1
+to each of the fastcgi worker processes. The intention is that each one
+should finish the current request, and then exit, at which point Apache will
+restart it. Of course, if the worker isn't doing anything, it should die
+immediately.
+
+This is implemented in the fcgi C library as follows:
+
+- a signal handler is installed for SIGUSR1, which just sets a flag
+  (shutdownPending) and returns
+- fcgi sits inside an accept() call waiting for a new request
+- if this accept() call terminates with EINTR, and this flag is set, then
+  it returns with no request
+
+Unfortunately, Ruby defeats this mechanism in at least two ways:
+
+1. Ruby installs its own signal handlers for a host of common signals,
+including USR1. The fcgi library will not install its own handler if it
+detects that a handler has already been set (i.e. the current handler is not
+SIG_DFL)
+
+2. When Ruby installs its own signal handlers, it does so with SA_RESTART
+set. This means that the accept() call does not terminate with EINTR; it is
+restarted automatically by the OS.
+
+When a signal comes in during the accept(), Ruby's own handler does nothing
+except store it in a queue to be processed later. It is only when the
+accept() call completes, i.e. when a genuine new request comes in, that Ruby
+takes action. Unfortunately it's too late by then, and if that
+already-accepted request is not honoured, a 500 Internal Error will be
+returned to the client.
+
+The simplest solution to this would be to remove Ruby's SIGUSR1 handler
+before initialising the FastCGI library.
+
+However, a cleaner solution is to call rb_thread_select before going into
+FastCGI's accept loop. If a signal happens during the select, it can be
+handled using Ruby's normal mechanisms. This also gives a very useful
+side-benefit, which is that FCGI::accept no longer blocks out other Ruby
+threads. The program below demonstrates this problem; its background logging
+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" 
+  
+  Thread.new do
+    f = File.new("/tmp/fcgi.log","a")
+    f.sync=true
+    while true
+      f.puts "#{Time.now.to_s} pid #{$$}"
+      sleep 10
+    end
+  end
+
+  FCGI.each_cgi {|cgi|
+    name = cgi['name'][0]
+    puts cgi.header
+    puts "Hey! You are #{name} " if name
+    puts "Connecting from #{cgi.remote_addr}"
+  }
+
+Having protected the accept() with a ruby select(), you can then handle
+signals as follows:
+
+- call FCGI::accept  (it will raise an exception if USR1 is called)
+- install a USR1 handler
+- process the request
+- remove the USR1 handler
+
+The USR1 handler should set a flag to note if a USR1 signal came in while
+the request was being processed; you terminate the loop if it was set. The
+overall effect is that USR1 will cause the process to terminate, but without
+causing a half-completed request.

data/Rakefile

@@ -0,0 +1,171 @@
+require 'rubygems'
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'rake/gempackagetask'
+require 'rake/contrib/rubyforgepublisher'
+
+PKG_VERSION = "0.8.6"
+PKG_NAME = "fcgi"
+PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
+
+PKG_FILES = FileList[
+    "lib/**/*", 
+    "ext/*", 
+    "ext/fcgi/fcgi.c*", 
+    "[A-Z]*", 
+].exclude(/\bCVS\b|~$/)
+
+
+# Publish beta gem  
+desc "Publish the gem on leetsoft"
+task :publish => [:package] do
+  Rake::SshFilePublisher.new("leetsoft.com", "dist/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  Rake::SshFilePublisher.new("leetsoft.com", "dist/pkg", "pkg", "#{PKG_FILE_NAME}.zip").upload
+  Rake::SshFilePublisher.new("leetsoft.com", "dist/pkg", "pkg", "#{PKG_FILE_NAME}.tgz").upload
+  `ssh tobi@leetsoft.com './gemupdate'`
+end
+
+spec = Gem::Specification.new do |s|
+  s.name = PKG_NAME
+  s.version = PKG_VERSION
+  s.summary = %q{FastCGI ruby binding.}
+  s.require_paths = ["."]
+  s.email = %q{moonwolf@moonwolf.com}
+  s.homepage = %q{http://rwiki.moonwolf.com/rw-cgi.cgi?cmd=view;name=fcgi}
+  s.autorequire = %q{fcgi}
+  s.has_rdoc = true
+  s.files = PKG_FILES
+  s.extra_rdoc_files = ["README"]
+  s.extensions = ["ext/fcgi/extconf.rb"]
+end
+
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
+  p.need_tar = true
+  p.need_zip = true
+end
+
+# --- Ruby forge release manager by florian gross -------------------------------------------------
+
+RUBY_FORGE_PROJECT = 'fcgi'
+RUBY_FORGE_USER = 'xal'
+RELEASE_NAME  = "REL #{PKG_VERSION}"
+
+desc "Publish the release files to RubyForge."
+task :release => [:gem] do
+  files = ["gem"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
+
+  if RUBY_FORGE_PROJECT then
+    require 'net/http'
+    require 'open-uri'
+
+    project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
+    project_data = open(project_uri) { |data| data.read }
+    group_id = project_data[/[?&]group_id=(\d+)/, 1]
+    raise "Couldn't get group id" unless group_id
+
+    # This echos password to shell which is a bit sucky
+    if ENV["RUBY_FORGE_PASSWORD"]
+      password = ENV["RUBY_FORGE_PASSWORD"]
+    else
+      print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
+      password = STDIN.gets.chomp
+    end
+
+    login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+      data = [
+        "login=1",
+        "form_loginname=#{RUBY_FORGE_USER}",
+        "form_pw=#{password}"
+      ].join("&")
+      http.post("/account/login.php", data)
+    end
+
+    cookie = login_response["set-cookie"]
+    raise "Login failed" unless cookie
+    headers = { "Cookie" => cookie }
+
+    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
+    release_data = open(release_uri, headers) { |data| data.read }
+    package_id = release_data[/[?&]package_id=(\d+)/, 1]
+    raise "Couldn't get package id" unless package_id
+
+    first_file = true
+    release_id = ""
+
+    files.each do |filename|
+      basename  = File.basename(filename)
+      file_ext  = File.extname(filename)
+      file_data = File.open(filename, "rb") { |file| file.read }
+
+      puts "Releasing #{basename}..."
+
+      release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+        release_date = Time.now.strftime("%Y-%m-%d %H:%M")
+        type_map = {
+          ".zip"    => "3000",
+          ".tgz"    => "3110",
+          ".gz"     => "3110",
+          ".gem"    => "1400"
+        }; type_map.default = "9999"
+        type = type_map[file_ext]
+        boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
+
+        query_hash = if first_file then
+          {
+            "group_id" => group_id,
+            "package_id" => package_id,
+            "release_name" => RELEASE_NAME,
+            "release_date" => release_date,
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "release_notes" => "",
+            "release_changes" => "",
+            "preformatted" => "1",
+            "submit" => "1"
+          }
+        else
+          {
+            "group_id" => group_id,
+            "release_id" => release_id,
+            "package_id" => package_id,
+            "step2" => "1",
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "submit" => "Add This File"
+          }
+        end
+
+        query = "?" + query_hash.map do |(name, value)|
+          [name, URI.encode(value)].join("=")
+        end.join("&")
+
+        data = [
+          "--" + boundary,
+          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
+          "Content-Type: application/octet-stream",
+          "Content-Transfer-Encoding: binary",
+          "", file_data, ""
+          ].join("\x0D\x0A")
+
+        release_headers = headers.merge(
+          "Content-Type" => "multipart/form-data; boundary=#{boundary}"
+        )
+
+        target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
+        http.post(target + query, data, release_headers)
+      end
+
+      if first_file then
+        release_id = release_response.body[/release_id=(\d+)/, 1]
+        raise("Couldn't get release id") unless release_id
+      end
+
+      first_file = false
+    end
+  end
+end
+
+
+

data/ext/fcgi/extconf.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require "mkmf"
+
+dir_config("fcgi")
+
+if (have_header("fcgiapp.h") || have_header("fastcgi/fcgiapp.h")) && have_library("fcgi", "FCGX_Accept")
+  create_makefile("fcgi")
+end

data/{fcgi.c → ext/fcgi/fcgi.c}

@@ -7,9 +7,14 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "ruby.h"
+#ifdef HAVE_FASTCGI_FCGIAPP_H
+#include <fastcgi/fcgiapp.h>
+#else
 #include "fcgiapp.h"
+#endif
 
 static VALUE cFCGI;
 static VALUE eFCGIError;
@@ -37,6 +42,12 @@ static void fcgi_mark(fcgi_data *data)
   rb_gc_mark(data->env);
 }
 
+static void fcgi_free_req(fcgi_data *data)
+{
+  free(data->req);
+  free(data);
+}
+
 static VALUE fcgi_s_accept(VALUE self)
 {
   int status;
@@ -64,7 +75,7 @@ static VALUE fcgi_s_accept(VALUE self)
     VALUE obj,key, value;
     char *pkey,*pvalue;
     
-    obj = Data_Make_Struct(self, fcgi_data, fcgi_mark, 0, data);
+    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);
@@ -153,9 +164,11 @@ static VALUE fcgi_finish(VALUE self)
 
 #define CHECK_STREAM_ERROR(stream) {\
   int err = FCGX_GetError(stream);\
+	extern int errno; \
   if (err) {\
     if (err > 0) {\
-      rb_sys_fail(0);\
+			errno = err;\
+      rb_sys_fail(NULL);\
     }\
     else {\
       switch (err) {\
@@ -379,7 +392,10 @@ static VALUE fcgi_stream_read(int argc, VALUE *argv, VALUE self)
     buff = ALLOC_N(char, 16384);
     n = FCGX_GetStr(buff, 16384, stream);
     CHECK_STREAM_ERROR(stream);
-    if (n == 0) return Qnil;
+    if (n == 0) {
+      free(buff);
+      return  Qnil;
+    }
     str = rb_str_new(buff, n);
     OBJ_TAINT(str);
     
@@ -389,9 +405,11 @@ static VALUE fcgi_stream_read(int argc, VALUE *argv, VALUE self)
       if (n > 0) {
         rb_str_cat(str, buff, n);
       } else {
+        free(buff);
         return Qnil;
       }
     }
+    free(buff);
     return str;
   }
 
@@ -404,9 +422,11 @@ static VALUE fcgi_stream_read(int argc, VALUE *argv, VALUE self)
   if (n > 0) {
     str = rb_str_new(buff, n);
     OBJ_TAINT(str);
+    free(buff);
     return str;
   }
   else {
+    free(buff);
     return Qnil;
   }
 }

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: "0.8"
+rubygems_version: 0.8.10
 specification_version: 1
 name: fcgi
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
-date: 2004-10-21
+  version: 0.8.6
+date: 2005-06-12
 summary: FastCGI ruby binding.
 require_paths: 
   - "."
-author: "Network Applied Communication Laboratory, Inc., MoonWolf, Eli Green, Minero Aoki"
 email: moonwolf@moonwolf.com
 homepage: http://rwiki.moonwolf.com/rw-cgi.cgi?cmd=view;name=fcgi
 rubyforge_project: 
@@ -25,20 +24,22 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+authors: []
 files: 
-  - lib
-  - extconf.rb
-  - fcgi.c
-  - MANIFEST
-  - README
-  - fcgi.gemspec
   - lib/fcgi.rb
+  - ext/fcgi
+  - ext/fcgi/fcgi.c
+  - ChangeLog
+  - Makefile
+  - Rakefile
+  - README
+  - README.signals
 test_files: []
 rdoc_options: []
 extra_rdoc_files: 
   - README
 executables: []
 extensions: 
-  - extconf.rb
+  - ext/fcgi/extconf.rb
 requirements: []
 dependencies: []

data/MANIFEST

@@ -1,5 +0,0 @@
-MANIFEST
-README
-extconf.rb
-fcgi.c
-lib/fcgi.rb

data/extconf.rb

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-require "mkmf"
-
-dir_config("fcgi")
-
-if have_header("fcgiapp.h") && have_library("fcgi", "FCGX_Accept")
-  create_makefile("fcgi")
-end

data/fcgi.gemspec

@@ -1,16 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{fcgi}
-  s.version = "0.8.5"
-  s.date = Time.now 
-  s.require_path = %q{.}
-  s.summary = %q{FastCGI ruby binding.}
-  s.author = %q{Network Applied Communication Laboratory, Inc., MoonWolf, Eli Green, Minero Aoki}
-  s.platform = Gem::Platform::RUBY
-  s.files = Dir.glob('**/*')
-  s.email = %q{moonwolf@moonwolf.com}
-  s.homepage = %q{http://rwiki.moonwolf.com/rw-cgi.cgi?cmd=view;name=fcgi}
-  s.autorequire = %q{fcgi}
-  s.extensions = ["extconf.rb"]
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README"]
-end