Match desktop behavior GetRequestStream/BeginGetRequestStream throws on invalid verb

Author: safern

src/System.Net.Requests/src/System/Net/HttpWebRequest.cs

@@ -1023,11 +1023,6 @@ private Task<Stream> InternalGetRequestStream()
         {
             CheckAbort();
 
-            if (RequestSubmitted)
-            {
-                throw new InvalidOperationException(SR.net_reqsubmitted);
-            }
-
             // Match Desktop behavior: prevent someone from getting a request stream
             // if the protocol verb/method doesn't support it. Note that this is not
             // entirely compliant RFC2616 for the aforementioned compatibility reasons.
@@ -1038,6 +1033,11 @@ private Task<Stream> InternalGetRequestStream()
                 throw new ProtocolViolationException(SR.net_nouploadonget);
             }
 
+            if (RequestSubmitted)
+            {
+                throw new InvalidOperationException(SR.net_reqsubmitted);
+            }
+
             _requestStream = new RequestStream();
 
             return Task.FromResult((Stream)_requestStream);
@@ -1065,7 +1065,7 @@ public override IAsyncResult BeginGetRequestStream(AsyncCallback callback, Objec
             }
 
             _requestStreamCallback = callback;
-            _requestStreamOperation = GetRequestStreamTask().ToApm(callback, state);
+            _requestStreamOperation = InternalGetRequestStream().ToApm(callback, state);
 
             return _requestStreamOperation.Task;
         }
@@ -1097,30 +1097,6 @@ public override Stream EndGetRequestStream(IAsyncResult asyncResult)
             return stream;
         }
 
-        private Task<Stream> GetRequestStreamTask()
-        {
-            CheckAbort();
-
-            if (RequestSubmitted)
-            {
-                throw new InvalidOperationException(SR.net_reqsubmitted);
-            }
-
-            // Match Desktop behavior: prevent someone from getting a request stream
-            // if the protocol verb/method doesn't support it. Note that this is not
-            // entirely compliant RFC2616 for the aforementioned compatibility reasons.
-            if (string.Equals(HttpMethod.Get.Method, _originVerb, StringComparison.OrdinalIgnoreCase) ||
-                string.Equals(HttpMethod.Head.Method, _originVerb, StringComparison.OrdinalIgnoreCase) ||
-                string.Equals("CONNECT", _originVerb, StringComparison.OrdinalIgnoreCase))
-            {
-                throw new ProtocolViolationException(SR.net_nouploadonget);
-            }
-
-            _requestStream = new RequestStream();
-
-            return Task.FromResult((Stream)_requestStream);
-        }
-
         private async Task<WebResponse> SendRequest()
         {
             if (RequestSubmitted)

src/System.Net.Requests/tests/HttpWebRequestTest.cs

@@ -861,13 +861,12 @@ public void BeginGetRequestStream_CreatePostRequestThenCallTwice_ThrowsInvalidOp
         }
 
         [Theory, MemberData(nameof(EchoServers))]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "request stream not allowed for GET on netfx")]
-        public void BeginGetRequestStream_CreateRequestThenBeginGetResponsePrior_ThrowsInvalidOperationException(Uri remoteServer)
+        public void BeginGetRequestStream_CreateRequestThenBeginGetResponsePrior_ThrowsProtocolViolationException(Uri remoteServer)
         {
             HttpWebRequest request = HttpWebRequest.CreateHttp(remoteServer);
 
             IAsyncResult asyncResult = request.BeginGetResponse(null, null);
-            Assert.Throws<InvalidOperationException>(() =>
+            Assert.Throws<ProtocolViolationException>(() =>
             {
                 request.BeginGetRequestStream(null, null);
             });