summaryrefslogtreecommitdiff
path: root/ext/session
diff options
context:
space:
mode:
authorGuenter Knauf <guenter@php.net>2009-11-03 21:21:34 +0000
committerGuenter Knauf <guenter@php.net>2009-11-03 21:21:34 +0000
commit824692fab8279613730cd0a8aa38301781284a39 (patch)
treef0ff438a34fc9c550239a2a5a04f749dcc6989e8 /ext/session
parent4a95aa39890835ffe626d7243d565d82977959d2 (diff)
downloadphp-git-824692fab8279613730cd0a8aa38301781284a39.tar.gz
removed now obsolete NetWare hack since I fixed this
with Novell some longer time ago in their SDK header.
Diffstat (limited to 'ext/session')
-rw-r--r--ext/session/mod_files.c4
-rw-r--r--ext/session/session.c8
2 files changed, 1 insertions, 11 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 80ea2c2a15..6224b5442e 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -244,11 +244,7 @@ static int ps_files_cleanup_dir(const char *dirname, int maxlifetime TSRMLS_DC)
/* check whether its last access was more than maxlifet ago */
if (VCWD_STAT(buf, &sbuf) == 0 &&
-#ifdef NETWARE
- (now - sbuf.st_mtime.tv_sec) > maxlifetime) {
-#else
(now - sbuf.st_mtime) > maxlifetime) {
-#endif
VCWD_UNLINK(buf);
nrdels++;
}
diff --git a/ext/session/session.c b/ext/session/session.c
index 011f831c30..3a5d153cba 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -61,12 +61,6 @@ PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps);
* Helpers *
*********** */
-#ifdef NETWARE
-# define SESS_SB_MTIME(sb) ((sb).st_mtime.tv_sec)
-#else
-# define SESS_SB_MTIME(sb) ((sb).st_mtime)
-#endif
-
#define IF_SESSION_VARS() \
if (PS(http_session_vars) && PS(http_session_vars)->type == IS_ARRAY)
@@ -1095,7 +1089,7 @@ static inline void last_modified(TSRMLS_D) /* {{{ */
#define LAST_MODIFIED "Last-Modified: "
memcpy(buf, LAST_MODIFIED, sizeof(LAST_MODIFIED) - 1);
- strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &SESS_SB_MTIME(sb));
+ strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &sb.st_mtime);
ADD_HEADER(buf);
}
}