--- parser3/src/targets/isapi/parser3isapi.C 2001/03/22 17:27:13 1.4 +++ parser3/src/targets/isapi/parser3isapi.C 2001/03/23 08:47:51 1.7 @@ -6,8 +6,6 @@ #include #include -#include -#include #include "pa_globals.h" #include "pa_request.h" @@ -34,16 +32,16 @@ static const char *get_env(Pool& pool, c variable_buf, &variable_len)) { 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; + } } - - 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; - } - + return 0; } @@ -97,8 +95,10 @@ static void add_header_attribute(Pool& p static void send_header(Pool& pool) { Service_func_context& ctx=*static_cast(pool.context()); - ctx.header->APPEND_CONST("Cache-Control: no-cache\n"); - ctx.header->APPEND_CONST("\n"); + ctx.header->APPEND_CONST( + "Connection: keep-alive\n" + "Cache-Control: no-cache\n" + "\n"); HSE_SEND_HEADER_EX_INFO header_info; char status_buf[MAX_STATUS_LENGTH]; @@ -121,6 +121,7 @@ static void send_header(Pool& pool) { header_info.cchStatus=strlen(header_info.pszStatus); header_info.pszHeader=ctx.header->cstr(); header_info.cchHeader=ctx.header->size(); + header_info.fKeepConn=true; ctx.lpECB->dwHttpStatusCode=ctx.http_response_code; @@ -174,15 +175,21 @@ BOOL WINAPI GetExtensionVersion(HSE_VERS return TRUE; } -/// ISAPI // main workhorse +/** + ISAPI // main workhorse + + @todo + think of a better way than @c APPL_PHYSICAL_PATH + of obtaining the @c DOCUMENT_ROOT + because this only gets "the place where last IIS Application was set" + and if someone would redefine Application settings below the / + all ^table:load[/test] would open not /test but /below/test +*/ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { Pool pool; - // TODO r->no_cache=1; bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0; PTRY { // global try - // must be first in PTRY{}PCATCH - Service_func_context ctx={ lpECB, new(pool) String(pool), @@ -190,52 +197,32 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI }; pool.set_context(&ctx); - 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; + if(!(request_info.document_root=get_env(pool, "APPL_PHYSICAL_PATH"))) + PTHROW(0, 0, + 0, + "can not get server variable APPL_PHYSICAL_PATH (error #%lu)", + GetLastError()); // never + + request_info.path_translated=lpECB->lpszPathTranslated; 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)); + char *reconstructed_uri=(char *)malloc( + strlen(lpECB->lpszPathInfo)+1/*'?'*/+ + strlen(lpECB->lpszQueryString)+1/*0*/); + strcpy(reconstructed_uri, lpECB->lpszPathInfo); strcat(reconstructed_uri, "?"); - strcat(reconstructed_uri, lpECB->lpszPathInfo); + strcat(reconstructed_uri, lpECB->lpszQueryString); request_info.uri=reconstructed_uri; } else request_info.uri=lpECB->lpszPathInfo; request_info.content_type=lpECB->lpszContentType; request_info.content_length=lpECB->cbTotalBytes; - // cookie - request_info.cookie=0; - 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", tmp_cookie_buf, &cookie_len)) { - tmp_cookie_buf[cookie_len]=0; - request_info.cookie=tmp_cookie_buf; - } - } - } + request_info.cookie=get_env(pool, "HTTP_COOKIE"); // prepare to process request Request request(pool, @@ -244,9 +231,10 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI ); // some root-controlled location - char *root_auto_path; - // c:\windows - root_auto_path=(char *)pool.malloc(MAX_STRING); + // c:\windows + // 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); // process the request @@ -261,25 +249,24 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI int content_length=strlen(body); // prepare header - (*service_funcs.add_header_attribute)(pool, "content-type", "text/plain"); + add_header_attribute(pool, "content-type", "text/plain"); char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%d", content_length); - (*service_funcs.add_header_attribute)(pool, "content-length", - content_length_cstr); + snprintf(content_length_cstr, MAX_NUMBER, "%lu", content_length); + add_header_attribute(pool, "content-length", content_length_cstr); // send header - (*service_funcs.send_header)(pool); + send_header(pool); // send body if(!header_only) - (*service_funcs.send_body)(pool, body, content_length); + send_body(pool, body, content_length); // unsuccessful finish _endthread(); } PEND_CATCH - return HSE_STATUS_SUCCESS; + return HSE_STATUS_SUCCESS_AND_KEEP_CONN; }