websocket-driver 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 046c514660d2c0dab2cf42bce8314a17e713909377a5da470beaeadf666ff28e
-  data.tar.gz: 9830c412394044d102dd6f313346721076ef0f97284d6182aeb06862e1f427b2
+  metadata.gz: 48624348056a8a90b22cf6844120166be3ec700a80ec4ab23c1d6c1f5e43aa1a
+  data.tar.gz: 0f157eaba15f2cd8c544042700159a692b0bf74f71a03c40b3da04a705409236
 SHA512:
-  metadata.gz: cea4027f342f51a688c8004a92ca29b68af9a9395b5e7f8d2462b8742067862718d23f4be9ca6162f761774490e4cdf33111bb746f9221d5acace6546a749b35
-  data.tar.gz: d124aa6acf1cbfa498b44d02d6aa659c99e97e177441e8cbd43958db38c6cf03d703d26ae73998a09719c0612f538554049d58b58aa8cc8ab5f0bb458e27c988
+  metadata.gz: f27c8eafe669ee83b263f56d1b0aeb49bcfba6c5bcc1b027b3bf3a04f71c58e7d9bc6fa99a24f8f4724f6f3d5961a7c90c2fdea978b6f9f1324d5a3f1012d056
+  data.tar.gz: 833502731fc73a3b05664d29343199e4c07e5b77825b5a3b2b851d6742506d7c33207a5da0369f692cc073c0e192583db083ba127abaa85eb9b130b4ac1aeb7f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.7.6 / 2023-07-25
+
+- Fix handling of default ports in `Host` headers on Ruby 3.1+
+
 ### 0.7.5 / 2021-06-12
 
 - Do not change the encoding of strings passed to `Driver#text`

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2010-2021 James Coglan
+Copyright 2010-2023 James Coglan
 
 Licensed 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

data/lib/websocket/driver/client.rb

@@ -23,11 +23,10 @@ module WebSocket
           raise URIError, "#{ socket.url } is not a valid WebSocket URL"
         end
 
-        host      = uri.host + (uri.port ? ":#{ uri.port }" : '')
         path      = (uri.path == '') ? '/' : uri.path
         @pathname = path + (uri.query ? '?' + uri.query : '')
 
-        @headers['Host']                  = host
+        @headers['Host']                  = Driver.host_header(uri)
         @headers['Upgrade']               = 'websocket'
         @headers['Connection']            = 'Upgrade'
         @headers['Sec-WebSocket-Key']     = @key

data/lib/websocket/driver/hybi.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 module WebSocket
   class Driver
 

data/lib/websocket/driver/proxy.rb

@@ -4,8 +4,6 @@ module WebSocket
     class Proxy
       include EventEmitter
 
-      PORTS = { 'ws' => 80, 'wss' => 443 }
-
       attr_reader :status, :headers
 
       def initialize(client, origin, options)
@@ -20,7 +18,7 @@ module WebSocket
         @state   = 0
 
         @headers = Headers.new
-        @headers['Host'] = @origin.host + (@origin.port ? ":#{ @origin.port }" : '')
+        @headers['Host'] = Driver.host_header(@origin)
         @headers['Connection'] = 'keep-alive'
         @headers['Proxy-Connection'] = 'keep-alive'
 

data/lib/websocket/driver.rb

@@ -42,6 +42,7 @@ module WebSocket
     end
 
     MAX_LENGTH = 0x3ffffff
+    PORTS      = { 'ws' => 80, 'wss' => 443 }
     STATES     = [:connecting, :open, :closing, :closed]
 
     ConnectEvent = Struct.new(nil)
@@ -209,6 +210,14 @@ module WebSocket
       data.force_encoding(encoding)
     end
 
+    def self.host_header(uri)
+      host = uri.host
+      if uri.port and uri.port != PORTS[uri.scheme]
+        host += ":#{uri.port}"
+      end
+      host
+    end
+
     def self.validate_options(options, valid_keys)
       options.keys.each do |key|
         unless valid_keys.include?(key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - James Coglan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-12 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-extensions
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: WebSocket protocol handler with pluggable I/O