Allow HttpMethod override from QueryString and FormData as well

ServiceStack · Feb 23, 2013 · 563057a · 563057a
1 parent 355b137
commit 563057a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/src/ServiceStack/WebHost.Endpoints/Extensions/HttpListenerRequestWrapper.cs b/src/ServiceStack/WebHost.Endpoints/Extensions/HttpListenerRequestWrapper.cs
@@ -235,15 +235,23 @@ public NameValueCollection FormData
 			get { return this.Form; }
 		}
 
-		private string httpMethod;
-		public string HttpMethod
-		{
-			get
-			{
-				return httpMethod
-					?? (httpMethod = request.Headers[HttpHeaders.XHttpMethodOverride] ?? request.HttpMethod);
-			}
-		}
+        private string httpMethod;
+        public string HttpMethod
+        {
+            get
+            {
+                return httpMethod
+                    ?? (httpMethod = Param(HttpHeaders.XHttpMethodOverride)
+                    ?? request.HttpMethod);
+            }
+        }
+
+        public string Param(string name)
+        {
+            return Headers[name]
+                ?? QueryString[name]
+                ?? FormData[name];
+        }
 
 		public string ContentType
 		{

diff --git a/src/ServiceStack/WebHost.Endpoints/Extensions/HttpRequestWrapper.cs b/src/ServiceStack/WebHost.Endpoints/Extensions/HttpRequestWrapper.cs
@@ -66,10 +66,18 @@ public string HttpMethod
             get
             {
                 return httpMethod
-                    ?? (httpMethod = request.Headers[HttpHeaders.XHttpMethodOverride] ?? request.HttpMethod);
+                    ?? (httpMethod = Param(HttpHeaders.XHttpMethodOverride)
+                    ?? request.HttpMethod);
             }
         }
 
+        public string Param(string name)
+        {
+            return Headers[name]
+                ?? QueryString[name]
+                ?? FormData[name];
+        }
+
         public string UserAgent
         {
             get { return request.UserAgent; }