--- parser3/src/targets/isapi/parser3isapi.C 2001/03/22 15:30:49 1.1 +++ parser3/src/targets/isapi/parser3isapi.C 2001/03/22 16:38:23 1.2 @@ -14,7 +14,6 @@ #include "pa_version.h" #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION") -#define ISAPI_SERVER_VAR_BUF_SIZE 0x400 //@{ /// service func decl @@ -44,7 +43,6 @@ static const char *get_env(Pool& pool, c static uint read_post(Pool& pool, char *buf, uint max_bytes) { LPEXTENSION_CONTROL_BLOCK lpECB=static_cast(pool.context()); - // todo: timeout DWORD read_from_buf=0; DWORD read_from_input=0; DWORD total_read=0; @@ -164,105 +162,89 @@ BOOL WINAPI GetExtensionVersion(HSE_VERS return TRUE; } -static BOOL exception_handler(LPEXCEPTION_POINTERS *e,LPEXCEPTION_POINTERS ep) { - *e=ep; - return TRUE; -} - /// ISAPI // main workhorse DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { Pool pool; pool.set_context(lpECB); - + // TODO r->no_cache=1; - + bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0; PTRY { // global try // must be first in PTRY{}PCATCH - LPEXCEPTION_POINTERS e; - __try { - - const char *filespec_to_process=lpECB->lpszPathTranslated; - - // Request info - Request::Info request_info; - - const char *document_root=0; // todo: get from somewhere? - if(!document_root) { - static char fake_document_root[MAX_STRING]; - strncpy(fake_document_root, filespec_to_process, MAX_STRING); - rsplit(fake_document_root, '/'); rsplit(fake_document_root, '\\');// strip filename - document_root=fake_document_root; - } - request_info.document_root=document_root; - request_info.path_translated=filespec_to_process; - request_info.method=lpECB->lpszMethod; - request_info.query_string=lpECB->lpszQueryString; - request_info.uri=lpECB->lpszPathInfo;//todo: check for ?zzz included? - request_info.content_type=lpECB->lpszContentType; - request_info.content_length=lpECB->cbTotalBytes; - {// cookie - char variable_buf[ISAPI_SERVER_VAR_BUF_SIZE]; - DWORD variable_len = ISAPI_SERVER_VAR_BUF_SIZE-1; + + const char *filespec_to_process=lpECB->lpszPathTranslated; + + // Request info + Request::Info request_info; + + const char *document_root=0; // todo: get from somewhere? + if(!document_root) { + static char fake_document_root[MAX_STRING]; + strncpy(fake_document_root, filespec_to_process, MAX_STRING); + rsplit(fake_document_root, '/'); rsplit(fake_document_root, '\\');// strip filename + document_root=fake_document_root; + } + request_info.document_root=document_root; + request_info.path_translated=filespec_to_process; + request_info.method=lpECB->lpszMethod; + request_info.query_string=lpECB->lpszQueryString; + char reconstructed_uri[MAX_STRING]; + if(lpECB->lpszQueryString && *lpECB->lpszQueryString) { + strncpy(reconstructed_uri, lpECB->lpszPathInfo, + MAX_STRING-1/*'?'*/-strlen(lpECB->lpszQueryString)); + strcat(reconstructed_uri, "?"); + strcat(reconstructed_uri, lpECB->lpszPathInfo); + request_info.uri=reconstructed_uri; + } else + request_info.uri=lpECB->lpszPathInfo; + + request_info.content_type=lpECB->lpszContentType; + request_info.content_length=lpECB->cbTotalBytes; + // cookie + char cookie_buf[MAX_STRING]; + { + DWORD cookie_len = MAX_STRING-1; + + if (lpECB->GetServerVariable(lpECB->ConnID, "HTTP_COOKIE", cookie_buf, &cookie_len)) { + cookie_buf[cookie_len]=0; + request_info.cookie=cookie_buf; + } else if (GetLastError()==ERROR_INSUFFICIENT_BUFFER) { + char *tmp_cookie_buf=(char *)pool.malloc(cookie_len+1); - if (lpECB->GetServerVariable(lpECB->ConnID, "HTTP_COOKIE", variable_buf, &variable_len)) { - variable_buf[variable_len]=0; - request_info.cookie=variable_buf; - } else if (GetLastError()==ERROR_INSUFFICIENT_BUFFER) { - char *tmp_variable_buf=(char *)pool.malloc(variable_len+1); - - if (lpECB->GetServerVariable(lpECB->ConnID, "HTTP_COOKIE", tmp_variable_buf, &variable_len)) { - tmp_variable_buf[variable_len] = 0; - request_info.cookie=tmp_variable_buf; - } else { - request_info.cookie=0; - } + if (lpECB->GetServerVariable(lpECB->ConnID, "HTTP_COOKIE", tmp_cookie_buf, &cookie_len)) { + tmp_cookie_buf[cookie_len]=0; + request_info.cookie=tmp_cookie_buf; + } else { + request_info.cookie=0; } } - - // prepare to process request - Request request(pool, - request_info, - String::UL_HTML_TYPO - ); - - - // some root-controlled location - char *root_auto_path; - // c:\windows - root_auto_path=(char *)pool.malloc(MAX_STRING); - GetWindowsDirectory(root_auto_path, MAX_STRING); - strcat(root_auto_path, "/"); - - // process the request - request.core( - root_auto_path, true, // /path/to/admin/auto.p - 0/*parser_site_auto_path*/, false, // /path/to/site/auto.p - header_only); - - // successful finish - - // must be last in PTRY{}PCATCH - } __except(exception_handler(&e, GetExceptionInformation())) { - // converting C++ exception into Parser exception - - if(_exception_code()==EXCEPTION_STACK_OVERFLOW) - PTHROW(0, 0, - 0, - "Stack overflow"); - else if(_exception_code()==EXCEPTION_ACCESS_VIOLATION) - PTHROW(0, 0, - 0, - "Access violation at %p", - e->ExceptionRecord->ExceptionAddress); - else - PTHROW(0, 0, - 0, - "Exception %#X at %p", - e->ExceptionRecord->ExceptionCode, - e->ExceptionRecord->ExceptionAddress); } - // no further code here + + // prepare to process request + Request request(pool, + request_info, + String::UL_HTML_TYPO + ); + + // some root-controlled location + char *root_auto_path; + // c:\windows + root_auto_path=(char *)pool.malloc(MAX_STRING); + GetWindowsDirectory(root_auto_path, MAX_STRING); +/* + char *fuck_it="fff"; + DWORD num_bytes=strlen(fuck_it);; + lpECB->WriteClient(lpECB->ConnID, fuck_it, &num_bytes, HSE_IO_SYNC); + return HSE_STATUS_SUCCESS; +*/ + // process the request + request.core( + root_auto_path, false/*may be abcent*/, // /path/to/admin/auto.p + 0/*parser_site_auto_path*/, false, // /path/to/site/auto.p + header_only); + + // successful finish } PCATCH(e) { // global problem const char *body=e.comment(); int content_length=strlen(body);