CVS update: php4

Date: Friday June 18, 1999 @ 9:02 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv24717 Modified Files: fopen-wrappers.c Log Message: make CGI version work again Index: php4/fopen-wrappers.c diff -u php4/fopen-wrappers.c:1.16 php4/fopen-wrappers.c:1.17 --- php4/fopen-wrappers.c:1.16 Wed Jun 16 14:43:59 1999 +++ php4/fopen-wrappers.c Fri Jun 18 09:02:34 1999 @@ -27,7 +27,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.16 1999/06/16 18:43:59 ssb Exp $ */ +/* $Id: fopen-wrappers.c,v 1.17 1999/06/18 13:02:34 ssb Exp $ */ /* Synced with php3 revision 1.62 1999-06-16 [ssb] */ @@ -226,7 +226,7 @@ PLS_FETCH(); SLS_FETCH(); - fn = SG(request_info).path_translated; + fn = request_info.filename; path_info = SG(request_info).request_uri; #if HAVE_PWD_H if (PG(user_dir) && *PG(user_dir) @@ -254,8 +254,8 @@ strcat(fn, PG(user_dir)); /* safe */ strcat(fn, "/"); /* safe */ strcat(fn, s + 1); /* safe (shorter than path_info) */ - STR_FREE(SG(request_info).path_translated); - SG(request_info).path_translated = fn; + STR_FREE(request_info.filename); + request_info.filename = fn; } } } @@ -277,17 +277,17 @@ if ('/' == path_info[0]) l--; strcpy(fn + l, path_info); - STR_FREE(SG(request_info).path_translated); - SG(request_info).path_translated = fn; + STR_FREE(request_info.filename); + request_info.filename = fn; } } /* if doc_root && path_info */ if (!fn) { - /* we have to free SG(request_info).path_translated here because + /* we have to free request_info.filename here because php3_destroy_request_info assumes that it will get freed when the include_names hash is emptied, but we're not adding it in this case */ - STR_FREE(SG(request_info).path_translated); - SG(request_info).path_translated = NULL; + STR_FREE(request_info.filename); + request_info.filename = NULL; return NULL; } fp = fopen(fn, "r"); @@ -299,7 +299,7 @@ } if (!fp) { php3_error(E_CORE_ERROR, "Unable to open %s", fn); - STR_FREE(SG(request_info).path_translated); /* for same reason as above */ + STR_FREE(request_info.filename); /* for same reason as above */ return NULL; }