sas Fri Jan 24 18:57:32 2003 EDT
Modified files:
/php4/ext/session mod_files.c session.c
Log:
Remove ugly netware hacks from the code
Index: php4/ext/session/mod_files.c
diff -u php4/ext/session/mod_files.c:1.88 php4/ext/session/mod_files.c:1.89
--- php4/ext/session/mod_files.c:1.88 Thu Jan 16 02:21:49 2003
+++ php4/ext/session/mod_files.c Fri Jan 24 18:57:31 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mod_files.c,v 1.88 2003/01/16 07:21:49 sas Exp $ */
+/* $Id: mod_files.c,v 1.89 2003/01/24 23:57:31 sas Exp $ */
#include "php.h"
@@ -174,11 +174,7 @@
DIR *dir;
char dentry[sizeof(struct dirent) + MAXPATHLEN];
struct dirent *entry = (struct dirent *) &dentry;
-#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
- struct stat_libc sbuf;
-#else
struct stat sbuf;
-#endif
char buf[MAXPATHLEN];
time_t now;
int nrdels = 0;
@@ -212,11 +208,7 @@
buf[dirname_len + entry_len + 1] = '\0';
/* check whether its last access was more than
maxlifet ago */
if (VCWD_STAT(buf, &sbuf) == 0 &&
-#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
- (now - (sbuf.st_mtime).tv_sec) >
maxlifetime) {
-#else
(now - sbuf.st_mtime) > maxlifetime) {
-#endif
VCWD_UNLINK(buf);
nrdels++;
}
@@ -273,11 +265,7 @@
PS_READ_FUNC(files)
{
long n;
-#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
- struct stat_libc sbuf;
-#else
struct stat sbuf;
-#endif
PS_FILES_DATA;
ps_files_open(data, key TSRMLS_CC);
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.348 php4/ext/session/session.c:1.349
--- php4/ext/session/session.c:1.348 Sat Jan 18 19:45:49 2003
+++ php4/ext/session/session.c Fri Jan 24 18:57:32 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.348 2003/01/19 00:45:49 iliaa Exp $ */
+/* $Id: session.c,v 1.349 2003/01/24 23:57:32 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -828,11 +828,7 @@
static void last_modified(TSRMLS_D)
{
const char *path;
-#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
- struct stat_libc sb;
-#else
struct stat sb;
-#endif
char buf[MAX_STR + 1];
path = SG(request_info).path_translated;
@@ -843,11 +839,7 @@
#define LAST_MODIFIED "Last-Modified: "
memcpy(buf, LAST_MODIFIED, sizeof(LAST_MODIFIED) - 1);
-#ifdef NETWARE
- strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &((sb.st_mtime).tv_sec));
-#else
strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &sb.st_mtime);
-#endif
ADD_COOKIE(buf);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
