--- parser3/src/targets/isapi/parser3isapi.C 2001/09/15 13:34:33 1.40 +++ parser3/src/targets/isapi/parser3isapi.C 2001/09/20 14:25:06 1.43 @@ -5,12 +5,14 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -static const char *RCSId="$Id: parser3isapi.C,v 1.40 2001/09/15 13:34:33 parser Exp $"; +static const char *RCSId="$Id: parser3isapi.C,v 1.43 2001/09/20 14:25:06 parser Exp $"; #ifndef _MSC_VER # error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)] #endif +#include "pa_config_includes.h" + #include #include @@ -224,7 +226,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI 0, // filling later: so that if there would be error pool would have ctx 200 // default http_response_code }; - //_asm int 3; + _asm nop; // int 3; pool.set_context(&ctx);// no allocations before this line! bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0; @@ -280,14 +282,18 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI // some root-controlled location // c:\windows + char root_config_path[MAX_STRING]; + GetWindowsDirectory(root_config_path, MAX_STRING); // must be dynamic: rethrowing from request.core // may return 'source' which can be inside of 'root auto.p@exeception' - char *root_auto_path=(char *)pool.malloc(MAX_STRING); - GetWindowsDirectory(root_auto_path, MAX_STRING); + char *root_config_filespec=(char *)pool.malloc(MAX_STRING); + snprintf(root_config_filespec, MAX_STRING, + "%s/%s", + root_config_path, CONFIG_FILE_NAME); // process the request request.core( - root_auto_path, false/*may be abcent*/, // /path/to/admin/auto.p + root_config_filespec, false/*may be abcent*/, // /path/to/admin/auto.p 0/*parser_site_auto_path*/, false, // /path/to/site/auto.p header_only); // successful finish