                 self.url.append(StringUtils.toUtf8String(self.requestHost!)! as Data)
             #endif
             
+            if self.requestHost!.contains(":") {
+                portPassedWithHostName = true
+            }
+            
         } else if self.requestServerName?.characters.count > 0 {
             
             // use the requested server name as received

        
        // 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 !FastCGIServerRequest.defaultHttpPorts.contains(self.requestPort!) {
                #if os(Linux)

                self.url.append(StringUtils.toUtf8String(self.requestServerName!)! as Data)
            #endif
            
            if self.requestHost!.contains(":") {
                portPassedWithHostName = true
            }
            
        } else if self.requestServerAddress?.characters.count > 0 {
            
            // use the requested server address as received
