diff options
author | Sascha Schumann <sas@php.net> | 2002-03-06 09:02:31 +0000 |
---|---|---|
committer | Sascha Schumann <sas@php.net> | 2002-03-06 09:02:31 +0000 |
commit | ca59cb7cf90b10161b96b8d34d88fd8244e15272 (patch) | |
tree | 2463485fc7bc5ebbd67d4128262497ab6799eb83 /ext/session/mod_mm.c | |
parent | d36ddb5a9ff286d4140c56b095090a784d43016f (diff) | |
download | php-git-ca59cb7cf90b10161b96b8d34d88fd8244e15272.tar.gz |
Weep out all recent commits of Yasuo.
I don't have time right now to leave in the good ones and remove
only the bad ones.
There are some semantical changes which I reject, because
they aim at fixing a bug which is at a completely other location.
Then SID does not gefined anymore properly. (This broken patch
has not been sent to me at all.)
Also, there were *so* many whitespace changes which already
make these commits bogus.
Diffstat (limited to 'ext/session/mod_mm.c')
-rw-r--r-- | ext/session/mod_mm.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c index 0b634665be..80bacbd4fa 100644 --- a/ext/session/mod_mm.c +++ b/ext/session/mod_mm.c @@ -254,15 +254,11 @@ PHP_MINIT_FUNCTION(ps_mm) int ret; ps_mm_instance = calloc(sizeof(*ps_mm_instance), 1); - if (!ps_mm_instance) { - php_error(E_WARNING,"mm session save handler cannot allocate shared memory"); + if (!ps_mm_instance) return FAILURE; - } - if (!sprintf(euid,"%d", geteuid())) { - php_error(E_WARNING,"mm session save handler cannot get effective UID"); + if (!sprintf(euid,"%d", geteuid())) return FAILURE; - } /* '/tmp/' + File + Module Name + Effective UID + \0 */ ps_mm_path = do_alloca(5+sizeof(PS_MM_FILE)+mod_name_len+strlen(euid)+1); @@ -279,7 +275,6 @@ PHP_MINIT_FUNCTION(ps_mm) if (ret != SUCCESS) { free(ps_mm_instance); ps_mm_instance = NULL; - php_error(E_NOTICE,"mm session save handler failed to initialize. Check your save_path."); return FAILURE; } @@ -331,10 +326,7 @@ PS_READ_FUNC(mm) (*val)[sd->datalen] = '\0'; ret = SUCCESS; } - else { - *val = estrdup(""); - } - + mm_unlock(data->mm); return ret; |