Merge pull request #767 from jeschu1/pathpriority

jeschu1 · web-flow · commit 2c42ca6421ff · 2018-09-27T15:43:04.000-04:00
Give path priority when supplied
diff --git a/Shared/Cli/OperationArguments.cs b/Shared/Cli/OperationArguments.cs
@@ -743,8 +743,13 @@ internal virtual void CreateTargetUri()
 
             queryUrl = buffer.ToString();
 
+            // if path is specified we should give the host/path priority
+            if (!string.IsNullOrWhiteSpace(_queryPath))
+            {
+                actualUrl = queryUrl;
+            }
             // If the actual-url override has been set, honor it.
-            if (!string.IsNullOrEmpty(_urlOverride))
+            else if (!string.IsNullOrEmpty(_urlOverride))
             {
                 if (Uri.TryCreate(_urlOverride, UriKind.Absolute, out Uri uri))
                 {

Original file line number	Diff line number	Diff line change
`@@ -743,8 +743,13 @@ internal virtual void CreateTargetUri()`
`743`	`743`
`744`	`744`	`queryUrl = buffer.ToString();`
`745`	`745`
	`746`	`+ // if path is specified we should give the host/path priority`
	`747`	`+ if (!string.IsNullOrWhiteSpace(_queryPath))`
	`748`	`+ {`
	`749`	`+ actualUrl = queryUrl;`
	`750`	`+ }`
`746`	`751`	`// If the actual-url override has been set, honor it.`
`747`		`- if (!string.IsNullOrEmpty(_urlOverride))`
	`752`	`+ else if (!string.IsNullOrEmpty(_urlOverride))`
`748`	`753`	`{`
`749`	`754`	`if (Uri.TryCreate(_urlOverride, UriKind.Absolute, out Uri uri))`
`750`	`755`	`{`