summaryrefslogtreecommitdiff
path: root/main/safe_mode.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-02-10 20:13:08 +0000
committerZeev Suraski <zeev@php.net>2000-02-10 20:13:08 +0000
commit49e98c3ddd49d36aa364299254849e70309559f8 (patch)
treebc14a058245456715533616653a2649580c0860c /main/safe_mode.c
parent6723bdd9202964ff163fe22883e382cda6f547ba (diff)
downloadphp-git-49e98c3ddd49d36aa364299254849e70309559f8.tar.gz
request_info.c is dead! long live SAPI
@- Finished the server abstraction layer; All of the PHP code is now shared @ across different servers (Apache, CGI, IIS, etc.), except for thin @ interface modules (Zeev)
Diffstat (limited to 'main/safe_mode.c')
-rw-r--r--main/safe_mode.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/main/safe_mode.c b/main/safe_mode.c
index f274d23da8..c022d600da 100644
--- a/main/safe_mode.c
+++ b/main/safe_mode.c
@@ -114,8 +114,8 @@ PHPAPI char *php_get_current_user()
struct stat *pstat;
SLS_FETCH();
- if (request_info.current_user) {
- return request_info.current_user;
+ if (SG(request_info).current_user) {
+ return SG(request_info).current_user;
}
/* FIXME: I need to have this somehow handled if
@@ -131,8 +131,8 @@ PHPAPI char *php_get_current_user()
if ((pwd=getpwuid(pstat->st_uid))==NULL) {
return empty_string;
}
- request_info.current_user_length = strlen(pwd->pw_name);
- request_info.current_user = estrndup(pwd->pw_name,request_info.current_user_length);
+ SG(request_info).current_user_length = strlen(pwd->pw_name);
+ SG(request_info).current_user = estrndup(pwd->pw_name, SG(request_info).current_user_length);
- return request_info.current_user;
+ return SG(request_info).current_user;
}