summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2000-09-05 19:29:03 +0000
committerStanislav Malyshev <stas@php.net>2000-09-05 19:29:03 +0000
commit20a6474eae78e3d7c96711d9e89116d1a8c9d46d (patch)
tree436d2c2444f0951ce59cfb56a4a9216eb4d0e583
parenteb3214490287d4f8fd87a0e709f24e56eb97ae12 (diff)
downloadphp-git-20a6474eae78e3d7c96711d9e89116d1a8c9d46d.tar.gz
Fix crash
# This is getting worse... Seems that more work is needed
-rw-r--r--ext/session/mod_files.c1
-rw-r--r--ext/session/session.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 8e5c38d40b..2c7e9c7117 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -16,7 +16,6 @@
+----------------------------------------------------------------------+
*/
-
#include "php.h"
#include <sys/stat.h>
diff --git a/ext/session/session.c b/ext/session/session.c
index 6ddedfcfbf..455fd11296 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -108,7 +108,7 @@ static PHP_INI_MH(OnUpdateStringCopy)
p = (char **) (base+(size_t) mh_arg1);
- if(*p) {
+ if(*p && stage != PHP_INI_STAGE_STARTUP) {
STR_FREE(*p);
}