about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--Rakefile6
-rw-r--r--test/java/testParser.rb21
-rw-r--r--test/java/testParserImpl.rb22
3 files changed, 4 insertions, 45 deletions
diff --git a/Rakefile b/Rakefile
index 1a7006f..6141ea1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,6 +3,10 @@ require 'rubygems'
 gem 'echoe', '>=2.6.4'
 require 'echoe'
 
+# XXX Workaround for http://jira.codehaus.org/browse/JRUBY-1444
+RUBY_PLATFORM = 'java' if ENV['FORCE_JAVA']
+RUBY_PLATFORM = 'mswin' if ENV['FORCE_WINDOWS']
+
 Echoe.new("mongrel") do |p|
   p.summary = "A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps."
   p.author ="Zed A. Shaw"
@@ -14,13 +18,11 @@ Echoe.new("mongrel") do |p|
 
   p.need_tar_gz = false
   p.need_tgz = true
-  p.require_signed = true
 
   case RUBY_PLATFORM
   when /mswin/
     p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem',
       '~/gem_certificates/luislavena-mongrel-public_cert.pem']
-  when /java/
   else
     p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',
       '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem']
diff --git a/test/java/testParser.rb b/test/java/testParser.rb
deleted file mode 100644
index 476d1b3..0000000
--- a/test/java/testParser.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-
-require 'http11'
-
-request_data = "GET /events/show/2 HTTP/1.1\r\n\r\nfield1=value1&field2=value2&field3=value3"
-request_data += ("X" * (16 * 1024 - request_data.size))
-
-parser = Mongrel::HttpParser.new
-parser.reset
-params = {}
-nread = parser.execute(params, request_data, 0)
-puts "finished=#{parser.finished?}"
-nread = parser.execute(params, request_data, nread)
-
-puts "params="
-params.each {|k,v| puts "  #{k} = #{v}"}
-puts "nread=#{nread}"
-puts "error?=#{parser.error?}"
-puts "finished=#{parser.finished?}"
-puts "nread=#{parser.nread}"
-
-puts request_data[parser.nread..-1]
diff --git a/test/java/testParserImpl.rb b/test/java/testParserImpl.rb
deleted file mode 100644
index 58ef2c7..0000000
--- a/test/java/testParserImpl.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require "java"
-
-include_class "org.jruby.mongrel.HttpParserImpl"
-
-request_data = "GET /events/show/2 HTTP/1.1\r\n\r\nfield1=value1&field2=value2&field3=value3"
-request_data += ("X" * (16 * 1024 - request_data.size))
-
-parser = HttpParser.new
-parser.reset
-params = {}
-nread = parser.execute(params, request_data)
-puts "finished=#{parser.finished?}"
-nread = parser.execute(params, request_data)
-
-puts "params="
-params.each {|k,v| puts "  #{k} = #{v}"}
-puts "nread=#{nread}"
-puts "error?=#{parser.error?}"
-puts "finished=#{parser.finished?}"
-puts "nread=#{parser.nread}"
-
-puts request_data[parser.nread..-1]