kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 26344,27367:

Browse source 
* lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
	  use inclusive range same as the header representation.
	* test/webrick/utils.rb (TestWEBrick#start_server): add log for
	  test_filehandler.rb


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-06-16 06:57:47 +00:00
parent a0efdbbb6b
commit 836271c28b
5 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Wed Jun 16 15:21:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/webrick/utils.rb (TestWEBrick#start_server): add log for
test_filehandler.rb
Wed Jun 16 15:21:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
use inclusive range same as the header representation.
Thu Jun 10 14:39:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/iconv/test_option.rb: removed particular implementation specific tests.

4
lib/net/http.rb
View file

@ -1366,13 +1366,13 @@ module Net #:nodoc:
return nil unless @header['content-range']
m = %r<bytes\s+(\d+)-(\d+)/(\d+|\*)>i.match(self['Content-Range']) or
raise HTTPHeaderSyntaxError, 'wrong Content-Range format'
m[1].to_i .. m[2].to_i + 1
m[1].to_i .. m[2].to_i
end
# The length of the range represented in Content-Range: header.
def range_length
r = content_range() or return nil
r.end - r.begin
r.end - r.begin + 1
end
# Returns a content type string such as "text/html".

2
test/webrick/test_filehandler.rb
View file

@ -76,7 +76,7 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase
range = nil
bug2593 = '[ruby-dev:40030]'
TestWEBrick.start_httpserver(config) do |server, addr, port|
TestWEBrick.start_httpserver(config) do |server, addr, port, log|
http = Net::HTTP.new(addr, port)
req = Net::HTTP::Get.new("/")
http.request(req){|res|

10
test/webrick/utils.rb
View file

@ -27,15 +27,21 @@ module TestWEBrick
module_function
def start_server(klass, config={}, &block)
log_string = ""
logger = Object.new
class << logger; self; end.class_eval do
define_method(:<<) {|msg| log_string << msg }
end
log = proc { "webrick log start:\n" + log_string.gsub(/^/, " ").chomp + "\nwebrick log end" }
server = klass.new({
:BindAddress => "127.0.0.1", :Port => 0,
:Logger => WEBrick::Log.new(NullWriter),
:Logger => WEBrick::Log.new(logger),
:AccessLog => [[NullWriter, ""]]
}.update(config))
begin
thread = Thread.start{ server.start }
addr = server.listeners[0].addr
block.call([server, addr[3], addr[1]])
block.call([server, addr[3], addr[1], log])
ensure
server.stop
thread.join

8
version.h
View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
#define RUBY_RELEASE_DATE "2010-06-10"
#define RUBY_RELEASE_DATE "2010-06-16"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20100610
#define RUBY_PATCHLEVEL 294
#define RUBY_RELEASE_CODE 20100616
#define RUBY_PATCHLEVEL 295
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 10
#define RUBY_RELEASE_DAY 16
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];