From 06c370697505aca4c605c9c947937ecf0a1ea84c Mon Sep 17 00:00:00 2001
From: Tomohisa Takaoka <tomohisa@jtechs.com>
Date: Sat, 23 Apr 2016 01:50:53 +0900
Subject: [PATCH] upgrade name conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Problem
Message and Request both uses “upgrade”

## Reason

S4 Defines Request is following protocol but upgrade for two different
reason.
```
public struct Request: Message {
```

## Fix
request.upgrade changes to
request.onUpgrade since this is callback function
---
 Sources/Response.swift | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Sources/Response.swift b/Sources/Response.swift
index 1b6698e..13cee5b 100644
--- a/Sources/Response.swift
+++ b/Sources/Response.swift
@@ -23,46 +23,46 @@
 // SOFTWARE.
 
 extension Response {
-    public typealias Upgrade = (Request, Stream) throws -> Void
+    public typealias OnUpgrade = (Request, Stream) throws -> Void
 
-    public var upgrade: Upgrade? {
+    public var onUpgrade: OnUpgrade? {
         get {
-            return storage["response-connection-upgrade"] as? Upgrade
+            return storage["response-connection-upgrade"] as? OnUpgrade
         }
 
-        set(upgrade) {
-            storage["response-connection-upgrade"] = upgrade
+        set(onUpgrade) {
+            storage["response-connection-upgrade"] = onUpgrade
         }
     }
 }
 
 extension Response {
-    public init(status: Status = .ok, headers: Headers = [:], body: Stream, upgrade: Upgrade?) {
+    public init(status: Status = .ok, headers: Headers = [:], body: Stream, onUpgrade: OnUpgrade?) {
         self.init(
             status: status,
             headers: headers,
             body: body
         )
 
-        self.upgrade = upgrade
+        self.onUpgrade = onUpgrade
     }
 
-    public init(status: Status = .ok, headers: Headers = [:], body: Data = Data(), upgrade: Upgrade?) {
+    public init(status: Status = .ok, headers: Headers = [:], body: Data = Data(), onUpgrade: OnUpgrade?) {
         self.init(
             status: status,
             headers: headers,
             body: body
         )
 
-        self.upgrade = upgrade
+        self.onUpgrade = onUpgrade
     }
 
-    public init(status: Status = .ok, headers: Headers = [:], body: DataConvertible, upgrade: Upgrade? = nil) {
+    public init(status: Status = .ok, headers: Headers = [:], body: DataConvertible, onUpgrade: OnUpgrade? = nil) {
         self.init(
             status: status,
             headers: headers,
             body: body.data,
-            upgrade: upgrade
+            onUpgrade: onUpgrade
         )
     }
 }