Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,6 @@ docs/html/

#NuGet
*.nupkg
/src/packages/
src/packages/
.vs/
src/UpgradeLog.htm
9 changes: 6 additions & 3 deletions src/corelib/OpenStackNet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,16 @@ public static void Configure(Action<FlurlHttpConfigurationOptions> configureFlur

FlurlHttp.Configure(c =>
{
// Apply our default settings
c.HttpClientFactory = new AuthenticatedHttpClientFactory();

// Apply the application's default settings
if (configureFlurl != null)
configureFlurl(c);

//
// Apply our default settings
//
if(c.HttpClientFactory is DefaultHttpClientFactory)
c.HttpClientFactory = new AuthenticatedHttpClientFactory();

// Apply our event handling without clobbering any application level handlers
var applicationBeforeCall = c.BeforeCall;
c.BeforeCall = call =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,6 @@ public void TestExtractArchiveTar()
archive.RootPath = Path.GetDirectoryName(Path.GetFullPath(sourceFileName)).Replace('\\', '/');
TarEntry entry = TarEntry.CreateEntryFromFile(sourceFileName);
archive.WriteEntry(entry, true);
archive.Close();
}

outputStream.Flush();
Expand Down Expand Up @@ -1769,7 +1768,6 @@ public void TestExtractArchiveTarGz()
archive.RootPath = Path.GetDirectoryName(Path.GetFullPath(sourceFileName)).Replace('\\', '/');
TarEntry entry = TarEntry.CreateEntryFromFile(sourceFileName);
archive.WriteEntry(entry, true);
archive.Close();
}
}

Expand Down Expand Up @@ -1825,7 +1823,6 @@ public void TestExtractArchiveTarBz2()
archive.RootPath = Path.GetDirectoryName(Path.GetFullPath(sourceFileName)).Replace('\\', '/');
TarEntry entry = TarEntry.CreateEntryFromFile(sourceFileName);
archive.WriteEntry(entry, true);
archive.Close();
}
}

Expand Down Expand Up @@ -1884,7 +1881,6 @@ public void TestExtractArchiveTarGzCreateContainer()
tarOutputStream.PutNextEntry(entry);
tarOutputStream.Write(content, 0, content.Length);
tarOutputStream.CloseEntry();
tarOutputStream.Close();
}
}

Expand Down