Temp add c.reset

Author: otahi

lib/pacproxy/pacproxy.rb

@@ -117,6 +117,9 @@ def do_connect(client_s, _method, unparsed_uri, _version)
 
       # TODO: write log
       transfer_data(client_s, server_s)
+    ensure
+      server_s.close unless server_s.closed?
+      client_s.close unless client_s.closed?
     end
 
     def transfer_data(client_s, server_s)
@@ -127,13 +130,9 @@ def transfer_data(client_s, server_s)
           client_s.write(server_s.read_nonblock(BUFFER_SIZE))
         end
       end
-      client_s.write_nonblock("\0")
-      server_s.write_nonblock("\0")
     rescue => e
       STDOUT.puts('Error' +  e)
     ensure
-      server_s.close unless server_s.closed?
-      client_s.close unless client_s.closed?
       STDOUT.puts('server_s client_s closed')
     end
 

spec/pacproxy_spec.rb

@@ -22,6 +22,7 @@ def wait_server_status(servers, status)
 
   describe 'Pacproxy#proxy_uri' do
     before(:each) do
+      STDERR.puts(`netstat -an | grep \'.13\'`)
       $stdout, $stderr = StringIO.new, StringIO.new
       @http_server = WEBrick::HTTPServer.new(Port: 13_080)
       @http_server.define_singleton_method(:service) do |_req, res|
@@ -56,6 +57,7 @@ def wait_server_status(servers, status)
                           @pacproxy_server],
                          :Stop)
       STDERR.puts 'wait_server_status done'
+      STDERR.puts(`netstat -an | grep \'.13\'|grep tcp4`)
     end
 
     it 'transfer request to server directly' do
@@ -102,6 +104,7 @@ def wait_server_status(servers, status)
       STDERR.puts 'HTTPClient request 2 done'
       expect(res.status).to eq(200)
       STDERR.puts 'transfer request to server directly via HTTPS exiting'
+      c.reset_all
     end
 
     it 'transfer request to server directly with PUT method' do