--- parser3/src/targets/cgi/parser3.C 2001/04/23 10:35:16 1.69 +++ parser3/src/targets/cgi/parser3.C 2001/04/25 10:25:37 1.72 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: parser3.C,v 1.69 2001/04/23 10:35:16 paf Exp $ + $Id: parser3.C,v 1.72 2001/04/25 10:25:37 paf Exp $ */ #include "pa_config_includes.h" @@ -21,8 +21,6 @@ #include "pa_socks.h" #include "pa_version.h" -/// @test scripting #!/path/to/parser - /// IIS refuses to read bigger chunks const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M @@ -202,8 +200,10 @@ int main(int argc, char *argv[]) { } else { static char buf[MAX_STRING]; strncpy(buf, filespec_to_process, MAX_STRING); - rsplit(buf, '/'); rsplit(buf, '\\');// strip filename - request_info.document_root=buf; + if(rsplit(buf, '/') || rsplit(buf, '\\')) // strip filename + request_info.document_root=buf; + else + request_info.document_root=""; } request_info.path_translated=filespec_to_process; request_info.method=request_method; @@ -228,12 +228,15 @@ int main(int argc, char *argv[]) { 0, "CGI: no PATH_INFO defined(in reinventing REQUEST_URI)"); - const char *script_name=SAPI::get_env(pool, "SCRIPT_NAME"); - if(script_name && - strncmp(request_info.uri,script_name, strlen(script_name))==0) - PTHROW(0, 0, - 0, - "CGI: illegal call"); + if(const char *script_name=SAPI::get_env(pool, "SCRIPT_NAME")) { + size_t script_name_len=strlen(script_name); + size_t uri_len=strlen(request_info.uri); + if(strncmp(request_info.uri,script_name, script_name_len)==0 && + script_name_len != uri_len) // under IIS they are the same + PTHROW(0, 0, + 0, + "CGI: illegal call"); + } } else request_info.uri=0;