From 735971d623a016848c9b1c229edfbdc60017bcf8 Mon Sep 17 00:00:00 2001
From: Jason Flax <jsflax@gmail.com>
Date: Mon, 29 Jun 2020 18:07:08 +0100
Subject: [PATCH] Revert OS; remove proxy.rb

---
 Realm/ObjectServerTests/RLMSyncTestCase.h |   8 --
 Realm/ObjectServerTests/proxy.rb          | 123 ----------------------
 Realm/ObjectStore                         |   2 +-
 3 files changed, 1 insertion(+), 132 deletions(-)
 delete mode 100644 Realm/ObjectServerTests/proxy.rb

diff --git a/Realm/ObjectServerTests/RLMSyncTestCase.h b/Realm/ObjectServerTests/RLMSyncTestCase.h
index f5ca14347ae..693df08763b 100644
--- a/Realm/ObjectServerTests/RLMSyncTestCase.h
+++ b/Realm/ObjectServerTests/RLMSyncTestCase.h
@@ -59,14 +59,6 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)objectWithRealmId:(NSString *)realmId;
 @end
 
-//@interface RealmObjectServer : NSObject
-//@property (nonatomic, readonly) NSString *appId;
-//+ (instancetype)sharedServer;
-//
-//- (NSString *)createApp;
-//
-//@end
-
 @interface RLMSyncTestCase : RLMMultiProcessTestCase
 
 @property (nonatomic, readonly) NSString *appId;
diff --git a/Realm/ObjectServerTests/proxy.rb b/Realm/ObjectServerTests/proxy.rb
deleted file mode 100644
index 947cdcf4fde..00000000000
--- a/Realm/ObjectServerTests/proxy.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env ruby
-# A quick and dirty implementation of an HTTP proxy server in Ruby
-# because I did not want to install anything.
-#
-# Copyright (C) 2009-2014 Torsten Becker <torsten.becker@gmail.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'socket'
-require 'uri'
-
-
-class Proxy
-  def run(port, delay)
-    @port = port
-    @delay = delay
-    begin
-      # Start our server to handle connections (will raise things on errors)
-      @socket = TCPServer.new port
-
-      # Handle every request in another thread
-      loop do
-        s = @socket.accept
-        Thread.new s, &method(:handle_request)
-      end
-
-    # CTRL-C
-    rescue Interrupt
-      puts 'Got Interrupt..'
-    # Ensure that we release the socket on errors
-    ensure
-      if @socket
-        @socket.close
-        puts 'Socked closed..'
-      end
-      puts 'Quitting.'
-    end
-  end
-
-  def handle_request to_client
-    request_line = to_client.readline
-
-    verb    = request_line[/^\w+/]
-    url     = request_line[/^\w+\s+(\S+)/, 1]
-    version = request_line[/HTTP\/(1\.\d)\s*$/, 1]
-    uri     = URI::parse url
-
-    # Show what got requested
-    puts((" %4s "%verb) + url)
-
-    to_server = TCPSocket.new('localhost', 9090)
-
-    sleep(@delay)
-
-    to_server.write("#{verb} #{uri.path}?#{uri.query} HTTP/#{version}\r\n")
-
-    content_len = 0
-
-    loop do
-      line = to_client.readline
-
-      if line =~ /^Content-Length:\s+(\d+)\s*$/
-        content_len = $1.to_i
-      end
-
-      # Strip proxy headers
-      if line =~ /^proxy/i
-        next
-      elsif line.strip.empty?
-        to_server.write("Connection: close\r\n\r\n")
-
-        if content_len >= 0
-          to_server.write(to_client.read(content_len))
-        end
-
-        break
-      else
-        to_server.write(line)
-      end
-    end
-
-    buff = ""
-    loop do
-        to_server.read(4048, buff)
-        to_client.write(buff)
-      break if buff.size < 4048
-    end
-
-    # Close the sockets
-    to_client.close
-    to_server.close
-  end
-
-end
-
-if ARGV.length < 1
-    abort("🔴 too few arguments")
-end
-
-case ARGV[0]
-when "start_proxy"
-    if ARGV.length < 3
-        abort("🔴 too few arguments to start proxy. requires [port] and [delay]")
-    end
-    Proxy.new.run(ARGV[1].to_i, ARGV[2].to_i)
-end
diff --git a/Realm/ObjectStore b/Realm/ObjectStore
index e92afa174aa..709e69580f4 160000
--- a/Realm/ObjectStore
+++ b/Realm/ObjectStore
@@ -1 +1 @@
-Subproject commit e92afa174aa1bdb9c008590791850ff809ee90b2
+Subproject commit 709e69580f480051da8be8b444df400c64c652f8