From 3a2bad4a7eee76264dbce9d1f739527be16246ec Mon Sep 17 00:00:00 2001 From: mneumann Date: Fri, 24 Jun 2005 20:27:43 +0000 Subject: * lib/xmlrpc/*, test/xmlrpc/*: backported changes from HEAD into 1.8 git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/xmlrpc/server.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/xmlrpc/server.rb') diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb index 0ef3ca4c9..785880d30 100644 --- a/lib/xmlrpc/server.rb +++ b/lib/xmlrpc/server.rb @@ -448,7 +448,7 @@ class CGIServer < BasicServer length = ENV['CONTENT_LENGTH'].to_i http_error(405, "Method Not Allowed") unless ENV['REQUEST_METHOD'] == "POST" - http_error(400, "Bad Request") unless ENV['CONTENT_TYPE'] == "text/xml" + http_error(400, "Bad Request") unless parse_content_type(ENV['CONTENT_TYPE']).first == "text/xml" http_error(411, "Length Required") unless length > 0 # TODO: do we need a call to binmode? @@ -792,27 +792,27 @@ class WEBrickServlet < BasicServer def service(request, response) if request.request_method != "POST" - raise HTTPStatus::MethodNotAllowed, + raise WEBrick::HTTPStatus::MethodNotAllowed, "unsupported method `#{request.request_method}'." end if parse_content_type(request['Content-type']).first != "text/xml" - raise HTTPStatus::BadRequest + raise WEBrick::HTTPStatus::BadRequest end length = (request['Content-length'] || 0).to_i - raise HTTPStatus::LengthRequired unless length > 0 + raise WEBrick::HTTPStatus::LengthRequired unless length > 0 data = request.body if data.nil? or data.size != length - raise HTTPStatus::BadRequest + raise WEBrick::HTTPStatus::BadRequest end resp = process(data) if resp.nil? or resp.size <= 0 - raise HTTPStatus::InternalServerError + raise WEBrick::HTTPStatus::InternalServerError end response.status = 200 -- cgit