temporarily disabling HttpServer related stuff (take #2: Exclude takes

regex not shell glob)

3 files changed, 54 insertions, 49 deletions

diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs
index 01e71c8..9c1053c 100644
--- a/OpenSim/Framework/Servers/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/OSHttpRequest.cs
@@ -151,17 +151,17 @@ namespace OpenSim.Framework.Servers
         }
         private IPEndPoint _ipEndPoint;
 
-        internal HttpRequest HttpRequest
-        {
-            get { return _request; }
-        }
-        private HttpRequest _request;
+        // internal HttpRequest HttpRequest
+        // {
+        //     get { return _request; }
+        // }
+        // private HttpRequest _request;
 
-        internal HttpClientContext HttpClientContext
-        {
-            get { return _context; }
-        }
-        private HttpClientContext _context;
+        // internal HttpClientContext HttpClientContext
+        // {
+        //     get { return _context; }
+        // }
+        // private HttpClientContext _context;
 
         /// <summary>
         /// Internal whiteboard for handlers to store temporary stuff
@@ -199,40 +199,40 @@ namespace OpenSim.Framework.Servers
             // _isAuthenticated = req.IsAuthenticated;
         }
 
-        public OSHttpRequest(HttpClientContext context, HttpRequest req)
-        {
-            _context = context;
-            _request = req;
-
-            _acceptTypes = req.AcceptTypes;
-            if (null != req.Headers["content-encoding"])
-                _contentEncoding = Encoding.GetEncoding(_request.Headers["content-encoding"]);
-            _contentLength64 = req.ContentLength;
-            if (null != req.Headers["content-type"])
-                _contentType = _request.Headers["content-type"];
-            _headers = req.Headers;
-            _httpMethod = req.Method;
-            _hasbody = req.ContentLength != 0;
-            _inputStream = req.Body;
-            _keepAlive = ConnectionType.KeepAlive == req.Connection;
-            _rawUrl = req.Uri.AbsolutePath;
-            _url = req.Uri;
-            if (null != req.Headers["user-agent"])
-                _userAgent = req.Headers["user-agent"];
-            _queryString = new NameValueCollection();
-            _query = new Hashtable();
-            foreach (KeyValuePair<string, HttpInputItem> q in req.QueryString)
-            {
-                _queryString.Add(q.Key, q.Value.Value);
-                _query[q.Key] = q.Value.Value;
-            }
-            // TODO: requires change to HttpServer.HttpRequest
-            _ipEndPoint = null;
-
-            // _cookies = req.Cookies;
-            // _isSecureConnection = req.IsSecureConnection;
-            // _isAuthenticated = req.IsAuthenticated;
-        }
+        // public OSHttpRequest(HttpClientContext context, HttpRequest req)
+        // {
+        //     _context = context;
+        //     _request = req;
+
+        //     _acceptTypes = req.AcceptTypes;
+        //     if (null != req.Headers["content-encoding"])
+        //         _contentEncoding = Encoding.GetEncoding(_request.Headers["content-encoding"]);
+        //     _contentLength64 = req.ContentLength;
+        //     if (null != req.Headers["content-type"])
+        //         _contentType = _request.Headers["content-type"];
+        //     _headers = req.Headers;
+        //     _httpMethod = req.Method;
+        //     _hasbody = req.ContentLength != 0;
+        //     _inputStream = req.Body;
+        //     _keepAlive = ConnectionType.KeepAlive == req.Connection;
+        //     _rawUrl = req.Uri.AbsolutePath;
+        //     _url = req.Uri;
+        //     if (null != req.Headers["user-agent"])
+        //         _userAgent = req.Headers["user-agent"];
+        //     _queryString = new NameValueCollection();
+        //     _query = new Hashtable();
+        //     foreach (KeyValuePair<string, HttpInputItem> q in req.QueryString)
+        //     {
+        //         _queryString.Add(q.Key, q.Value.Value);
+        //         _query[q.Key] = q.Value.Value;
+        //     }
+        //     // TODO: requires change to HttpServer.HttpRequest
+        //     _ipEndPoint = null;
+
+        //     // _cookies = req.Cookies;
+        //     // _isSecureConnection = req.IsSecureConnection;
+        //     // _isAuthenticated = req.IsAuthenticated;
+        // }
 
         public override string ToString()
         {
diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs
index 21d1e2b..6fff026 100644
--- a/OpenSim/Framework/Servers/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/OSHttpResponse.cs
@@ -332,10 +332,10 @@ namespace OpenSim.Framework.Servers
         /// </summary
         /// <param name="req">Incoming OSHttpRequest to which we are
         /// replying</param>
-        public OSHttpResponse(OSHttpRequest req)
-        {
-            _httpResponse = new HttpResponse(req.HttpClientContext, req.HttpRequest);
-        }
+        // public OSHttpResponse(OSHttpRequest req)
+        // {
+        //     _httpResponse = new HttpResponse(req.HttpClientContext, req.HttpRequest);
+        // }
 
         /// <summary>
         /// Add a header field and content to the response.
diff --git a/prebuild.xml b/prebuild.xml
index cf48f63..c8fe1e4 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -468,7 +468,12 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true">
-          <Exclude name="OSHttpServer" pattern="OSHttp*.cs" />
+          <Exclude pattern="OSHttpHandler\.cs" />
+          <Exclude pattern="OSHttpHttpHandler\.cs" />
+          <Exclude pattern="OSHttpRequestPump\.cs" />
+          <Exclude pattern="OSHttpRequestQueue\.cs" />
+          <Exclude pattern="OSHttpServer.*\.cs" />
+          <Exclude pattern="OSHttpXmlRpcHandler.*\.cs" />
         </Match>
       </Files>
     </Project>