Permalink
Browse files

Merge branch 'master' of git://github.com/rails/rails

  • Loading branch information...
2 parents 7ec02d9 + 4d2ccbb commit ddd9043b37931125234d35657bccdfe363bc2b07 @duncanbeevers committed Nov 23, 2008
@@ -4,5 +4,6 @@
gem 'rack', '~> 0.4.0'
require 'rack'
rescue Gem::LoadError
- require "#{File.dirname(__FILE__)}/rack-0.4.0/rack"
+ $LOAD_PATH << "#{File.dirname(__FILE__)}/rack-0.4.0"
+ require 'rack'
end
@@ -13,7 +13,9 @@ def self.append_features(base)
# When $KCODE = 'UTF8', multi-byte characters are yielded appropriately.
def each_char
scanner, char = StringScanner.new(self), /./mu
- loop { yield(scanner.scan(char) || break) }
+ while c = scanner.scan(char)
+ yield c
+ end
end
end
end

0 comments on commit ddd9043

Please sign in to comment.