         
         // set the port
         //
-        if self.requestPort?.characters.count > 0 {
-            
-            // we received a port - we'll append it if it's not a standard
-            // HTTP port that is typically used (80, 443)
+        if !portPassedWithHostName && self.requestPort?.characters.count > 0 {
+            
+            // We received a port via SERVER_PORT and no port was passed as part of our
+            // server address (probably means web address is port 80 or 443).
+            //
+            // We'll append our port to the URL if the web server is not, in fact, using a 
+            // standard HTTP port (80, 443)
             //
             if !FastCGIServerRequest.defaultHttpPorts.contains(self.requestPort!) {
                 #if os(Linux)

                self.url.append(StringUtils.toUtf8String(self.requestServerAddress!)! as Data)
           #endif
            
        } else {
            
            // use a failover default as the server address

            self.url.append(StringUtils.toUtf8String("://")! as Data)
        #endif
        
        // detector for our port
        var portPassedWithHostName : Bool = false
        
        // set our host name
        //
        if self.requestHost?.characters.count > 0 {
