aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--lib/net/http/generic_request.rb9
2 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e44610b61f..7f43728324 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jan 5 21:15:10 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/net/http/generic_request.rb:
+ Amazon ECA API and GTE/1.3 disallow requests whose host has port
+ number if its port number equlas to default port number of the
+ scheme. [Bug #7650]
+
Sat Jan 5 13:58:59 2013 Eric Hodel <drbrain@segment7.net>
* doc/syntax/modules_and_classes.rdoc: Improved description of methods
diff --git a/lib/net/http/generic_request.rb b/lib/net/http/generic_request.rb
index e8525b3d15..568131fe8d 100644
--- a/lib/net/http/generic_request.rb
+++ b/lib/net/http/generic_request.rb
@@ -99,7 +99,14 @@ class Net::HTTPGenericRequest
#
def exec(sock, ver, path) #:nodoc: internal use only
- self['host'] = "#{@uri.host}:#{@uri.port}" if @uri
+ if @uri
+ if @uri.port == @uri.default_port
+ # [Bug #7650] Amazon ECS API and GFE/1.3 disallow extra default port number
+ self['host'] = @uri.host
+ else
+ self['host'] = "#{@uri.host}:#{@uri.port}"
+ end
+ end
if @body
send_request_with_body sock, ver, path, @body