diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-31 13:05:54 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-31 13:05:54 +0000 |
| commit | d7f5015ab9d1507913b8cb60305a65cc565f93a7 (patch) | |
| tree | 581ec303473dfe0fee404ab68d829df3dd3a7b2a /version.h | |
| parent | e1a2d18d9e28539968320bf120ac7739adfe5a6b (diff) | |
merges r24865,r24866,r24869,r24872,r24875,r24876 and r24877 from trunk into ruby_1_9_1.
--
* lib/open-uri.rb (URI::FTP#buffer_open): use the port specified in
the URI.
--
test ftp over http proxy.
--
fix tests.
--
test invalid redirect location.
--
* lib/open-uri.rb (URI::FTP#buffer_open): fix the %2F handling.
--
test read_timeout.
--
extra commas removed.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 325 +#define RUBY_PATCHLEVEL 326 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |