Bringing in fix for non-standard ports, courtesy of @theorm

Author: Christopher Swasey

GCOAuth.h

@@ -98,6 +98,19 @@
                         tokenSecret:(NSString *)tokenSecret;
 @end
 
+@interface NSString (GCOAuthAdditions)
+
+// better percent escape
+- (NSString *)pcen;
+@end
+
+@interface NSURL (GCOAuthURL)
+
+/*
+ Get host:port from URL unless port is 80 or 443 (http://tools.ietf.org/html/rfc5849#section-3.4.1.2). Otherwis reurn only host.
+ */
+- (NSString *)hostAndPort;
+@end
 /*
  
  XAuth example (because you may otherwise be scratching your head):

GCOAuth.m

@@ -76,12 +76,6 @@ - (NSString *)signature;
 // generate signature base
 - (NSString *)signatureBase;
 
-@end
-@interface NSString (GCOAuthAdditions)
-
-// better percent escape
-- (NSString *)pcen;
-
 @end
 
 @implementation GCOAuth
@@ -171,7 +165,7 @@ - (NSString *)signatureBase {
     NSURL *URL = self.URL;
     NSString *URLString = [NSString stringWithFormat:@"%@://%@%@",
                            [[URL scheme] lowercaseString],
-                           [[URL host] lowercaseString],
+                           [[URL hostAndPort] lowercaseString],
                            [URL path]];
 
     // create components
@@ -318,6 +312,17 @@ + (NSURLRequest *)URLRequestForPath:(NSString *)path
 }
 
 @end
+
+@implementation NSURL  (GCOAuthURL)
+- (NSString *)hostAndPort {
+    if ([self port] != nil && [[self port] intValue] != 80 && [[self port] intValue] != 443) {
+        return [NSString stringWithFormat:@"%@:%@", [self host], [self port]];
+    } else {
+        return [self host];
+    }
+}
+@end
+
 @implementation NSString (GCOAuthAdditions)
 - (NSString *)pcen {
     CFStringRef string = CFURLCreateStringByAddingPercentEscapes(NULL,