Added URL port support

This does not work for bare IP addresses.

Author: nazuke

MacroscopeStandards/MacroscopeRobots.cs

@@ -179,6 +179,7 @@ public static string GenerateRobotUrl ( string Url )
         DebugMsg( string.Format( "ROBOTS Disabled: {0}", Url ), true );
 
         Uri BaseUri = null;
+        string BaseUriPort = "";
         Uri RobotsUri = null;
         string RobotsTxtUrl = null;
 
@@ -187,11 +188,17 @@ public static string GenerateRobotUrl ( string Url )
 
           BaseUri = new Uri ( Url, UriKind.Absolute );
 
+          if( BaseUri.Port > 0 )
+          {
+            BaseUriPort = string.Format( ":{0}", BaseUri.Port );
+          }
+                  
           RobotsUri = new Uri (
             string.Format(
-              "{0}://{1}{2}",
+              "{0}://{1}{2}{3}",
               BaseUri.Scheme,
               BaseUri.Host,
+              BaseUriPort,
               "/robots.txt"
             ),
             UriKind.Absolute

MacroscopeTools/MacroscopeUrlUtils.cs

@@ -101,6 +101,7 @@ public static string MakeUrlAbsolute ( string BaseUrl, string Url )
 
       string UrlFixed;
       Uri BaseUri = null;
+      string BaseUriPort = "";
       Uri NewUri = null;
 
       Regex reHTTP = new Regex ( "^https?:" );
@@ -110,13 +111,22 @@ public static string MakeUrlAbsolute ( string BaseUrl, string Url )
       Regex reHash = new Regex ( "^#" );
       Regex reUnsupportedScheme = new Regex ( "^[^:]+:" );
 
+      BaseUrl = HtmlEntity.DeEntitize( BaseUrl );
+      BaseUrl = Uri.UnescapeDataString( BaseUrl );
+      
       Url = HtmlEntity.DeEntitize( Url );
-
       Url = Uri.UnescapeDataString( Url );
 
       try
       {
+        
         BaseUri = new Uri ( BaseUrl, UriKind.Absolute );
+        
+        if( BaseUri.Port > 0 )
+        {
+          BaseUriPort = string.Format( ":{0}", BaseUri.Port );
+        }
+        
       }
       catch( UriFormatException ex )
       {
@@ -193,9 +203,10 @@ public static string MakeUrlAbsolute ( string BaseUrl, string Url )
         {
           NewUri = new Uri (
             string.Format(
-              "{0}://{1}{2}",
+              "{0}://{1}{2}{3}",
               BaseUri.Scheme,
               BaseUri.Host,
+              BaseUriPort,
               Url
             ),
             UriKind.Absolute
@@ -220,9 +231,10 @@ public static string MakeUrlAbsolute ( string BaseUrl, string Url )
         {
           NewUri = new Uri (
             string.Format(
-              "{0}://{1}{2}{3}",
+              "{0}://{1}{2}{3}{4}",
               BaseUri.Scheme,
               BaseUri.Host,
+              BaseUriPort,
               BaseUri.AbsolutePath,
               Url
             ),
@@ -252,9 +264,10 @@ public static string MakeUrlAbsolute ( string BaseUrl, string Url )
         {
           NewUri = new Uri (
             string.Format(
-              "{0}://{1}{2}",
+              "{0}://{1}{2}{3}",
               BaseUri.Scheme,
               BaseUri.Host,
+              BaseUriPort,
               NewUrl
             ),
             UriKind.Absolute
@@ -313,9 +326,10 @@ public static string MakeUrlAbsolute ( string BaseUrl, string Url )
         {
           NewUri = new Uri (
             string.Format(
-              "{0}://{1}{2}",
+              "{0}://{1}{2}{3}",
               BaseUri.Scheme,
               BaseUri.Host,
+              BaseUriPort,
               NewPath
             ),
             UriKind.Absolute

notes.txt

@@ -6,3 +6,10 @@ HTTP Protocol tests: http://httpbin.org/
 Google Search Console API Documentation:
 
 https://developers.google.com/webmaster-tools/
+
+
+
+
+
+
+http://10.0.1.8:4000/manual/