From 40dac162a2b11a13cf82f8cc2f4b55f403d2d059 Mon Sep 17 00:00:00 2001
From: Evan Phoenix <evan@fallingsnow.net>
Date: Sun, 2 Oct 2011 11:33:48 -0500
Subject: [PATCH] Change name of parser extension to puma_http11

---
 ext/http11/extconf.rb                                       | 6 ------
 ext/{http11 => puma_http11}/Http11Service.java              | 0
 ext/{http11 => puma_http11}/ext_help.h                      | 0
 ext/puma_http11/extconf.rb                                  | 5 +++++
 ext/{http11 => puma_http11}/http11_parser.c                 | 0
 ext/{http11 => puma_http11}/http11_parser.h                 | 0
 ext/{http11 => puma_http11}/http11_parser.java.rl           | 0
 ext/{http11 => puma_http11}/http11_parser.rl                | 0
 ext/{http11 => puma_http11}/http11_parser_common.rl         | 0
 ext/{http11 => puma_http11}/org/jruby/mongrel/Http11.java   | 0
 .../org/jruby/mongrel/Http11Parser.java                     | 0
 ext/{http11/http11.c => puma_http11/puma_http11.c}          | 2 +-
 lib/puma/server.rb                                          | 2 +-
 tasks/native.rake                                           | 2 +-
 14 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 ext/http11/extconf.rb
 rename ext/{http11 => puma_http11}/Http11Service.java (100%)
 rename ext/{http11 => puma_http11}/ext_help.h (100%)
 create mode 100644 ext/puma_http11/extconf.rb
 rename ext/{http11 => puma_http11}/http11_parser.c (100%)
 rename ext/{http11 => puma_http11}/http11_parser.h (100%)
 rename ext/{http11 => puma_http11}/http11_parser.java.rl (100%)
 rename ext/{http11 => puma_http11}/http11_parser.rl (100%)
 rename ext/{http11 => puma_http11}/http11_parser_common.rl (100%)
 rename ext/{http11 => puma_http11}/org/jruby/mongrel/Http11.java (100%)
 rename ext/{http11 => puma_http11}/org/jruby/mongrel/Http11Parser.java (100%)
 rename ext/{http11/http11.c => puma_http11/puma_http11.c} (99%)

diff --git a/ext/http11/extconf.rb b/ext/http11/extconf.rb
deleted file mode 100644
index e4f69182..00000000
--- a/ext/http11/extconf.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'mkmf'
-
-dir_config("http11")
-have_library("c", "main")
-
-create_makefile("http11")
diff --git a/ext/http11/Http11Service.java b/ext/puma_http11/Http11Service.java
similarity index 100%
rename from ext/http11/Http11Service.java
rename to ext/puma_http11/Http11Service.java
diff --git a/ext/http11/ext_help.h b/ext/puma_http11/ext_help.h
similarity index 100%
rename from ext/http11/ext_help.h
rename to ext/puma_http11/ext_help.h
diff --git a/ext/puma_http11/extconf.rb b/ext/puma_http11/extconf.rb
new file mode 100644
index 00000000..5ede0561
--- /dev/null
+++ b/ext/puma_http11/extconf.rb
@@ -0,0 +1,5 @@
+require 'mkmf'
+
+dir_config("puma_http11")
+
+create_makefile("puma_http11")
diff --git a/ext/http11/http11_parser.c b/ext/puma_http11/http11_parser.c
similarity index 100%
rename from ext/http11/http11_parser.c
rename to ext/puma_http11/http11_parser.c
diff --git a/ext/http11/http11_parser.h b/ext/puma_http11/http11_parser.h
similarity index 100%
rename from ext/http11/http11_parser.h
rename to ext/puma_http11/http11_parser.h
diff --git a/ext/http11/http11_parser.java.rl b/ext/puma_http11/http11_parser.java.rl
similarity index 100%
rename from ext/http11/http11_parser.java.rl
rename to ext/puma_http11/http11_parser.java.rl
diff --git a/ext/http11/http11_parser.rl b/ext/puma_http11/http11_parser.rl
similarity index 100%
rename from ext/http11/http11_parser.rl
rename to ext/puma_http11/http11_parser.rl
diff --git a/ext/http11/http11_parser_common.rl b/ext/puma_http11/http11_parser_common.rl
similarity index 100%
rename from ext/http11/http11_parser_common.rl
rename to ext/puma_http11/http11_parser_common.rl
diff --git a/ext/http11/org/jruby/mongrel/Http11.java b/ext/puma_http11/org/jruby/mongrel/Http11.java
similarity index 100%
rename from ext/http11/org/jruby/mongrel/Http11.java
rename to ext/puma_http11/org/jruby/mongrel/Http11.java
diff --git a/ext/http11/org/jruby/mongrel/Http11Parser.java b/ext/puma_http11/org/jruby/mongrel/Http11Parser.java
similarity index 100%
rename from ext/http11/org/jruby/mongrel/Http11Parser.java
rename to ext/puma_http11/org/jruby/mongrel/Http11Parser.java
diff --git a/ext/http11/http11.c b/ext/puma_http11/puma_http11.c
similarity index 99%
rename from ext/http11/http11.c
rename to ext/puma_http11/puma_http11.c
index 94d8a599..5ca5456c 100644
--- a/ext/http11/http11.c
+++ b/ext/puma_http11/puma_http11.c
@@ -453,7 +453,7 @@ VALUE HttpParser_body(VALUE self) {
   return http->body;
 }
 
-void Init_http11()
+void Init_puma_http11()
 {
 
   VALUE mPuma = rb_define_module("Puma");
diff --git a/lib/puma/server.rb b/lib/puma/server.rb
index 32fce6d1..923bc2ec 100644
--- a/lib/puma/server.rb
+++ b/lib/puma/server.rb
@@ -6,7 +6,7 @@ require 'puma/thread_pool'
 require 'puma/const'
 require 'puma/events'
 
-require 'http11'
+require 'puma_http11'
 
 require 'socket'
 
diff --git a/tasks/native.rake b/tasks/native.rake
index 8cb073e5..fdec3e24 100644
--- a/tasks/native.rake
+++ b/tasks/native.rake
@@ -2,7 +2,7 @@
 require 'rake/extensiontask'
 
 # build http11 C extension
-Rake::ExtensionTask.new('http11', HOE.spec) do |ext|
+Rake::ExtensionTask.new('puma_http11', HOE.spec) do |ext|
   # define target for extension (supporting fat binaries)
   if RUBY_PLATFORM =~ /mingw|mswin/ then
     RUBY_VERSION =~ /(\d+\.\d+)/