fcgi 0.8.6.1 → 0.8.7

data/ChangeLog

@@ -1,3 +1,7 @@
+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
 

data/README

@@ -1,6 +1,6 @@
 = fcgi - FastCGI library for Ruby
 
-Version 0.8.5
+Version 0.8.7
 
 == Depends
 

data/ext/fcgi/MANIFEST

@@ -0,0 +1,3 @@
+MANIFEST
+extconf.rb
+fcgi.c

data/ext/{extconf.rb → fcgi/extconf.rb}

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require "mkmf"
 
 dir_config("fcgi")

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

@@ -1,13 +1,14 @@
 /*
  * fcgi.c
  * Copyright (C) 1998-1999  Network Applied Communication Laboratory, Inc.
- * Copyright (C) 2002 MoonWolf <moonwolf@moonwolf.com>
+ * Copyright (C) 2002-2006  MoonWolf <moonwolf@moonwolf.com>
  */
 
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
+#include <fcntl.h>
 
 #include "ruby.h"
 #ifdef HAVE_FASTCGI_FCGIAPP_H
@@ -71,9 +72,18 @@ static VALUE fcgi_s_accept(VALUE self)
   status = FCGX_Accept_r(req);
   if (status >= 0) {
     fcgi_data *data;
-    char **env;
-    VALUE obj,key, value;
-    char *pkey,*pvalue;
+    char      **env;
+    VALUE     obj,key, value;
+    char      *pkey,*pvalue;
+    int       flags, fd;
+
+    /* Unset NONBLOCKING */
+    fd = ((FCGX_Request*) req)->ipcFd;
+    flags = fcntl(fd, F_GETFL);
+
+    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;
@@ -82,7 +92,7 @@ static VALUE fcgi_s_accept(VALUE self)
     data->err = Data_Wrap_Struct(cFCGIStream, 0, 0, req->err);
     data->env = rb_hash_new();
     env = req->envp;
-    for (env; *env; env++) {
+    for (; *env; env++) {
       int size = 0;
       pkey = *env;
       pvalue = pkey;
@@ -497,8 +507,7 @@ static VALUE fcgi_stream_setsync(VALUE self,VALUE sync)
 
 
 
-void Init_fcgi()
-{
+void Init_fcgi() {
   
   FCGX_Init();
   
@@ -508,7 +517,7 @@ void Init_fcgi()
   rb_define_singleton_method(cFCGI, "each", fcgi_s_each, 0);
   rb_define_singleton_method(cFCGI, "each_request", fcgi_s_each, 0);
   rb_define_singleton_method(cFCGI, "is_cgi?", fcgi_s_iscgi, 0);
-  rb_define_method(cFCGI, "in", fcgi_in, 0);
+  rb_define_method(cFCGI, "in",  fcgi_in, 0);
   rb_define_method(cFCGI, "out", fcgi_out, 0);
   rb_define_method(cFCGI, "err", fcgi_err, 0);
   rb_define_method(cFCGI, "env", fcgi_env, 0);

data/{fcgi.rb → lib/fcgi.rb}

@@ -363,6 +363,10 @@ rescue LoadError
 
       attr_reader :role
       attr_reader :flags
+      
+      def make_body
+        [@role, @flags, 0, 0, 0, 0, 0].pack(BODY_FORMAT)
+      end
     end
 
     class AbortRequestRecord < Record
@@ -526,6 +530,12 @@ rescue LoadError
       end
     end
 
+    class StdoutDataRecord < GenericDataRecord
+      def initialize(id, flagment)
+        super FCGI_STDOUT, id, flagment
+      end
+    end
+
     class DataRecord < GenericDataRecord
       def initialize(id, flagment)
         super FCGI_DATA, id, flagment
@@ -540,7 +550,9 @@ rescue LoadError
         FCGI_ABORT_REQUEST => AbortRequestRecord,
         FCGI_PARAMS        => ParamsRecord,
         FCGI_STDIN         => StdinDataRecord,
-        FCGI_DATA          => DataRecord
+        FCGI_DATA          => DataRecord,
+        FCGI_STDOUT        => StdoutDataRecord,
+        FCGI_END_REQUEST   => EndRequestRecord
       }
     end
 

metadata

@@ -1,44 +1,52 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: fcgi
 version: !ruby/object:Gem::Version 
-  version: 0.8.6.1
-date: 2005-06-18
-summary: FastCGI ruby binding.
+  version: 0.8.7
+date: 2006-07-04 00:00:00 +09:00
+summary: FastCGI library for Ruby.
 require_paths: 
-  - "."
-email: moonwolf@moonwolf.com
-homepage: http://rwiki.moonwolf.com/rw-cgi.cgi?cmd=view;name=fcgi
-rubyforge_project: 
-description: 
+- lib
+email: 
+homepage: 
+rubyforge_project: fcgi
+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/.
 autorequire: fcgi
 default_executable: 
 bindir: bin
-has_rdoc: true
+has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: []
+
 files: 
-  - ChangeLog
-  - Rakefile
-  - README
-  - README.signals
-  - fcgi.rb
-  - ext/fcgi.c
-  - ext/extconf.rb
+- lib/fcgi.rb
+- ext/fcgi
+- ext/fcgi/extconf.rb
+- ext/fcgi/fcgi.c
+- ext/fcgi/MANIFEST
+- ChangeLog
+- README
+- README.signals
 test_files: []
+
 rdoc_options: []
-extra_rdoc_files: 
-  - README
+
+extra_rdoc_files: []
+
 executables: []
+
 extensions: 
-  - ext/extconf.rb
+- ext/fcgi/extconf.rb
 requirements: []
-dependencies: []
+
+dependencies: []
+

data/Rakefile

@@ -1,164 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
-
-PKG_VERSION = "0.8.6.1"
-PKG_NAME = "fcgi"
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-
-PKG_FILES = ["ChangeLog", "Rakefile", "README", "README.signals", "fcgi.rb", "ext/fcgi.c", "ext/extconf.rb"]
-
-
-# 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}.tgz").upload
-  `ssh tobi@leetsoft.com './gemupdate'`
-end
-
-spec = Gem::Specification.new do |s|
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.platform = Gem::Platform::RUBY  
-  s.summary = %q{FastCGI ruby binding.}
-  s.email = %q{moonwolf@moonwolf.com}
-  s.homepage = %q{http://rwiki.moonwolf.com/rw-cgi.cgi?cmd=view;name=fcgi}
-  s.has_rdoc = true
-  s.files = PKG_FILES
-  s.extra_rdoc_files = ["README"]
-  s.require_path = "." 
-  s.autorequire = "fcgi" 
-  s.extensions = ["ext/extconf.rb"]  
-end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.need_tar = 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
-
-
-