CVS update: php4

Date: Saturday June 26, 1999 @ 19:21 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv19024 Modified Files: cgi_main.c request_info.c Log Message: Win32/general patches Index: php4/cgi_main.c diff -u php4/cgi_main.c:1.20 php4/cgi_main.c:1.21 --- php4/cgi_main.c:1.20 Sat Jun 26 15:14:26 1999 +++ php4/cgi_main.c Sat Jun 26 19:21:18 1999 @@ -205,8 +205,6 @@ sapi_startup(&sapi_module); - SG(request_info).path_translated = NULL; - #if WIN32|WINNT _fmode = _O_BINARY; /*sets default for file streams to binary */ setmode(_fileno(stdin), O_BINARY); /* make the stdio mode be binary */ @@ -262,6 +260,7 @@ } #endif + SG(request_info).path_translated = NULL; init_request_info(SLS_C); SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */ CG(extended_info) = 0; Index: php4/request_info.c diff -u php4/request_info.c:1.14 php4/request_info.c:1.15 --- php4/request_info.c:1.14 Sat Jun 26 15:14:26 1999 +++ php4/request_info.c Sat Jun 26 19:21:18 1999 @@ -67,9 +67,9 @@ php3_destroy_request_info()! */ #if DISCARD_PATH if (request_info.script_filename) { - request_info.filename = estrdup(request_info.script_filename); + SG(request_info).path_translated = estrdup(request_info.script_filename); } else { - request_info.filename = NULL; + SG(request_info).path_translated = NULL; } #endif return SUCCESS;