--- parser3/src/targets/isapi/parser3isapi.C 2001/03/22 16:38:23 1.2 +++ parser3/src/targets/isapi/parser3isapi.C 2001/03/22 17:27:13 1.4 @@ -17,13 +17,20 @@ //@{ /// service func decl + +struct Service_func_context { + LPEXTENSION_CONTROL_BLOCK lpECB; + String *header; + DWORD http_response_code; +}; + static const char *get_env(Pool& pool, const char *name) { - LPEXTENSION_CONTROL_BLOCK lpECB=static_cast(pool.context()); + Service_func_context& ctx=*static_cast(pool.context()); char *variable_buf=(char *)pool.malloc(MAX_STRING); DWORD variable_len = MAX_STRING-1; - if(lpECB->GetServerVariable(lpECB->ConnID, const_cast(name), + if(ctx.lpECB->GetServerVariable(ctx.lpECB->ConnID, const_cast(name), variable_buf, &variable_len)) { variable_buf[variable_len]=0; return variable_buf; @@ -31,7 +38,7 @@ static const char *get_env(Pool& pool, c variable_buf=(char *)pool.malloc(variable_len+1); - if(lpECB->GetServerVariable(lpECB->ConnID, const_cast(name), + if(ctx.lpECB->GetServerVariable(ctx.lpECB->ConnID, const_cast(name), variable_buf, &variable_len)) { variable_buf[variable_len]=0; return variable_buf; @@ -41,24 +48,26 @@ 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()); + Service_func_context& ctx=*static_cast(pool.context()); DWORD read_from_buf=0; DWORD read_from_input=0; DWORD total_read=0; - read_from_buf=min(lpECB->cbAvailable, max_bytes); - memcpy(buf, lpECB->lpbData, read_from_buf); + read_from_buf=min(ctx.lpECB->cbAvailable, max_bytes); + memcpy(buf, ctx.lpECB->lpbData, read_from_buf); total_read+=read_from_buf; if(read_from_bufcbTotalBytes) { + read_from_bufcbTotalBytes) { DWORD cbRead=0, cbSize; - read_from_input=min(max_bytes-read_from_buf, lpECB->cbTotalBytes-read_from_buf); + read_from_input=min(max_bytes-read_from_buf, + ctx.lpECB->cbTotalBytes-read_from_buf); while(cbRead < read_from_input) { cbSize=read_from_input - cbRead; - if(!lpECB->ReadClient(lpECB->ConnID, buf+read_from_buf+cbRead, &cbSize) || + if(!ctx.lpECB->ReadClient(ctx.lpECB->ConnID, + buf+read_from_buf+cbRead, &cbSize) || cbSize==0) break; cbRead+=cbSize; @@ -69,59 +78,62 @@ static uint read_post(Pool& pool, char * } static void add_header_attribute(Pool& pool, const char *key, const char *value) { - LPEXTENSION_CONTROL_BLOCK lpECB=static_cast(pool.context()); - String *header=static_cast(pool.tag()); - if(!header) - pool.set_tag(header=new(pool) String(pool)); - - header->APPEND_CONST(key); - header->APPEND_CONST(": "); - header->APPEND_CONST(value); - header->APPEND_CONST("\r\n"); + Service_func_context& ctx=*static_cast(pool.context()); + + if(strcasecmp(key, "location")==0) + ctx.http_response_code=302; + + if(strcasecmp(key, "status")==0) + ctx.http_response_code=atoi(value); + else { + ctx.header->APPEND_CONST(key); + ctx.header->APPEND_CONST(": "); + ctx.header->APPEND_CONST(value); + ctx.header->APPEND_CONST("\n"); + } } +/// @todo intelligent cache-control static void send_header(Pool& pool) { - LPEXTENSION_CONTROL_BLOCK lpECB=static_cast(pool.context()); - String *header=static_cast(pool.tag()); - if(!header) // never - return; + Service_func_context& ctx=*static_cast(pool.context()); - header->APPEND_CONST("\r\n"); + ctx.header->APPEND_CONST("Cache-Control: no-cache\n"); + ctx.header->APPEND_CONST("\n"); HSE_SEND_HEADER_EX_INFO header_info; - int http_response_code=200; // todo: dig from headers - char status_buf[MAX_STATUS_LENGTH]; - switch(http_response_code) { + switch(ctx.http_response_code) { case 200: header_info.pszStatus="200 OK"; break; case 302: header_info.pszStatus="302 Moved Temporarily"; break; - case 401: + /*case 401: header_info.pszStatus="401 Authorization Required"; - break; + break;*/ default: - snprintf(status_buf, MAX_STATUS_LENGTH, "%d Undescribed", http_response_code); + snprintf(status_buf, MAX_STATUS_LENGTH, + "%d Undescribed", ctx.http_response_code); header_info.pszStatus=status_buf; break; } header_info.cchStatus=strlen(header_info.pszStatus); - header_info.pszHeader=header->cstr(); - header_info.cchHeader=header->size(); + header_info.pszHeader=ctx.header->cstr(); + header_info.cchHeader=ctx.header->size(); - lpECB->dwHttpStatusCode=http_response_code; + ctx.lpECB->dwHttpStatusCode=ctx.http_response_code; - lpECB->ServerSupportFunction(lpECB->ConnID, HSE_REQ_SEND_RESPONSE_HEADER_EX, - &header_info, NULL, NULL); + ctx.lpECB->ServerSupportFunction(ctx.lpECB->ConnID, + HSE_REQ_SEND_RESPONSE_HEADER_EX, &header_info, NULL, NULL); } static void send_body(Pool& pool, const char *buf, size_t size) { - LPEXTENSION_CONTROL_BLOCK lpECB=static_cast(pool.context()); + Service_func_context& ctx=*static_cast(pool.context()); DWORD num_bytes=size; - lpECB->WriteClient(lpECB->ConnID, const_cast(buf), &num_bytes, HSE_IO_SYNC); + ctx.lpECB->WriteClient(ctx.lpECB->ConnID, + const_cast(buf), &num_bytes, HSE_IO_SYNC); } //@} @@ -165,14 +177,19 @@ BOOL WINAPI GetExtensionVersion(HSE_VERS /// 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 + Service_func_context ctx={ + lpECB, + new(pool) String(pool), + 200 + }; + pool.set_context(&ctx); + const char *filespec_to_process=lpECB->lpszPathTranslated; // Request info @@ -202,6 +219,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI 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; @@ -215,8 +233,6 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI 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; } } } @@ -232,12 +248,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI // 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