unicorn 0.95.1 → 0.95.2

data/.document

@@ -15,3 +15,4 @@ lib
 ext/unicorn_http/unicorn_http.c
 unicorn.1
 unicorn_rails.1
+ISSUES

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.95.1.GIT
+DEF_VER=v0.95.2.GIT
 
 LF='
 '

data/GNUmakefile

@@ -1,4 +1,4 @@
-# use GNU Make to run tests in parallel, and without depending on Rubygems
+# use GNU Make to run tests in parallel, and without depending on RubyGems
 all:: test
 ruby = ruby
 rake = rake
@@ -157,9 +157,12 @@ NEWS: GIT-VERSION-FILE
 	mv $@+ $@
 
 SINCE = 0.94.0
-ChangeLog: log_range = $(shell test -n "$(SINCE)" && echo v$(SINCE)..)
+ChangeLog: LOG_VERSION = \
+  $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
+          echo $(GIT_VERSION) || git describe)
+ChangeLog: log_range = v$(SINCE)..$(LOG_VERSION)
 ChangeLog: GIT-VERSION-FILE
-	@echo "ChangeLog from $(GIT_URL) ($(SINCE)..$(GIT_VERSION))" > $@+
+	@echo "ChangeLog from $(GIT_URL) ($(log_range))" > $@+
 	@echo >> $@+
 	git log $(log_range) | sed -e 's/^/    /' >> $@+
 	mv $@+ $@
@@ -261,9 +264,14 @@ $(pkgtgz): manifest fix-perms
 package: $(pkgtgz) $(pkggem)
 
 release: verify package $(release_notes) $(release_changes)
+	# make tgz release on RubyForge
 	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
 	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-	@echo do something with gemcutter for: $(pkggem)
+	# push gem to Gemcutter
+	gem push $(pkggem)
+	# in case of gem downloads from RubyForge releases page
+	-rubyforge add_file \
+	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
 else
 gem install-gem: GIT-VERSION-FILE
 	$(MAKE) $@ VERSION=$(GIT_VERSION)

data/HACKING

@@ -14,14 +14,14 @@ done.
 
 Tests are good, but slow tests make development slow, so we make tests
 faster (in parallel) with GNU make (instead of Rake) and avoiding
-Rubygems.
+RubyGems.
 
 Users of GNU-based systems (such as GNU/Linux) usually have GNU make installed
 as "make" instead of "gmake".
 
 Since we don't load RubyGems by default, loading Rack properly requires
 setting up RUBYLIB to point to where Rack is located.  Not loading
-Rubygems drastically lowers the time to run the full test suite.  You
+RubyGems drastically lowers the time to run the full test suite.  You
 may setup a "local.mk" file in the top-level working directory to setup
 your RUBYLIB and any other environment variables.  A "local.mk.sample"
 file is provided for reference.
@@ -91,7 +91,7 @@ user and developer feedback and bug reports.
 Follow conventions already established in the code and do not exceed 80
 characters per line.
 
-Inline patches (from "git format-patch") to the mailing list are
+Inline patches (from "git format-patch -M") to the mailing list are
 preferred because they allow code review and comments in the reply to
 the patch.
 

data/ISSUES

@@ -0,0 +1,36 @@
+= Issues
+
+The {mailing list}[mailto:mongrel-unicorn@rubyforge.org] is the best
+place to report bugs, submit patches and/or obtain support after you
+have searched the mailing list archives and
+{documentation}[http://unicorn.bogomips.org].
+
+* No subscription is needed to post to the mailing list,
+  let us know that we need to Cc: replies to you if you're unsubscribed.
+* Do not {top post}[http://catb.org/jargon/html/T/top-post.html] in replies
+* Quote only the relevant portions of the message you're replying to
+* Do not send HTML mail
+
+If your issue is of a sensitive nature or you're just shy in public,
+then feel free to email us privately at mailto:unicorn@bogomips.org
+instead and your issue will be handled discreetly.
+
+If you don't get a response within a few days, we may have forgotten
+about it so feel free to ask again.
+
+== Submitting Patches
+
+See the HACKING document (and additionally, the
+Documentation/SubmittingPatches document distributed with git) on
+guidelines for patch submission.
+
+== Mailing List Info
+
+* subscribe: http://rubyforge.org/mailman/listinfo/mongrel-unicorn
+* post: mailto:mongrel-unicorn@rubyforge.org
+* private: mailto:unicorn@bogomips.org
+
+== Mailing List Archives
+
+* nntp://news.gmane.org/gmane.comp.lang.ruby.unicorn.general
+* http://rubyforge.org/pipermail/mongrel-unicorn

data/KNOWN_ISSUES

@@ -1,5 +1,8 @@
 = Known Issues
 
+Occasionally odd {issues}[link:ISSUES.html] arise without a transparent or
+acceptable solution.  Those issues are documented here.
+
 * Rails 2.3.2 bundles its own version of Rack.  This may cause subtle
   bugs when simultaneously loaded with the system-wide Rack Rubygem
   which Unicorn depends on.  Upgrading to Rails 2.3.4 (or later) is

data/README

@@ -1,6 +1,6 @@
 = Unicorn: Rack HTTP server for fast clients and Unix
 
-Unicorn is a HTTP server for Rack applications designed to only serve
+Unicorn is an HTTP server for Rack applications designed to only serve
 fast clients on low-latency, high-bandwidth connections and take
 advantage of features in Unix/Unix-like kernels.  Slow clients should
 only be served by placing a reverse proxy capable of fully buffering
@@ -78,7 +78,7 @@ and run setup.rb after unpacking it:
 
 http://rubyforge.org/frs/?group_id=1306
 
-You may also install it via Rubygems on Rubyforge:
+You may also install it via RubyGems on Gemcutter:
 
   gem install unicorn
 
@@ -86,9 +86,7 @@ You can get the latest source via git from the following locations
 (these versions may not be stable):
 
   git://git.bogomips.org/unicorn.git
-  http://git.bogomips.org/unicorn.git
   git://repo.or.cz/unicorn.git (mirror)
-  http://repo.or.cz/r/unicorn.git (mirror)
 
 You may browse the code from the web and download the latest snapshot
 tarballs here:
@@ -96,6 +94,9 @@ tarballs here:
 * http://git.bogomips.org/cgit/unicorn.git (cgit)
 * http://repo.or.cz/w/unicorn.git (gitweb)
 
+See the HACKING guide on how to contribute and build prerelease gems
+from git.
+
 == Usage
 
 === non-Rails Rack applications
@@ -130,9 +131,8 @@ options.
 
 == Disclaimer
 
-Like the creatures themselves, production deployments of Unicorn are
-rare.  There is NO WARRANTY whatsoever if anything goes wrong, but let
-us know and we'll try our best to fix it.
+There is NO WARRANTY whatsoever if anything goes wrong, but
+{let us know}[link:ISSUES.html] and we'll try our best to fix it.
 
 Unicorn is designed to only serve fast clients either on the local host
 or a fast LAN.  See the PHILOSOPHY and DESIGN documents for more details
@@ -141,13 +141,9 @@ regarding this.
 == Contact
 
 All feedback (bug reports, user/development dicussion, patches, pull
-requests) go to the mailing list/newsgroup.  Patches must be sent inline
-(git format-patch -M + git send-email).  No subscription is necessary
-to post on the mailing list.  No top posting.  Address replies +To:+
-the mailing list.
-
-* email: mailto:mongrel-unicorn@rubyforge.org
-* nntp: nntp://news.gmane.org/gmane.comp.lang.ruby.unicorn.general
-* archives: http://rubyforge.org/pipermail/mongrel-unicorn/
-* subscribe: http://rubyforge.org/mailman/listinfo/mongrel-unicorn/
-* finger: unicorn@bogomips.org
+requests) go to the mailing list/newsgroup.  See the ISSUES document for
+information on the {mailing list}[mailto:mongrel-unicorn@rubyforge.org].
+
+For the latest on Unicorn releases, you may also finger us at
+unicorn@bogomips.org or check our NEWS page (and subscribe to our Atom
+feed).

data/Rakefile

@@ -59,7 +59,9 @@ task :news_atom do
           url = "#{cgit_url}/tag/?id=#{tag[:tag]}"
           link! :rel => "alternate", :type => "text/html", :href =>url
           id! url
-          content({:type => 'text'}, tag[:body])
+          message_only = tag[:body].split(/\n.+\(\d+\):\n {6}/s).first.strip
+          content({:type =>:text}, message_only)
+          content(:type =>:xhtml) { pre tag[:body] }
         end
       end
     end
@@ -143,3 +145,20 @@ task :raa_update do
   p res
   puts res.body
 end
+
+# optional rake-compiler support in case somebody needs to cross compile
+begin
+  require 'rubygems'
+  spec = Gem::Specification.load('unicorn.gemspec')
+  require 'rake/extensiontask'
+  unless test ?r, "ext/unicorn_http/unicorn_http.c"
+    abort "run 'gmake ragel' or 'make ragel' to generate the Ragel source"
+  end
+  mk = "ext/unicorn_http/Makefile"
+  if test ?r, mk
+    abort "run 'gmake -C ext/unicorn_http clean' and " \
+          "remove #{mk} before using rake-compiler"
+  end
+  Rake::ExtensionTask.new('unicorn_http', spec)
+rescue LoadError
+end

data/examples/nginx.conf

@@ -0,0 +1,139 @@
+# This is example contains the bare mininum to get nginx going with
+# Unicorn or Rainbows! servers.  Generally these configuration settings
+# are applicable to other HTTP application servers (and not just Ruby
+# ones), so if you have one working well for proxying another app
+# server, feel free to continue using it.
+#
+# The only setting we feel strongly about is the fail_timeout=0
+# directive in the "upstream" block.  max_fails=0 also has the same
+# effect as fail_timeout=0 for current versions of nginx and may be
+# used in its place.
+#
+# Users are strongly encouraged to refer to nginx documentation for more
+# details and search for other example configs.
+
+# you generally only need one nginx worker unless you're serving
+# large amounts of static files which require blocking disk reads
+worker_processes 1;
+
+# # drop privileges, root is needed on most systems for binding to port 80
+# # (or anything < 1024).  Capability-based security may be available for
+# # your system and worth checking out so you won't need to be root to
+# # start nginx to bind on 80
+user nobody nogroup; # for systems with a "nogroup"
+# user nobody nobody; # for systems with "nobody" as a group instead
+
+# Feel free to change all paths to suite your needs here, of course
+pid /tmp/nginx.pid;
+error_log /tmp/nginx.error.log;
+
+events {
+  worker_connections 1024; # increase if you have lots of clients
+  accept_mutex off; # "on" if nginx worker_processes > 1
+  # use epoll; # enable for Linux 2.6+
+  # use kqueue; # enable for FreeBSD, OSX
+}
+
+http {
+  # nginx will find this file in the config directory set at nginx build time
+  include mime.types;
+
+  # fallback in case we can't determine a type
+  default_type application/octet-stream;
+
+  # click tracking!
+  access_log /tmp/nginx.access.log combined;
+
+  # you generally want to serve static files with nginx since neither
+  # Unicorn nor Rainbows! is optimized for it at the moment
+  sendfile on;
+
+  tcp_nopush on; # off may be better for *some* Comet/long-poll stuff
+  tcp_nodelay off; # on may be better for some Comet/long-poll stuff
+
+  # we haven't checked to see if Rack::Deflate on the app server is
+  # faster or not than doing compression via nginx.  It's easier
+  # to configure it all in one place here for static files and also
+  # to disable gzip for clients who don't get gzip/deflate right.
+  # There are other other gzip settings that may be needed used to deal with
+  # bad clients out there, see http://wiki.nginx.org/NginxHttpGzipModule
+  gzip on;
+  gzip_http_version 1.0;
+  gzip_proxied any;
+  gzip_min_length 500;
+  gzip_disable "MSIE [1-6]\.";
+  gzip_types text/plain text/html text/xml text/css
+             text/comma-separated-values
+             text/javascript application/x-javascript
+             application/atom+xml;
+
+  # this can be any application server, not just Unicorn/Rainbows!
+  upstream app_server {
+    # fail_timeout=0 means we always retry an upstream even if it failed
+    # to return a good HTTP response (in case the Unicorn master nukes a
+    # single worker for timing out).
+
+    # for UNIX domain socket setups:
+    server unix:/tmp/.sock fail_timeout=0;
+
+    # for TCP setups, point these to your backend servers
+    # server 192.168.0.7:8080 fail_timeout=0;
+    # server 192.168.0.8:8080 fail_timeout=0;
+    # server 192.168.0.9:8080 fail_timeout=0;
+  }
+
+  server {
+    # listen 80 default deferred; # for Linux
+    # listen 80 default accept_filter=httpready; # for FreeBSD
+    listen 80 default;
+
+    client_max_body_size 4G;
+    server_name _;
+
+    # ~2 seconds is often enough for most folks to parse HTML/CSS and
+    # retrieve needed images/icons/frames, connections are cheap in
+    # nginx so increasing this is generally safe...
+    keepalive_timeout 5;
+
+    # path for static files
+    root /path/to/app/current/public;
+
+    location / {
+      # an HTTP header important enough to have its own Wikipedia entry:
+      #   http://en.wikipedia.org/wiki/X-Forwarded-For
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+      # enable this if and only if you use HTTPS, this helps Rack
+      # set the proper protocol for doing redirects:
+      # proxy_set_header X-Forwarded-Proto https;
+
+      # pass the Host: header from the client right along so redirects
+      # can be set properly within the Rack application
+      proxy_set_header Host $http_host;
+
+      # we don't want nginx trying to do something clever with
+      # redirects, we set the Host: header above already.
+      proxy_redirect off;
+
+      # set "proxy_buffering off" *only* for Rainbows! when doing
+      # Comet/long-poll stuff.  It's also safe to set if you're
+      # using only serving fast clients with Unicorn + nginx.
+      # Otherwise you _want_ nginx to buffer responses to slow
+      # clients, really.
+      # proxy_buffering off;
+
+      # Try to serve static files from nginx, no point in making an
+      # *application* server like Unicorn/Rainbows! serve static files.
+      if (!-f $request_filename) {
+        proxy_pass http://app_server;
+        break;
+      }
+    }
+
+    # Rails error pages
+    error_page 500 502 503 504 /500.html;
+    location = /500.html {
+      root /path/to/app/current/public;
+    }
+  }
+}

data/examples/unicorn.conf.rb

@@ -0,0 +1,78 @@
+# Sample configuration file for Unicorn (not Rack)
+#
+# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
+# documentation.
+
+# Use at least one worker per core if you're on a dedicated server,
+# more will usually help for _short_ waits on databases/caches.
+worker_processes 4
+
+# Help ensure your application will always spawn in the symlinked
+# "current" directory that Capistrano sets up.
+working_directory "/path/to/app/current" # available in 0.94.0+
+
+# listen on both a Unix domain socket and a TCP port,
+# we use a shorter backlog for quicker failover when busy
+listen "/tmp/.sock", :backlog => 64
+listen 8080, :tcp_nopush => true
+
+# nuke workers after 30 seconds instead of 60 seconds (the default)
+timeout 30
+
+# feel free to point this anywhere accessible on the filesystem
+pid "/path/to/app/shared/pids/unicorn.pid"
+
+# some applications/frameworks log to stderr or stdout, so prevent
+# them from going to /dev/null when daemonized here:
+stderr_path "/path/to/app/shared/log/unicorn.stderr.log"
+stdout_path "/path/to/app/shared/log/unicorn.stdout.log"
+
+# combine REE with "preload_app true" for memory savings
+# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
+preload_app true
+GC.respond_to?(:copy_on_write_friendly=) and
+  GC.copy_on_write_friendly = true
+
+before_fork do |server, worker|
+  # the following is highly recomended for Rails + "preload_app true"
+  # as there's no need for the master process to hold a connection
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.connection.disconnect!
+
+  # The following is only recommended for memory/DB-constrained
+  # installations.  It is not needed if your system can house
+  # twice as many worker_processes as you have configured.
+  #
+  # # This allows a new master process to incrementally
+  # # phase out the old master process with SIGTTOU to avoid a
+  # # thundering herd (especially in the "preload_app false" case)
+  # # when doing a transparent upgrade.  The last worker spawned
+  # # will then kill off the old master process with a SIGQUIT.
+  # old_pid = "#{server.config[:pid]}.oldbin"
+  # if old_pid != server.pid
+  #   begin
+  #     sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
+  #     Process.kill(sig, File.read(old_pid).to_i)
+  #   rescue Errno::ENOENT, Errno::ESRCH
+  #   end
+  # end
+  #
+  # # *optionally* throttle the master from forking too quickly by sleeping
+  # sleep 1
+end
+
+after_fork do |server, worker|
+  # per-process listener ports for debugging/admin/migrations
+  # addr = "127.0.0.1:#{9293 + worker.nr}"
+  # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
+
+  # the following is *required* for Rails + "preload_app true",
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.establish_connection
+
+  # if preload_app is true, then you may also want to check and
+  # restart any other shared sockets/descriptors such as Memcached,
+  # and Redis.  TokyoCabinet file handles are safe to reuse
+  # between any number of forked children (assuming your kernel
+  # correctly implements pread()/pwrite() system calls)
+end

data/ext/unicorn_http/ext_help.h

@@ -14,6 +14,9 @@
 #endif /* !RUBINIUS */
 
 #ifndef HAVE_RB_STR_SET_LEN
+#  ifdef RUBINIUS
+#    define rb_str_set_len(str,len) rb_str_resize(str,len)
+#  else /* 1.8.6 optimized version */
 /* this is taken from Ruby 1.8.7, 1.8.6 may not have it */
 static void rb_18_str_set_len(VALUE str, long len)
 {
@@ -21,7 +24,8 @@ static void rb_18_str_set_len(VALUE str, long len)
   RSTRING(str)->ptr[len] = '\0';
   rb_str_flush(str);
 }
-#  define rb_str_set_len(str,len) rb_18_str_set_len(str,len)
+#    define rb_str_set_len(str,len) rb_18_str_set_len(str,len)
+#  endif /* ! RUBINIUS */
 #endif /* !defined(HAVE_RB_STR_SET_LEN) */
 
 /* not all Ruby implementations support frozen objects (Rubinius does not) */

data/ext/unicorn_http/unicorn_http_common.rl

@@ -33,7 +33,7 @@
   query = ( uchar | reserved )* %query_string ;
   param = ( pchar | "/" )* ;
   params = ( param ( ";" param )* ) ;
-  rel_path = ( path? %request_path (";" params)? ) ("?" %start_query query)?;
+  rel_path = (path? (";" params)? %request_path) ("?" %start_query query)?;
   absolute_path = ( "/"+ rel_path );
   path_uri = absolute_path > mark %request_uri;
   Absolute_URI = (scheme "://" host_with_port path_uri);

data/lib/unicorn.rb

@@ -300,7 +300,7 @@ module Unicorn
         end
         logger.info "listening on addr=#{sock_name(io)} fd=#{io.fileno}"
         LISTENERS << io
-        return io
+        io
       rescue Errno::EADDRINUSE => err
         logger.error "adding listener failed addr=#{address} (in use)"
         raise err if tries == 0
@@ -703,7 +703,7 @@ module Unicorn
       wpid <= 0 and return nil
       begin
         Process.kill(0, wpid)
-        return wpid
+        wpid
       rescue Errno::ESRCH
         # don't unlink stale pid files, racy without non-portable locking...
       end

data/lib/unicorn/app/old_rails/static.rb

@@ -46,11 +46,7 @@ class Unicorn::App::OldRails::Static < Struct.new(:app, :root, :file_server)
     end
 
     # then try the cached version:
-
-    # grab the semi-colon REST operator used by old versions of Rails
-    # this is the reason we didn't just copy the new Rails::Rack::Static
-    env[REQUEST_URI] =~ /^#{Regexp.escape(path_info)}(;[^\?]+)/
-    path_info << "#$1#{ActionController::Base.page_cache_extension}"
+    path_info << ActionController::Base.page_cache_extension
 
     if File.file?("#{root}/#{::Rack::Utils.unescape(path_info)}")
       env[PATH_INFO] = path_info

data/lib/unicorn/configurator.rb

@@ -7,63 +7,9 @@ module Unicorn
 
   # Implements a simple DSL for configuring a Unicorn server.
   #
-  # Example (when used with the Unicorn config file):
-  #   worker_processes 4
-  #   working_directory "/path/to/deploy/app/current"
-  #   listen '/tmp/my_app.sock', :backlog => 1
-  #   listen 9292, :tcp_nopush => true
-  #   timeout 10
-  #   pid "/tmp/my_app.pid"
-  #
-  #   # combine REE with "preload_app true" for memory savings
-  #   # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
-  #   preload_app true
-  #   GC.respond_to?(:copy_on_write_friendly=) and
-  #     GC.copy_on_write_friendly = true
-  #
-  #   before_fork do |server, worker|
-  #     # the following is highly recomended for Rails + "preload_app true"
-  #     # as there's no need for the master process to hold a connection
-  #     defined?(ActiveRecord::Base) and
-  #       ActiveRecord::Base.connection.disconnect!
-  #
-  #     # The following is only recommended for memory/DB-constrained
-  #     # installations.  It is not needed if your system can house
-  #     # twice as many worker_processes as you have configured.
-  #
-  #     # This allows a new master process to incrementally
-  #     # phase out the old master process with SIGTTOU to avoid a
-  #     # thundering herd (especially in the "preload_app false" case)
-  #     # when doing a transparent upgrade.  The last worker spawned
-  #     # will then kill off the old master process with a SIGQUIT.
-  #     old_pid = "#{server.config[:pid]}.oldbin"
-  #     if old_pid != server.pid
-  #       begin
-  #         sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
-  #         Process.kill(sig, File.read(old_pid).to_i)
-  #       rescue Errno::ENOENT, Errno::ESRCH
-  #       end
-  #     end
-  #
-  #     # *optionally* throttle the master from forking too quickly by sleeping
-  #     sleep 1
-  #   end
-  #
-  #   after_fork do |server, worker|
-  #     # per-process listener ports for debugging/admin/migrations
-  #     addr = "127.0.0.1:#{9293 + worker.nr}"
-  #     server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
-  #
-  #     # the following is *required* for Rails + "preload_app true",
-  #     defined?(ActiveRecord::Base) and
-  #       ActiveRecord::Base.establish_connection
-  #
-  #     # if preload_app is true, then you may also want to check and
-  #     # restart any other shared sockets/descriptors such as Memcached,
-  #     # and Redis.  TokyoCabinet file handles are safe to reuse
-  #     # between any number of forked children (assuming your kernel
-  #     # correctly implements pread()/pwrite() system calls)
-  #   end
+  # See http://unicorn.bogomips.org/examples/unicorn.conf.rb for an
+  # example config file.  An example config file for use with nginx is
+  # also available at http://unicorn.bogomips.org/examples/nginx.conf
   class Configurator < Struct.new(:set, :config_file)
 
     # Default settings for Unicorn

data/lib/unicorn/const.rb

@@ -7,7 +7,7 @@ module Unicorn
   # gave about a 3% to 10% performance improvement over using the strings directly.
   # Symbols did not really improve things much compared to constants.
   module Const
-    UNICORN_VERSION="0.95.1"
+    UNICORN_VERSION="0.95.2"
 
     DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
     DEFAULT_PORT = 8080      # default TCP listen port

data/lib/unicorn/http_request.rb

@@ -57,12 +57,10 @@ module Unicorn
 
       # short circuit the common case with small GET requests first
       if PARSER.headers(REQ, socket.readpartial(Const::CHUNK_SIZE, BUF)).nil?
-        data = BUF.dup # socket.readpartial will clobber data
-
         # Parser is not done, queue up more data to read and continue parsing
         # an Exception thrown from the PARSER will throw us out of the loop
         begin
-          BUF << socket.readpartial(Const::CHUNK_SIZE, data)
+          BUF << socket.readpartial(Const::CHUNK_SIZE)
         end while PARSER.headers(REQ, BUF).nil?
       end
       REQ[Const::RACK_INPUT] = 0 == PARSER.content_length ?

data/local.mk.sample

@@ -42,19 +42,19 @@ latest: NEWS
 # publishes docs to http://unicorn.bogomips.org
 publish_doc:
 	-git set-file-times
-	$(RM) -r doc
-	$(MAKE) doc
+	$(RM) -r doc ChangeLog NEWS
+	$(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1)
 	$(MAKE) -s latest > doc/LATEST
 	find doc/images doc/js -type f | \
 		TZ=UTC xargs touch -d '1970-01-01 00:00:00' doc/rdoc.css
 	$(MAKE) doc_gz
+	tar cf - $$(git ls-files examples/) | (cd doc && tar xf -)
 	chmod 644 $$(find doc -type f)
-	rsync -av --delete doc/ dcvr:/srv/unicorn/
+	rsync -av doc/ dcvr:/srv/unicorn/
 	git ls-files | xargs touch
 
 # Create gzip variants of the same timestamp as the original so nginx
 # "gzip_static on" can serve the gzipped versions directly.
-doc_gz: suf := html js css
 doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
 doc_gz:
 	touch doc/NEWS.atom.xml -d "$$(awk 'NR==1{print $$4,$$5,$$6}' NEWS)"

data/test/exec/test_exec.rb

@@ -910,11 +910,11 @@ EOF
         bodies[pid] += 1
       }
     }
-    sleep 1 # racy
+    sleep 5 # racy
     daemon_pid = File.read(pid_file.path).to_i
     assert daemon_pid > 0
     Process.kill(:HUP, daemon_pid)
-    sleep 1 # racy
+    sleep 5 # racy
     assert_nothing_raised { Process.kill(:TERM, hitter) }
     _, hitter_status = Process.waitpid2(hitter)
     assert hitter_status.success?

data/test/unit/test_http_parser_ng.rb

@@ -371,4 +371,50 @@ class HttpParserNgTest < Test::Unit::TestCase
     assert ! parser.headers?
   end
 
+  def test_path_info_semicolon
+    qs = "QUERY_STRING"
+    pi = "PATH_INFO"
+    req = {}
+    str = "GET %s HTTP/1.1\r\nHost: example.com\r\n\r\n"
+    {
+      "/1;a=b?c=d&e=f" => { qs => "c=d&e=f", pi => "/1;a=b" },
+      "/1?c=d&e=f" => { qs => "c=d&e=f", pi => "/1" },
+      "/1;a=b" => { qs => "", pi => "/1;a=b" },
+      "/1;a=b?" => { qs => "", pi => "/1;a=b" },
+      "/1?a=b;c=d&e=f" => { qs => "a=b;c=d&e=f", pi => "/1" },
+      "*" => { qs => "", pi => "" },
+    }.each do |uri,expect|
+      assert_equal req, @parser.headers(req.clear, str % [ uri ])
+      @parser.reset
+      assert_equal uri, req["REQUEST_URI"], "REQUEST_URI mismatch"
+      assert_equal expect[qs], req[qs], "#{qs} mismatch"
+      assert_equal expect[pi], req[pi], "#{pi} mismatch"
+      next if uri == "*"
+      uri = URI.parse("http://example.com#{uri}")
+      assert_equal uri.query.to_s, req[qs], "#{qs} mismatch URI.parse disagrees"
+      assert_equal uri.path, req[pi], "#{pi} mismatch URI.parse disagrees"
+    end
+  end
+
+  def test_path_info_semicolon_absolute
+    qs = "QUERY_STRING"
+    pi = "PATH_INFO"
+    req = {}
+    str = "GET http://example.com%s HTTP/1.1\r\nHost: www.example.com\r\n\r\n"
+    {
+      "/1;a=b?c=d&e=f" => { qs => "c=d&e=f", pi => "/1;a=b" },
+      "/1?c=d&e=f" => { qs => "c=d&e=f", pi => "/1" },
+      "/1;a=b" => { qs => "", pi => "/1;a=b" },
+      "/1;a=b?" => { qs => "", pi => "/1;a=b" },
+      "/1?a=b;c=d&e=f" => { qs => "a=b;c=d&e=f", pi => "/1" },
+    }.each do |uri,expect|
+      assert_equal req, @parser.headers(req.clear, str % [ uri ])
+      @parser.reset
+      assert_equal uri, req["REQUEST_URI"], "REQUEST_URI mismatch"
+      assert_equal "example.com", req["HTTP_HOST"], "Host: mismatch"
+      assert_equal expect[qs], req[qs], "#{qs} mismatch"
+      assert_equal expect[pi], req[pi], "#{pi} mismatch"
+    end
+  end
+
 end

data/unicorn.gemspec

@@ -49,5 +49,5 @@ Gem::Specification.new do |s|
   # *strongly* recommended for security reasons.
   s.add_dependency(%q<rack>)
 
-  # s.licenses = %w(GPLv2 Ruby) # licenses= method is not in older Rubygems
+  # s.licenses = %w(GPLv2 Ruby) # licenses= method is not in older RubyGems
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.95.1
+  version: 0.95.2
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-21 00:00:00 -08:00
+date: 2009-12-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
         version: "0"
     version: 
 description: |-
-  Unicorn is a HTTP server for Rack applications designed to only serve
+  Unicorn is an HTTP server for Rack applications designed to only serve
   fast clients on low-latency, high-bandwidth connections and take
   advantage of features in Unix/Unix-like kernels.  Slow clients should
   only be served by placing a reverse proxy capable of fully buffering
@@ -63,6 +63,7 @@ extra_rdoc_files:
 - lib/unicorn/tee_input.rb
 - lib/unicorn/util.rb
 - ext/unicorn_http/unicorn_http.c
+- ISSUES
 files: 
 - .CHANGELOG.old
 - .document
@@ -82,6 +83,7 @@ files:
 - GIT-VERSION-GEN
 - GNUmakefile
 - HACKING
+- ISSUES
 - KNOWN_ISSUES
 - LICENSE
 - NEWS
@@ -96,6 +98,8 @@ files:
 - examples/echo.ru
 - examples/git.ru
 - examples/init.sh
+- examples/nginx.conf
+- examples/unicorn.conf.rb
 - ext/unicorn_http/c_util.h
 - ext/unicorn_http/common_field_optimization.h
 - ext/unicorn_http/ext_help.h