CVS update: php4/ext/session
| From: | andi | Date: | Sun, 06 Jun 1999 18:22:18 +0000 |
| Subject: | CVS update: php4/ext/session | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1330@lists.php.net to get a copy of this message | ||
Date: Sunday June 6, 1999 @ 14:22
Author: andi
Update of /repository/php4/ext/session
In directory php:/tmp/cvs-serv32715/ext/session
Modified Files:
session.c
Log Message:
- Add some *_FETCH()'s. Still some work to be done so that it'll compile on win32.
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.7 php4/ext/session/session.c:1.8
--- php4/ext/session/session.c:1.7 Sun Jun 6 11:18:51 1999
+++ php4/ext/session/session.c Sun Jun 6 14:22:17 1999
@@ -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 @@
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 @@
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 @@
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 @@
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 @@
int php_rinit_session(INIT_FUNC_ARGS)
{
php_rinit_globals(&ps_globals);
+
if(INI_INT("session_auto_start")) {
_php_session_start();
}