--- parser3/src/targets/isapi/parser3isapi.C 2002/03/05 07:48:07 1.65 +++ parser3/src/targets/isapi/parser3isapi.C 2002/06/24 11:59:33 1.76 @@ -4,7 +4,7 @@ Copyright (c) 2000,2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: parser3isapi.C,v 1.65 2002/03/05 07:48:07 paf Exp $ + $Id: parser3isapi.C,v 1.76 2002/06/24 11:59:33 paf Exp $ */ #ifndef _MSC_VER @@ -50,6 +50,24 @@ const char **RCSIds[]={ 0 }; +const char *IIS51vars[]={ + "APPL_MD_PATH", "APPL_PHYSICAL_PATH", + "AUTH_PASSWORD", "AUTH_TYPE", "AUTH_USER", + "CERT_COOKIE", "CERT_FLAGS", "CERT_ISSUER", "CERT_KEYSIZE", "CERT_SECRETKEYSIZE", + "CERT_SERIALNUMBER", "CERT_SERVER_ISSUER", "CERT_SERVER_SUBJECT", "CERT_SUBJECT", + "CONTENT_LENGTH", "CONTENT_TYPE", + "LOGON_USER", + "HTTPS", "HTTPS_KEYSIZE", "HTTPS_SECRETKEYSIZE", "HTTPS_SERVER_ISSUER", "HTTPS_SERVER_SUBJECT", + "INSTANCE_ID", "INSTANCE_META_PATH", + "PATH_INFO", "PATH_TRANSLATED", + "QUERY_STRING", + "REMOTE_ADDR", "REMOTE_HOST", "REMOTE_USER", "REQUEST_METHOD", + "SCRIPT_NAME", + "SERVER_NAME", "SERVER_PORT", "SERVER_PORT_SECURE", "SERVER_PROTOCOL", "SERVER_SOFTWARE", + "URL", +}; +const int IIS51var_count=sizeof(IIS51vars)/sizeof(*IIS51vars); + // globals char argv0[MAX_STRING]=""; @@ -104,21 +122,69 @@ const char *SAPI::get_env(Pool& pool, co if(ctx.lpECB->GetServerVariable(ctx.lpECB->ConnID, const_cast(name), variable_buf, &variable_len)) { - variable_buf[variable_len]=0; - return variable_buf; + if(*variable_buf) { // saw returning len=1 && *buf=0 :( + variable_buf[variable_len]=0; + return variable_buf; + } } else if (GetLastError()==ERROR_INSUFFICIENT_BUFFER) { variable_buf=(char *)pool.malloc(variable_len+1); if(ctx.lpECB->GetServerVariable(ctx.lpECB->ConnID, const_cast(name), variable_buf, &variable_len)) { - variable_buf[variable_len]=0; - return variable_buf; + if(*variable_buf) { + variable_buf[variable_len]=0; + return variable_buf; + } } } return 0; } +static int grep_char(const char *s, char c) { + int result=0; + if(s) { + while(s=strchr(s, c)) { + s++; // skip found c + result++; + } + } + return result; +} +static const char *mk_env_pair(Pool& pool, const char *key, const char *value) { + char *result=(char *)pool.malloc(strlen(key)+1/*=*/+strlen(value)+1/*0*/); + strcpy(result, key); strcat(result, "="); strcat(result, value); + return result; +} +const char *const *SAPI::environment(Pool& pool) { + // we know this buf is writable + char *all_http_vars=const_cast(SAPI::get_env(pool, "ALL_HTTP")); + const int http_var_count=grep_char(all_http_vars, '\n')+1/*\n for theoretical(never saw) this \0*/; + + const char **result= + (const char **)pool.malloc(sizeof(char *)*(IIS51var_count+http_var_count+1/*0*/)); + const char **cur=result; + + // IIS5.1 vars + for(int i=0; i(pool.get_context()); @@ -189,6 +255,7 @@ void SAPI::send_header(Pool& pool) { break; } header_info.cchStatus=strlen(header_info.pszStatus); + *ctx.header << "\r\n"; // ISAPI v<5 did quite well without it header_info.pszHeader=ctx.header->cstr(); header_info.cchHeader=ctx.header->size(); header_info.fKeepConn=true; @@ -214,6 +281,9 @@ int failed_new(size_t size) { return 0; // not reached } +#ifdef _DEBUG +static Pool_storage *global_pool_storagep; +#endif static bool parser_init() { static bool globals_inited=false; if(globals_inited) @@ -223,6 +293,9 @@ static bool parser_init() { _set_new_handler(failed_new); static Pool_storage pool_storage; +#ifdef _DEBUG + global_pool_storagep=&pool_storage; +#endif static Pool pool(&pool_storage); // global pool try { // init socks @@ -282,7 +355,7 @@ void real_parser_handler(Pool& pool, LPE strncpy(buf, filespec_to_process, len); buf[len]=0; request_info.document_root=buf; } else - throw Exception(0, 0, + throw Exception("parser.runtime", 0, "ISAPI: no PATH_INFO defined (in reinventing DOCUMENT_ROOT)"); @@ -303,44 +376,36 @@ void real_parser_handler(Pool& pool, LPE request_info.content_type=lpECB->lpszContentType; request_info.content_length=lpECB->cbTotalBytes; request_info.cookie=SAPI::get_env(pool, "HTTP_COOKIE"); - request_info.user_agent=SAPI::get_env(pool, "HTTP_USER_AGENT"); - + request_info.mail_received=false; // prepare to process request Request request(pool, request_info, String::UL_HTML|String::UL_OPTIMIZE_BIT, - false /* status_allowed */); - - // 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_config_filespec=(char *)pool.malloc(MAX_STRING); - snprintf(root_config_filespec, MAX_STRING, - "%s/%s", - root_config_path, CONFIG_FILE_NAME); +#ifdef _DEBUG + true +#else + false +#endif + /* status_allowed */); // beside by binary - static char site_config_path[MAX_STRING]; - strncpy(site_config_path, argv0, MAX_STRING-1); site_config_path[MAX_STRING-1]=0; // filespec of my binary + static char beside_binary_path[MAX_STRING]; + strncpy(beside_binary_path, argv0, MAX_STRING-1); beside_binary_path[MAX_STRING-1]=0; // filespec of my binary if(!( - rsplit(site_config_path, '/') || - rsplit(site_config_path, '\\'))) { // strip filename + rsplit(beside_binary_path, '/') || + rsplit(beside_binary_path, '\\'))) { // strip filename // no path, just filename - site_config_path[0]='.'; site_config_path[1]=0; + beside_binary_path[0]='.'; beside_binary_path[1]=0; } - char site_config_filespec[MAX_STRING]; - snprintf(site_config_filespec, MAX_STRING, + char config_filespec[MAX_STRING]; + snprintf(config_filespec, MAX_STRING, "%s/%s", - site_config_path, CONFIG_FILE_NAME); + beside_binary_path, AUTO_FILE_NAME); // process the request request.core( - root_config_filespec, false /*don't fail_on_read_problem*/, // /path/to/admin/parser3.conf - site_config_filespec, false /*don't fail_on_read_problem*/, // /path/to/site/parser3.conf + config_filespec, false /*fail_on_read_problem*/, // /path/to/first/auto.p header_only); } @@ -360,19 +425,18 @@ void call_real_parser_handler__do_SEH(Po if(system_exception) if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) - throw Exception(0, 0, + throw Exception(0, 0, "Exception 0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); else - throw Exception(0, 0, 0, "Exception "); + throw Exception(0, 0, "Exception "); else - throw Exception(0, 0, 0, "Exception "); + throw Exception(0, 0, "Exception "); } #endif } - -DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { +inline DWORD RealHttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { Pool_storage pool_storage; Pool pool(&pool_storage); // no allocations until assigned context [for reporting] SAPI_func_context ctx={ @@ -381,7 +445,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI 200 // default http_response_code }; pool.set_context(&ctx);// no allocations before this line! - + bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0; try { // global try call_real_parser_handler__do_SEH(pool, lpECB, header_only); @@ -402,7 +466,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI int header_len=snprintf(header_buf, MAX_STRING, "content-type: text/plain\r\n" "content-length: %lu\r\n" - "expires: Fri, 23 Mar 2001 09:32:23 GMT\r\n" +// "expires: Fri, 23 Mar 2001 09:32:23 GMT\r\n" "\r\n", content_length); @@ -458,6 +522,35 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI return HSE_STATUS_SUCCESS_AND_KEEP_CONN; } +#ifdef _DEBUG +//for memory leaks detection only +#undef _WINDOWS_ +#include +#endif +DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { +// Declare the variables needed +#ifdef _DEBUG +// _crtBreakAlloc=97779;//97777; //997; + + CMemoryState oldMemState, newMemState, diffMemState; + oldMemState.Checkpoint(); + //global_pool_storagep->fbreak_on_alloc=true; +#endif + + DWORD result=RealHttpExtensionProc(lpECB); + +#ifdef _DEBUG + newMemState.Checkpoint(); + if( diffMemState.Difference( oldMemState, newMemState ) ) + { + TRACE( "Memory leaked!\n" ); + diffMemState.DumpStatistics( ); + diffMemState.DumpAllObjectsSince(); + } +#endif + return result; +} + BOOL WINAPI DllMain( HINSTANCE hinstDLL, // handle to the DLL module DWORD fdwReason, // reason for calling function