diff options
| author | Andi Gutmans <andi@php.net> | 1999-06-06 18:22:17 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-06-06 18:22:17 +0000 |
| commit | c5fd7244dda3c3d35e375b1844a4ad1d13a5a60b (patch) | |
| tree | 2758e3bdc9fef5e3593a308c23bb0ece60ec637e | |
| parent | 5b0ae2dff3b4515e8d21f08e42f08c2de5aaab8f (diff) | |
| download | php-git-c5fd7244dda3c3d35e375b1844a4ad1d13a5a60b.tar.gz | |
- Add some *_FETCH()'s. Still some work to be done so that it'll compile on win32.
| -rw-r--r-- | ext/session/session.c | 11 | ||||
| -rw-r--r-- | php4dllts.dsp | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 637fdf89ff..b3bc169d18 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -36,8 +36,9 @@ * - complete ZTS support (currently only useable as non-ZTS) * - userland callback functions for ps_module */ - +#if !(WIN32|WINNT) #include <sys/time.h> +#endif #include "php.h" #include "php_ini.h" @@ -115,6 +116,7 @@ static char *_php_session_encode(int *newlen) char *ret = NULL; char strbuf[MAX_STR + 1]; PSLS_FETCH(); + ELS_FETCH(); buf = ecalloc(sizeof(*buf), 1); buf->type = IS_STRING; @@ -162,6 +164,7 @@ static void _php_session_decode(char *val, int vallen) int namelen; int has_value; PSLS_FETCH(); + ELS_FETCH(); for(p = q = val; (p < endptr) && (q = strchr(p, '|')); p = q) { if(p[0] == '!') { @@ -267,6 +270,8 @@ static ps_module *_php_find_ps_module(char *name) ps_module *ret = NULL; ps_module **mod; + PSLS_FETCH(); + for(mod = ps_modules; ((*mod && (*mod)->name) || !*mod); mod++) { if(*mod && !strcasecmp(name, (*mod)->name)) { ret = *mod; @@ -284,7 +289,8 @@ static void _php_session_start(void) char *session_data; int datalen; PSLS_FETCH(); - + ELS_FETCH(); + if(!PS(id) && zend_hash_find(&EG(symbol_table), PS(session_name), strlen(PS(session_name)) + 1, (void **) &ppid) == SUCCESS) { @@ -513,6 +519,7 @@ void php_rshutdown_globals(php_ps_globals *ps_globals) int php_rinit_session(INIT_FUNC_ARGS) { php_rinit_globals(&ps_globals); + if(INI_INT("session_auto_start")) { _php_session_start(); } diff --git a/php4dllts.dsp b/php4dllts.dsp index 96515fa6bb..c1d6816933 100644 --- a/php4dllts.dsp +++ b/php4dllts.dsp @@ -383,6 +383,10 @@ SOURCE=.\ext\standard\reg.c # End Source File
# Begin Source File
+SOURCE=.\ext\session\session.c
+# End Source File
+# Begin Source File
+
SOURCE=.\ext\standard\soundex.c
# End Source File
# Begin Source File
@@ -515,6 +519,10 @@ SOURCE=.\functions\php3_syslog.h # End Source File
# Begin Source File
+SOURCE=.\ext\session\php_session.h
+# End Source File
+# Begin Source File
+
SOURCE=.\functions\phpdir.h
# End Source File
# Begin Source File
|