You've already forked linux-packaging-mono
Imported Upstream version 4.3.2.467
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
@@ -757,6 +757,15 @@ namespace System.Web {
|
||||
}
|
||||
else {
|
||||
_appInstance = value;
|
||||
|
||||
// Use HttpApplication instance custom allocator provider
|
||||
if (_isIntegratedPipeline) {
|
||||
// The provider allows null - everyone should fallback to default implementation
|
||||
IAllocatorProvider allocator = _appInstance != null ? _appInstance.AllocatorProvider : null;
|
||||
|
||||
_response.SetAllocatorProvider(allocator);
|
||||
((IIS7WorkerRequest)_wr).AllocatorProvider = allocator;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -902,7 +911,6 @@ namespace System.Web {
|
||||
/// </para>
|
||||
/// </devdoc>
|
||||
public HttpRequest Request {
|
||||
[System.Runtime.TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")]
|
||||
get {
|
||||
if (HideRequestResponse)
|
||||
throw new HttpException(SR.GetString(SR.Request_not_available));
|
||||
@@ -918,7 +926,6 @@ namespace System.Web {
|
||||
/// </para>
|
||||
/// </devdoc>
|
||||
public HttpResponse Response {
|
||||
[System.Runtime.TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")]
|
||||
get {
|
||||
if (HideRequestResponse || HasWebSocketRequestTransitionCompleted)
|
||||
throw new HttpException(SR.GetString(SR.Response_not_available));
|
||||
@@ -1723,7 +1730,6 @@ namespace System.Web {
|
||||
|
||||
*/
|
||||
|
||||
[System.Runtime.TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")]
|
||||
internal void BeginCancellablePeriod() {
|
||||
// It could be caused by an exception in OnThreadStart
|
||||
if (Volatile.Read(ref _timeoutStartTimeUtcTicks) == -1) {
|
||||
@@ -1741,7 +1747,6 @@ namespace System.Web {
|
||||
Interlocked.CompareExchange(ref _timeoutState, 0, 1);
|
||||
}
|
||||
|
||||
[System.Runtime.TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")]
|
||||
internal void WaitForExceptionIfCancelled() {
|
||||
while (Volatile.Read(ref _timeoutState) == -1)
|
||||
Thread.Sleep(100);
|
||||
@@ -2256,7 +2261,7 @@ namespace System.Web {
|
||||
return CultureUtil.CreateReadOnlyCulture(userLanguages, requireSpecific);
|
||||
}
|
||||
catch {
|
||||
return CultureUtil.CreateReadOnlyCulture(configString, requireSpecific);
|
||||
return CultureUtil.CreateReadOnlyCulture(configString.Substring(5 /* "auto:".Length */), requireSpecific);
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
Reference in New Issue
Block a user