Skip to content

Commit 0b0aafc

Browse files
committed
Fix for the previous commit
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent eb87f15 commit 0b0aafc

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

lib/webrick/httpstatus.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ module WEBrick
1313
module HTTPStatus
1414

1515
class Status < StandardError
16-
def initialize(message, *rest)
17-
super(AccessLog.escape(message), *rest)
16+
def initialize(*args)
17+
args[0] = AccessLog.escape(args[0]) unless args.empty?
18+
super(*args)
1819
end
1920
class << self
2021
attr_reader :code, :reason_phrase

test/webrick/test_cgi.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def test_bad_uri
113113
assert_match(%r{\AHTTP/\d.\d 400 Bad Request}, res)
114114
s = log.call.each_line.grep(/ERROR bad URI/)[0]
115115
assert_match(DumpPat, s)
116-
assert_not_match(CtrlPat, s)
116+
refute_match(CtrlPat, s)
117117
}
118118
end
119119

@@ -127,7 +127,7 @@ def test_bad_header
127127
assert_match(%r{\AHTTP/\d.\d 400 Bad Request}, res)
128128
s = log.call.each_line.grep(/ERROR bad header/)[0]
129129
assert_match(DumpPat, s)
130-
assert_not_match(CtrlPat, s)
130+
refute_match(CtrlPat, s)
131131
}
132132
end
133133
end

version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define RUBY_VERSION "1.9.1"
2-
#define RUBY_PATCHLEVEL 377
2+
#define RUBY_PATCHLEVEL 378
33
#define RUBY_VERSION_MAJOR 1
44
#define RUBY_VERSION_MINOR 9
55
#define RUBY_VERSION_TEENY 1

0 commit comments

Comments
 (0)