kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

* ext/http11/http11.c: bumped version to 1.1.3.

Browse source 
* Rakefile: workaround and ugly hack to get PURE_RUBY version of gem built.

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/branches/stable_1-1@933 19e92222-5c0b-0410-8929-a290d50e31e9
This commit is contained in:
luislavena 2007-12-29 06:01:22 +00:00
parent e807d9ac38
commit 1d3f272f4d
3 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -1,4 +1,6 @@
v1.1.3. Fix security flaw of DirHandler; reported on mailing list.
v1.1.2. Fix worker termination bug; fix JRuby 1.0.3 load order issue; fix require issue on systems without Rubygems.
v1.1.1. Fix mongrel_rails restart bug; fix bug with Rack status codes.

40
Rakefile
View file

@ -2,6 +2,7 @@
require 'rubygems'
gem 'echoe', '>=2.7.5'
require 'echoe'
FORCE_PURE = ENV['FORCE_PURE'] || false
e = Echoe.new("mongrel") do |p|
p.summary = "A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps."
@ -9,7 +10,7 @@ e = Echoe.new("mongrel") do |p|
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', 'lib/http11.jar', 'ext/http11_java/classes', 'coverage']
p.rdoc_pattern = ['README', 'LICENSE', 'CHANGELOG', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
p.ignore_pattern = /^(pkg|site|projects|doc|log)|CVS|\.log/
p.ruby_version = '>= 1.8.4'
p.ruby_version = '>=1.8.4'
p.dependencies = ['gem_plugin >=0.2.3']
p.extension_pattern = nil
p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',
@ -20,29 +21,34 @@ e = Echoe.new("mongrel") do |p|
case RUBY_PLATFORM
when /mswin/
# p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem',
# '~/gem_certificates/luislavena-mongrel-public_cert.pem']
p.certificate_chain = [
'~/projects/gem_certificates/mongrel-public_cert.pem',
'~/projects/gem_certificates/luislavena-mongrel-public_cert.pem'
]
when /java/
else
p.extension_pattern = ["ext/**/extconf.rb"]
end
p.eval = proc do
case RUBY_PLATFORM
when /mswin/
self.files += ['lib/http11.so']
self.platform = Gem::Platform::WIN32
add_dependency('cgi_multipart_eof_fix', '>= 2.4')
when /java/
self.files += ['lib/http11.jar']
self.platform = 'jruby'
else
add_dependency('daemons', '>= 1.0.3')
add_dependency('fastthread', '>= 1.0.1')
add_dependency('cgi_multipart_eof_fix', '>= 2.4')
unless FORCE_PURE
p.eval = proc do
case RUBY_PLATFORM
when /mswin/
self.files += ['lib/http11.so']
self.platform = Gem::Platform::CURRENT
add_dependency('cgi_multipart_eof_fix', '>= 2.4')
when /java/
self.files += ['lib/http11.jar']
self.platform = 'jruby'
else
add_dependency('daemons', '>= 1.0.3')
add_dependency('fastthread', '>= 1.0.1')
add_dependency('cgi_multipart_eof_fix', '>= 2.4')
end
end
else
p.extension_pattern = ["ext/**/extconf.rb"]
end
end
#### Ragel builder

2
ext/http11/http11.c
View file

@ -384,7 +384,7 @@ void Init_http11()
DEF_GLOBAL(server_protocol, "SERVER_PROTOCOL");
DEF_GLOBAL(server_protocol_value, "HTTP/1.1");
DEF_GLOBAL(http_host, "HTTP_HOST");
DEF_GLOBAL(mongrel_version, "Mongrel 1.1.2"); /* XXX Why is this defined here? */
DEF_GLOBAL(mongrel_version, "Mongrel 1.1.3"); /* XXX Why is this defined here? */
DEF_GLOBAL(server_software, "SERVER_SOFTWARE");
DEF_GLOBAL(port_80, "80");