mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	* lib/xmlrpc/client.rb: Support SSL options in async methods of
XMLRPC::Client. [Bug #11489] Reported by Aleksandar Kostadinov. Thanks!!! git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									548cb582a3
								
							
						
					
					
						commit
						3d8e4d6037
					
				
					 3 changed files with 33 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -1,3 +1,10 @@
 | 
			
		|||
Sat Dec 26 18:29:01 2015  Kouhei Sutou  <kou@cozmixng.org>
 | 
			
		||||
 | 
			
		||||
	* lib/xmlrpc/client.rb: Support SSL options in async methods of
 | 
			
		||||
	  XMLRPC::Client.
 | 
			
		||||
	  [Bug #11489]
 | 
			
		||||
	  Reported by Aleksandar Kostadinov. Thanks!!!
 | 
			
		||||
 | 
			
		||||
Sat Dec 26 18:21:17 2015  NARUSE, Yui  <naruse@ruby-lang.org>
 | 
			
		||||
 | 
			
		||||
	* tool/post-commit.sh: copied from svn server.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -433,6 +433,24 @@ module XMLRPC # :nodoc:
 | 
			
		|||
      Net::HTTP.new host, port, proxy_host, proxy_port
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def dup_net_http
 | 
			
		||||
      http = net_http(@http.address,
 | 
			
		||||
                      @http.port,
 | 
			
		||||
                      @http.proxy_address,
 | 
			
		||||
                      @http.proxy_port)
 | 
			
		||||
      http.proxy_user = @http.proxy_user
 | 
			
		||||
      http.proxy_pass = @http.proxy_pass
 | 
			
		||||
      if @http.use_ssl?
 | 
			
		||||
        http.use_ssl = true
 | 
			
		||||
        Net::HTTP::SSL_ATTRIBUTES.each do |attribute|
 | 
			
		||||
          http.__send__("#{attribute}=", @http.__send__(attribute))
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
      http.read_timeout = @http.read_timeout
 | 
			
		||||
      http.open_timeout = @http.open_timeout
 | 
			
		||||
      http
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def set_auth
 | 
			
		||||
      if @user.nil?
 | 
			
		||||
        @auth = nil
 | 
			
		||||
| 
						 | 
				
			
			@ -464,10 +482,7 @@ module XMLRPC # :nodoc:
 | 
			
		|||
 | 
			
		||||
      if async
 | 
			
		||||
        # use a new HTTP object for each call
 | 
			
		||||
        http = net_http(@host, @port, @proxy_host, @proxy_port)
 | 
			
		||||
        http.use_ssl = @use_ssl if @use_ssl
 | 
			
		||||
        http.read_timeout = @timeout
 | 
			
		||||
        http.open_timeout = @timeout
 | 
			
		||||
        http = dup_net_http
 | 
			
		||||
 | 
			
		||||
        # post request
 | 
			
		||||
        http.start {
 | 
			
		||||
| 
						 | 
				
			
			@ -612,4 +627,3 @@ module XMLRPC # :nodoc:
 | 
			
		|||
  end # class Client
 | 
			
		||||
 | 
			
		||||
end # module XMLRPC
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,10 +10,15 @@ end
 | 
			
		|||
module XMLRPC
 | 
			
		||||
  class ClientTest < Test::Unit::TestCase
 | 
			
		||||
    module Fake
 | 
			
		||||
      class HTTP
 | 
			
		||||
        attr_accessor :read_timeout, :open_timeout, :use_ssl
 | 
			
		||||
      class HTTP < Net::HTTP
 | 
			
		||||
        class << self
 | 
			
		||||
          def new(*args, &block)
 | 
			
		||||
            Class.method(:new).unbind.bind(self).call(*args, &block)
 | 
			
		||||
          end
 | 
			
		||||
        end
 | 
			
		||||
 | 
			
		||||
        def initialize responses = {}
 | 
			
		||||
          super("127.0.0.1")
 | 
			
		||||
          @started = false
 | 
			
		||||
          @responses = responses
 | 
			
		||||
        end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue