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) 13771:

Browse source 
Merged 13767, 13768, 13769, and 13770 from trunk.
	* lib/xmlrpc/parser.rb (XMLRPC::Convert::dateTime): Fixing a bug that
	  caused time zone conversion to fail for some ISO 8601 date formats.
	  [ruby-Bugs-12677]
	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Explicitly start
	  the HTTP connection to support keepalive requests. [ruby-Bugs-9353]
	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the error
	  message for Content-Type check failures. [ruby-core:12163]
	* lib/xmlrpc/utils.rb (XMLRPC::ParseContentType#parse_content_type):
	  Making Content-Type checks case insensitive. [ruby-Bugs-3367]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2008-06-07 16:54:15 +00:00
parent b296c4818c
commit d40bafa47e
5 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -1,3 +1,20 @@
Sun Jun 8 01:53:50 2008 James Edward Gray II <jeg2@ruby-lang.org>
Merged 13767, 13768, 13769, and 13770 from trunk.
* lib/xmlrpc/parser.rb (XMLRPC::Convert::dateTime): Fixing a bug that
caused time zone conversion to fail for some ISO 8601 date formats.
[ruby-Bugs-12677]
* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Explicitly start
the HTTP connection to support keepalive requests. [ruby-Bugs-9353]
* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the error
message for Content-Type check failures. [ruby-core:12163]
* lib/xmlrpc/utils.rb (XMLRPC::ParseContentType#parse_content_type):
Making Content-Type checks case insensitive. [ruby-Bugs-3367]
Sun Jun 8 01:50:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Jun 8 01:50:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (r_bytes0): refined length check. [ruby-dev:32059] * marshal.c (r_bytes0): refined length check. [ruby-dev:32059]

7
lib/xmlrpc/client.rb
View file

@ -530,6 +530,9 @@ module XMLRPC
} }
else else
# reuse the HTTP object for each call => connection alive is possible # reuse the HTTP object for each call => connection alive is possible
# we must start connection explicitely first time so that http.request
# does not assume that we don't want keepalive
@http.start if not @http.started?
# post request # post request
resp = @http.post2(@path, request, header) resp = @http.post2(@path, request, header)
@ -549,9 +552,9 @@ module XMLRPC
ct = parse_content_type(resp["Content-Type"]).first ct = parse_content_type(resp["Content-Type"]).first
if ct != "text/xml" if ct != "text/xml"
if ct == "text/html" if ct == "text/html"
raise "Wrong content-type: \n#{data}" raise "Wrong content-type (received '#{ct}' but expected 'text/xml'): \n#{data}"
else else
raise "Wrong content-type" raise "Wrong content-type (received '#{ct}' but expected 'text/xml')"
end end
end end

4
lib/xmlrpc/parser.rb
View file

@ -92,7 +92,7 @@ module XMLRPC
if $7 if $7
ofs = $8.to_i*3600 + $9.to_i*60 ofs = $8.to_i*3600 + $9.to_i*60
ofs = -ofs if $7=='+' ofs = -ofs if $7=='+'
utc = Time.utc(a.reverse) + ofs utc = Time.utc(*a) + ofs
a = [ utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec ] a = [ utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec ]
end end
XMLRPC::DateTime.new(*a) XMLRPC::DateTime.new(*a)
@ -106,7 +106,7 @@ module XMLRPC
if $7 if $7
ofs = $8.to_i*3600 + $9.to_i*60 ofs = $8.to_i*3600 + $9.to_i*60
ofs = -ofs if $7=='+' ofs = -ofs if $7=='+'
utc = Time.utc(a.reverse) + ofs utc = Time.utc(*a) + ofs
a = [ utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec ] a = [ utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec ]
end end
XMLRPC::DateTime.new(*a) XMLRPC::DateTime.new(*a)

2
lib/xmlrpc/utils.rb
View file

@ -157,7 +157,7 @@ module XMLRPC
module ParseContentType module ParseContentType
def parse_content_type(str) def parse_content_type(str)
a, *b = str.split(";") a, *b = str.split(";")
return a.strip, *b return a.strip.downcase, *b
end end
end end

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 186 #define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080608 #define RUBY_RELEASE_CODE 20080608
#define RUBY_PATCHLEVEL 135 #define RUBY_PATCHLEVEL 136
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8