huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add an option to configure the NewtonsoftJson buffer size (#22735) 

* Add an option to configure the NewtonsoftJson buffer size
Contributes to https://github.com/dotnet/aspnetcore/issues/21245

* Update src/Mvc/Mvc.NewtonsoftJson/src/MvcNewtonsoftJsonOptions.cs

Co-authored-by: Stephen Halter <halter73@gmail.com>

Co-authored-by: Stephen Halter <halter73@gmail.com>
This commit is contained in:
Pranav K 2020-06-15 12:07:26 -07:00 committed by GitHub
parent ef5ab43b6f
commit bab5a8f1b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mvc/Mvc.NewtonsoftJson/src/MvcNewtonsoftJsonOptions.cs
View File

@ -39,6 +39,16 @@ namespace Microsoft.AspNetCore.Mvc
/// </summary>
public JsonSerializerSettings SerializerSettings { get; } = JsonSerializerSettingsProvider.CreateSerializerSettings();
/// <summary>
/// Gets the maximum size to buffer in memory when <see cref="MvcOptions.SuppressInputFormatterBuffering"/> is not set.
/// <para>
/// <see cref="NewtonsoftJsonInputFormatter"/> buffers the input stream by default, buffering up to a certain amount in memory, before buffering to disk.
/// This option configures the size in bytes that MVC will buffer in memory, before switching to disk.
/// </para>
/// </summary>
/// <value>Defaults to 30Kb.</value>
public int InputFormatterMemoryBufferThreshold { get; set; } = 1024 * 30;
IEnumerator<ICompatibilitySwitch> IEnumerable<ICompatibilitySwitch>.GetEnumerator() => _switches.GetEnumerator();
IEnumerator IEnumerable.GetEnumerator() => _switches.GetEnumerator();

3
src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonInputFormatter.cs
View File

@ -22,7 +22,6 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
/// </summary>
public class NewtonsoftJsonInputFormatter : TextInputFormatter, IInputFormatterExceptionPolicy
{
private const int DefaultMemoryThreshold = 1024 * 30;
private readonly IArrayPool<char> _charPool;
private readonly ILogger _logger;
private readonly ObjectPoolProvider _objectPoolProvider;
@ -144,7 +143,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
{
// JSON.Net does synchronous reads. In order to avoid blocking on the stream, we asynchronously
// read everything into a buffer, and then seek back to the beginning.
var memoryThreshold = DefaultMemoryThreshold;
var memoryThreshold = _jsonOptions.InputFormatterMemoryBufferThreshold;
var contentLength = request.ContentLength.GetValueOrDefault();
if (contentLength > 0 && contentLength < memoryThreshold)
{