--- parser3/src/targets/isapi/parser3isapi.C 2001/10/12 12:15:32 1.50 +++ parser3/src/targets/isapi/parser3isapi.C 2001/10/13 17:42:52 1.52 @@ -4,7 +4,7 @@ Copyright (c) 2000,2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: parser3isapi.C,v 1.50 2001/10/12 12:15:32 parser Exp $ + $Id: parser3isapi.C,v 1.52 2001/10/13 17:42:52 parser Exp $ */ #ifndef _MSC_VER @@ -25,6 +25,10 @@ #include "pool_storage.h" #include "pa_socks.h" +#ifdef XML +#include +#endif + #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION") // consts @@ -97,7 +101,7 @@ void SAPI::log(Pool& pool, const char *f const char *prefix="PARSER_ERROR:"; strcpy(buf, prefix); char *start=buf+strlen(prefix); - size_t size=vsnprintf(start, MAX_STRING-strlen(prefix), fmt, args); + DWORD size=vsnprintf(start, MAX_STRING-strlen(prefix), fmt, args); remove_crlf(start, start+size); ctx.lpECB->ServerSupportFunction(ctx.lpECB->ConnID, @@ -310,7 +314,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI Request::Info request_info; size_t path_translated_buf_size=strlen(lpECB->lpszPathTranslated)+1; - char *filespec_to_process=(char *)malloc(path_translated_buf_size); + char *filespec_to_process=(char *)pool.malloc(path_translated_buf_size); memcpy(filespec_to_process, lpECB->lpszPathTranslated, path_translated_buf_size); #ifdef WIN32 back_slashes_to_slashes(filespec_to_process); @@ -331,7 +335,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI request_info.method=lpECB->lpszMethod; request_info.query_string=lpECB->lpszQueryString; if(lpECB->lpszQueryString && *lpECB->lpszQueryString) { - char *reconstructed_uri=(char *)malloc( + char *reconstructed_uri=(char *)pool.malloc( strlen(lpECB->lpszPathInfo)+1/*'?'*/+ strlen(lpECB->lpszQueryString)+1/*0*/); strcpy(reconstructed_uri, lpECB->lpszPathInfo);