瀏覽代碼

Merge pull request #136 from jakajancar/origin-fix

Origin syntax fix
Dan Federman 10 年之前
父節點
當前提交
51b8e2b0c2
共有 1 個文件被更改,包括 7 次插入3 次删除
  1. 7 3
      SocketRocket/SRWebSocket.m

+ 7 - 3
SocketRocket/SRWebSocket.m

@@ -1594,10 +1594,14 @@ static const size_t SRFrameHeaderOverhead = 32;
         scheme = @"http";
     }
     
-    if (self.port) {
-        return [NSString stringWithFormat:@"%@://%@:%@/", scheme, self.host, self.port];
+    BOOL portIsDefault = !self.port ||
+                         ([scheme isEqualToString:@"http"] && self.port.integerValue == 80) ||
+                         ([scheme isEqualToString:@"https"] && self.port.integerValue == 443);
+    
+    if (!portIsDefault) {
+        return [NSString stringWithFormat:@"%@://%@:%@", scheme, self.host, self.port];
     } else {
-        return [NSString stringWithFormat:@"%@://%@/", scheme, self.host];
+        return [NSString stringWithFormat:@"%@://%@", scheme, self.host];
     }
 }