Browse files

same

git-svn-id: svn://rubyforge.org/var/svn/mongrel/tags/rel_1-1-3@947 19e92222-5c0b-0410-8929-a290d50e31e9
  • Loading branch information...
2 parents b4f7517 + 9ddc1d0 commit 0984641c4b315aa521a04adbcc4d2f4d3807403e evanweaver committed Jan 2, 2008
Showing with 41 additions and 30 deletions.
  1. +25 −28 Rakefile
  2. +1 −1 ext/http11_java/org/jruby/mongrel/Http11.java
  3. +1 −1 lib/mongrel/const.rb
  4. +10 −0 site/src/news.include
  5. +4 −0 site/src/news.page
View
53 Rakefile
@@ -2,53 +2,50 @@
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."
p.author ="Zed A. Shaw"
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.url = "http://mongrel.rubyforge.org"
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.dependencies = ['gem_plugin >=0.2.3']
p.extension_pattern = nil
- p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',
- '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem']
+
+ p.certificate_chain = case ENV['USER']
+ when 'eweaver'
+ ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',
+ '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem']
+ when 'luislavena'
+ ['~/gem_certificates/mongrel-public_cert.pem',
+ '~/gem_certificates/luislavena-mongrel-public_cert.pem']
+ end
p.need_tar_gz = false
p.need_tgz = true
- case RUBY_PLATFORM
+ if RUBY_PLATFORM !~ /mswin|java/
+ p.extension_pattern = ["ext/**/extconf.rb"]
+ end
+
+ p.eval = proc do
+ case RUBY_PLATFORM
when /mswin/
- p.certificate_chain = [
- '~/projects/gem_certificates/mongrel-public_cert.pem',
- '~/projects/gem_certificates/luislavena-mongrel-public_cert.pem'
- ]
+ 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' # XXX Is this right?
else
- p.extension_pattern = ["ext/**/extconf.rb"]
- end
-
- 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
+ add_dependency('daemons', '>= 1.0.3')
+ add_dependency('fastthread', '>= 1.0.1')
+ add_dependency('cgi_multipart_eof_fix', '>= 2.4')
end
- else
- p.extension_pattern = ["ext/**/extconf.rb"]
end
+
end
#### Ragel builder
View
2 ext/http11_java/org/jruby/mongrel/Http11.java
@@ -215,7 +215,7 @@ public void call(Object data, int at, int length) {
req.setInstanceVariable("@http_body", RubyString.newString(runtime, new ByteList(hp.parser.buffer, at, length)));
req.aset(runtime.newString("SERVER_PROTOCOL"),runtime.newString("HTTP/1.1"));
- req.aset(runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.1.2"));
+ req.aset(runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.1.3"));
}
};
View
2 lib/mongrel/const.rb
@@ -65,7 +65,7 @@ module Const
REQUEST_URI='REQUEST_URI'.freeze
REQUEST_PATH='REQUEST_PATH'.freeze
- MONGREL_VERSION="1.1.2".freeze
+ MONGREL_VERSION="1.1.3".freeze
MONGREL_TMP_BASE="mongrel".freeze
View
10 site/src/news.include
@@ -1,4 +1,14 @@
<dl>
+
+ <dt>Dec-29-2007</dt>
+ <dd>
+ <h5><a href="{relocatable: news.html}">Mongrel 1.1.3 and 1.0.5, security update</a></h5>
+
+ <p>Mongrel 1.1.3 and 1.0.5 are out. They fix a security flaw in the DirHandler as reported on the list. You should upgrade when you get the chance.</p>
+ <a href="http://rubyforge.org/frs/?group_id=1306" title="Downloads">Download</a>
+ <a href="{relocatable: news.html}"><img src="{relocatable: images/li4.gif}" alt="more" /><br /></a></p>
+ </dd>
+
<dt>Dec-15-2007</dt>
<dd>
<h5><a href="{relocatable: news.html}">Mongrel 1.1.2, holiday edition</a></h5>
View
4 site/src/news.page
@@ -7,6 +7,10 @@ ordering: 2
h1. Latest News
+h2. Dec 29: Mongrel 1.1.3 and 1.0.5, security update. For serious.
+
+Mongrel 1.1.3 and 1.0.5 are out. They fix a security flaw in the DirHandler as reported on the list. The flaw may or may not be already mitigated by your proxy configuration, but you should upgrade when you get the chance (or downgrade to 1.0.3).
+
h2. Dec 15: Mongrel 1.1.2, holiday edition.
Mongrel 1.1.2 is out. It fixes a few bugs and adds JRuby 1.0.x compatibility.

0 comments on commit 0984641

Please sign in to comment.