Author: wrowe Date: Sat Jan 1 18:04:25 2005 New Revision: 123866 URL: http://svn.apache.org/viewcvs?view=rev&rev=123866 Log:
Improve the clarity of several public fn arguments, so that the browser and debugger make more sense (this changes the pointer-val arguements to UINT_PTR for eventual Win64 compatibility.) Modified: httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.h httpd/mod_aspdotnet/trunk/Apache.Web/Host.h httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp Modified: httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.h Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.h?view=diff&rev=123866&p1=httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.h&r1=123865&p2=httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.h&r2=123866 ============================================================================== --- httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.h (original) +++ httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.h Sat Jan 1 18:04:25 2005 @@ -76,9 +76,9 @@ HRESULT Configure(String *path); void Destroy(void); // Returns HostKey to pass on to HandleHostRequest() - int CreateHost(String *virtualPath, String *physicalPath, int Server); + int CreateHost(String *virtualPath, String *physicalPath, UINT_PTR ServerRecPtr); // Returns HTTP Status from ApacheWebHost::HandleRequest - int HandleHostRequest(int HostKey, int Req); + int HandleHostRequest(int HostKey, UINT_PTR ReqRecordPtr); }; } } Modified: httpd/mod_aspdotnet/trunk/Apache.Web/Host.h Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/Apache.Web/Host.h?view=diff&rev=123866&p1=httpd/mod_aspdotnet/trunk/Apache.Web/Host.h&r1=123865&p2=httpd/mod_aspdotnet/trunk/Apache.Web/Host.h&r2=123866 ============================================================================== --- httpd/mod_aspdotnet/trunk/Apache.Web/Host.h (original) +++ httpd/mod_aspdotnet/trunk/Apache.Web/Host.h Sat Jan 1 18:04:25 2005 @@ -93,7 +93,7 @@ } // Reports an error message in the error log - void LogRequestError(String *msg, int loglevel, int rv, request_rec __nogc *rr) + void LogRequestError(String *msg, int loglevel, apr_status_t rv, request_rec __nogc *rr) { unsigned char avalue __gc[] = utf8_encoding->GetBytes(msg); @@ -103,18 +103,18 @@ } // Instantiates a new Apache.Web.WorkerRequest object from the given request_rec* - int HandleRequest(int Req) { + int HandleRequest(UINT_PTR ReqRecordPtr) { try { - WorkerRequest *request = new WorkerRequest(Req, this); + WorkerRequest *request = new WorkerRequest(ReqRecordPtr, this); int status = request->Handler(); return status; } catch (Exception *e) { LogRequestError(L"Failed to create ASP.NET Request, " L"Exception follows", APLOG_ERR, 0, - (request_rec __nogc *)Req); + (request_rec __nogc *)ReqRecordPtr); LogRequestError(e->ToString(), APLOG_ERR, 0, - (request_rec __nogc *)Req); + (request_rec __nogc *)ReqRecordPtr); return 500; } } Modified: httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h?view=diff&rev=123866&p1=httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h&r1=123865&p2=httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h&r2=123866 ============================================================================== --- httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h (original) +++ httpd/mod_aspdotnet/trunk/Apache.Web/HostFactory.h Sat Jan 1 18:04:25 2005 @@ -154,20 +154,21 @@ } // Instantiate a new Host object; trailing slashes are acceptable - int CreateHost(String* virtualPath, String* physicalPath, int Server) + int CreateHost(String* virtualPath, String* physicalPath, UINT_PTR ServerRecPtr) { int newHostKey; physicalPath = physicalPath->Replace(L'/', L'\\'); newHostKey = hostObj->get_Count(); - hostSvr->Add(__box(Server)); + // TODO: WHY are we boxing an int? + hostSvr->Add(__box(ServerRecPtr)); hostURI->Add(virtualPath); hostDir->Add(physicalPath); hostObj->Add(NULL); if (!ConnectHost(newHostKey)) { - server_rec __nogc *s = (server_rec __nogc *)Server; + server_rec __nogc *s = (server_rec __nogc *)ServerRecPtr; String *msg = String::Concat(L"Mount failure creating host ", __try_cast<String*>(hostURI->get_Item(newHostKey)), L" mapped to ", @@ -179,15 +180,15 @@ return newHostKey; } - int HandleHostRequest(int HostKey, int Req) { - request_rec __nogc *rr = (request_rec __nogc *)Req; + int HandleHostRequest(int HostKey, UINT_PTR ReqRecordPtr) { + request_rec __nogc *rr = (request_rec __nogc *)ReqRecordPtr; String* msg; Object* obj = hostObj->get_Item(HostKey); if (obj != NULL) { try { Host* host = __try_cast<Host*>(obj); - int status = host->HandleRequest(Req); + int status = host->HandleRequest(ReqRecordPtr); return status; } // Presume all Remoting/AppDomainUnloadedExceptions @@ -277,7 +278,7 @@ try { Host* host = __try_cast<Host*>(obj); - int status = host->HandleRequest(Req); + int status = host->HandleRequest(ReqRecordPtr); return status; } catch (Exception *e) { Modified: httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h?view=diff&rev=123866&p1=httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h&r1=123865&p2=httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h&r2=123866 ============================================================================== --- httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h (original) +++ httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h Sat Jan 1 18:04:25 2005 @@ -94,7 +94,7 @@ __int64 bytes_read; // Reports an error message in the error log - void LogRequestError(String *msg, int loglevel, int rv); + void LogRequestError(String *msg, int loglevel, apr_status_t rv); public: static bool CodeValidate() { Modified: httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp?view=diff&rev=123866&p1=httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp&r1=123865&p2=httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp&r2=123866 ============================================================================== --- httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp (original) +++ httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp Sat Jan 1 18:04:25 2005 @@ -635,7 +635,7 @@ try { host->host_key = global_conf->pHostFactory->CreateHost( - virtual_path, physical_path, (int) gs); + virtual_path, physical_path, (UINT_PTR) gs); if (host->host_key == -1) _com_raise_error(E_NOINTERFACE); }
