--- parser3/src/targets/isapi/parser3isapi.C 2001/09/20 14:25:06 1.43 +++ parser3/src/targets/isapi/parser3isapi.C 2001/10/09 14:25:30 1.48 @@ -2,10 +2,10 @@ Parser: IIS extension. Copyright (c) 2000,2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: parser3isapi.C,v 1.48 2001/10/09 14:25:30 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)] @@ -27,6 +27,31 @@ static const char *RCSId="$Id: parser3is #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION") +// consts + +extern const char *main_RCSIds[]; +#ifdef USE_SMTP +extern const char *smtp_RCSIds[]; +#endif +extern const char *gd_RCSIds[]; +extern const char *classes_RCSIds[]; +extern const char *types_RCSIds[]; +extern const char *parser3isapi_RCSIds[]; +const char **RCSIds[]={ + main_RCSIds, +#ifdef USE_SMTP + smtp_RCSIds, +#endif + gd_RCSIds, + classes_RCSIds, + types_RCSIds, + parser3isapi_RCSIds, +#ifdef XML + xalan_patched_RCSIds, +#endif + 0 +}; + // SAPI #ifndef DOXYGEN @@ -50,8 +75,10 @@ void SAPI::log(Pool& pool, const char *f char buf[MAX_STRING]; const char *prefix="PARSER_ERROR:"; strcpy(buf, prefix); - DWORD size=vsnprintf(buf+strlen(prefix), MAX_STRING-strlen(prefix), fmt, args); - + char *start=buf+strlen(prefix); + size_t size=vsnprintf(start, MAX_STRING-strlen(prefix), fmt, args); + remove_crlf(start, start+size); + ctx.lpECB->ServerSupportFunction(ctx.lpECB->ConnID, HSE_APPEND_LOG_PARAMETER, buf, &size, 0); }