Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ internal static void RegisterHttpRequestMessage(this HttpConfiguration config, C
if (config.MessageHandlers.OfType<CurrentRequestHandler>().Any()) return;

builder.Register(c => HttpRequestMessageProvider.Current)
.InstancePerRequest();
.InstancePerRequest()
.ExternallyOwned();

config.MessageHandlers.Add(new CurrentRequestHandler());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@

using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
using System.Web.Http;
using Autofac.Core.Lifetime;
using Xunit;

namespace Autofac.Integration.WebApi.Test
Expand Down Expand Up @@ -65,5 +67,33 @@ public void RegisterHttpRequestMessageAddsRegistration()
var container = builder.Build();
Assert.True(container.IsRegistered<HttpRequestMessage>());
}

[Fact]
public async Task RegisterHttpRequestMessageNotDisposeAfterScopeDipose()
{
var config = new HttpConfiguration();
var builder = new ContainerBuilder();

config.RegisterHttpRequestMessage(builder);

var container = builder.Build();
Assert.True(container.IsRegistered<HttpRequestMessage>());

var httpRequestMessage = new HttpRequestMessage
{
Content = new StringContent("")
};

HttpRequestMessageProvider.Current = httpRequestMessage;
var result = HttpRequestMessageProvider.Current;


using (var scope = container.BeginLifetimeScope(MatchingScopeLifetimeTags.RequestLifetimeScopeTag))
{
Assert.Same(result, scope.Resolve<HttpRequestMessage>());
}

_ = await result.Content.ReadAsStringAsync();
}
}
}