rename http11 => unicorn/http11

Avoid conflicting with existing (and future) Mongrel installs in
case either changes.  Of course, this also allows us more
freedom to experiment and break the API if needed...
However, I'm only planning on making minor changes to
remove the amount of C code we have to maintain and
possibly some minor performance improvements.

11 files changed, 24 insertions, 19 deletions

diff --git a/GNUmakefile b/GNUmakefile
index dfb33ff..0992767 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -21,22 +21,22 @@ T_log := $(subst .rb,$(log_suffix),$(T))
 T_n_log := $(subst .n,$(log_suffix),$(T_n))
 test_prefix = $(CURDIR)/test/install-$(RUBY_VERSION)
 
-http11_deps := $(addprefix ext/http11/, \
+http11_deps := $(addprefix ext/unicorn/http11/, \
                  ext_help.h http11.c http11_parser.c http11_parser.h \
                  http11_parser.rl http11_parser_common.rl)
 inst_deps := $(wildcard bin/*) $(wildcard lib/*.rb) \
   $(wildcard lib/*/*.rb) $(http11_deps)
 
-ext/http11/http11_parser.c: ext/http11/http11_parser.rl
+ext/unicorn/http11/http11_parser.c: ext/unicorn/http11/http11_parser.rl
         cd $(@D) && ragel $(<F) -C -G2 -o $(@F)
-ext/http11/Makefile: ext/http11/extconf.rb
+ext/unicorn/http11/Makefile: ext/unicorn/http11/extconf.rb
         cd $(@D) && $(ruby) $(<F)
-ext/http11/http11.$(DLEXT): $(http11_deps) ext/http11/Makefile
+ext/unicorn/http11/http11.$(DLEXT): $(http11_deps) ext/unicorn/http11/Makefile
         $(MAKE) -C $(@D)
-lib/http11.$(DLEXT): ext/http11/http11.$(DLEXT)
+lib/unicorn/http11.$(DLEXT): ext/unicorn/http11/http11.$(DLEXT)
         @mkdir -p lib
         install -m644 $< $@
-http11: lib/http11.$(DLEXT)
+http11: lib/unicorn/http11.$(DLEXT)
 
 $(test_prefix)/.stamp: $(inst_deps)
         $(MAKE) clean-http11
@@ -88,11 +88,11 @@ install: bin/unicorn
         $(prep_setup_rb)
 
 clean-http11:
-        -$(MAKE) -C ext/http11 clean
-        $(RM) ext/http11/Makefile lib/http11.$(DLEXT)
+        -$(MAKE) -C ext/unicorn/http11 clean
+        $(RM) ext/unicorn/http11/Makefile lib/unicorn/http11.$(DLEXT)
 
 setup_rb_files := .config InstalledFiles
-prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C ext/http11 clean
+prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C ext/unicorn/http11 clean
 
 clean: clean-http11
         $(RM) $(setup_rb_files)
diff --git a/Manifest b/Manifest
index 2ea9741..5072d0c 100644
--- a/Manifest
+++ b/Manifest
@@ -12,13 +12,13 @@ bin/unicorn
 examples/sinatra/README
 examples/sinatra/sinatra_example.rb
 examples/sinatra/unicorn-sinatra-example
-ext/http11/ext_help.h
-ext/http11/extconf.rb
-ext/http11/http11.c
-ext/http11/http11_parser.c
-ext/http11/http11_parser.h
-ext/http11/http11_parser.rl
-ext/http11/http11_parser_common.rl
+ext/unicorn/http11/ext_help.h
+ext/unicorn/http11/extconf.rb
+ext/unicorn/http11/http11.c
+ext/unicorn/http11/http11_parser.c
+ext/unicorn/http11/http11_parser.h
+ext/unicorn/http11/http11_parser.rl
+ext/unicorn/http11/http11_parser_common.rl
 lib/unicorn.rb
 lib/unicorn/configurator.rb
 lib/unicorn/const.rb
diff --git a/Rakefile b/Rakefile
index b350f74..1d217a2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,12 @@ Echoe.new("unicorn") do |p|
   p.summary = "A small fast HTTP library and server for Rack applications."
   p.author = "Eric Wong"
   p.email = "normalperson@yhbt.net"
-  p.clean_pattern = ['ext/http11/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'lib/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'ext/http11/Makefile', 'pkg', 'lib/*.bundle', '*.gem', 'site/output', '.config', 'coverage', 'test_*.log', 'log', 'doc']
+  p.clean_pattern = ['ext/unicorn/http11/*.{bundle,so,o,obj,pdb,lib,def,exp}',
+                     'lib/*.{bundle,so,o,obj,pdb,lib,def,exp}',
+                     'ext/unicorn/http11/Makefile',
+                     'pkg', 'lib/*.bundle', '*.gem',
+                     'site/output', '.config', 'coverage',
+                     'test_*.log', 'log', 'doc']
   p.url = "http://unicorn.bogomips.org"
   p.rdoc_pattern = ['README', 'LICENSE', 'CONTRIBUTORS', 'CHANGELOG', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
   p.ignore_pattern = /^(pkg|site|projects|doc|log)|CVS|\.log/
@@ -24,7 +29,7 @@ end
 
 desc "Rebuild the Ragel sources"
 task :ragel do
-  Dir.chdir "ext/http11" do
+  Dir.chdir "ext/unicorn/http11" do
     target = "http11_parser.c"
     File.unlink target if File.exist? target
     sh "ragel http11_parser.rl -C -G2 -o #{target}"
diff --git a/ext/http11/ext_help.h b/ext/unicorn/http11/ext_help.h
index 08c0e1e..08c0e1e 100644
--- a/ext/http11/ext_help.h
+++ b/ext/unicorn/http11/ext_help.h
diff --git a/ext/http11/extconf.rb b/ext/unicorn/http11/extconf.rb
index e4f6918..e4f6918 100644
--- a/ext/http11/extconf.rb
+++ b/ext/unicorn/http11/extconf.rb
diff --git a/ext/http11/http11.c b/ext/unicorn/http11/http11.c
index 82982e7..82982e7 100644
--- a/ext/http11/http11.c
+++ b/ext/unicorn/http11/http11.c
diff --git a/ext/http11/http11_parser.c b/ext/unicorn/http11/http11_parser.c
index d33eed0..d33eed0 100644
--- a/ext/http11/http11_parser.c
+++ b/ext/unicorn/http11/http11_parser.c
diff --git a/ext/http11/http11_parser.h b/ext/unicorn/http11/http11_parser.h
index 8d074ba..8d074ba 100644
--- a/ext/http11/http11_parser.h
+++ b/ext/unicorn/http11/http11_parser.h
diff --git a/ext/http11/http11_parser.rl b/ext/unicorn/http11/http11_parser.rl
index c3c4b1f..c3c4b1f 100644
--- a/ext/http11/http11_parser.rl
+++ b/ext/unicorn/http11/http11_parser.rl
diff --git a/ext/http11/http11_parser_common.rl b/ext/unicorn/http11/http11_parser_common.rl
index ee970b1..ee970b1 100644
--- a/ext/http11/http11_parser_common.rl
+++ b/ext/unicorn/http11/http11_parser_common.rl
diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index 7e7166b..9571754 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -3,7 +3,7 @@ require 'uri'
 require 'stringio'
 
 # compiled extension
-require 'http11'
+require 'unicorn/http11'
 
 module Unicorn
   #