lib/elasticsearch/transport/transport/http/curb.rb in elasticsearch-transport-6.8.3 vs lib/elasticsearch/transport/transport/http/curb.rb in elasticsearch-transport-7.0.0.pre
- old
+ new
@@ -1,8 +1,21 @@
-# Licensed to Elasticsearch B.V under one or more agreements.
-# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-# See the LICENSE file in the project root for more information
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
module Elasticsearch
module Transport
module Transport
module HTTP
@@ -17,12 +30,12 @@
# Performs the request by invoking {Transport::Base#perform_request} with a block.
#
# @return [Response]
# @see Transport::Base#perform_request
#
- def perform_request(method, path, params={}, body=nil, headers=nil, opts={})
+ def perform_request(method, path, params={}, body=nil, headers=nil)
super do |connection, url|
- connection.connection.url = url
+ connection.connection.url = connection.full_url(path, params)
case method
when 'HEAD'
connection.connection.set :nobody, true
when 'GET', 'POST', 'PUT', 'DELETE'