+#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
+ struct stat_libc finfo;
+#else
struct stat finfo;
+#endif
You are making the PHP source tree very hard to maintain. If anything, we should probably create some kind of abstraction in TSRM and use that everywhere. These fixes might achieve your goal for making PHP work on netware but they are making our code butt ugly and hard to maintain.
Andi
At 03:59 PM 1/3/2003 +0000, Anantha Kesari H Y wrote:
hyanantha Fri Jan 3 10:59:02 2003 EDT
Modified files:
/php4/sapi/apache2filter php_apache.h sapi_apache2.c
Log:
Modifications for NetWare.
Index: php4/sapi/apache2filter/php_apache.h
diff -u php4/sapi/apache2filter/php_apache.h:1.19 php4/sapi/apache2filter/php_apache.h:1.20
--- php4/sapi/apache2filter/php_apache.h:1.19 Tue Dec 31 10:59:03 2002
+++ php4/sapi/apache2filter/php_apache.h Fri Jan 3 10:59:02 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.h,v 1.19 2002/12/31 15:59:03 sebastian Exp $ */
+/* $Id: php_apache.h,v 1.20 2003/01/03 15:59:02 hyanantha Exp $ */
#ifndef PHP_APACHE_H
#define PHP_APACHE_H
@@ -41,7 +41,11 @@
/* Index for reading from buffer */
int post_idx;
/* stat structure of the current file */
+#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
+ struct stat_libc finfo;
+#else
struct stat finfo;
+#endif
/* Buffer for request body filter */
char *post_data;
/* Whether or not we've processed PHP in the output filters yet. */
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.101 php4/sapi/apache2filter/sapi_apache2.c:1.102
--- php4/sapi/apache2filter/sapi_apache2.c:1.101 Tue Dec 31 10:59:03 2002
+++ php4/sapi/apache2filter/sapi_apache2.c Fri Jan 3 10:59:02 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.101 2002/12/31 15:59:03 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.102 2003/01/03 15:59:02 hyanantha Exp $ */
#include <fcntl.h>
@@ -29,7 +29,11 @@
#include "SAPI.h"
#include "ext/standard/php_smart_str.h"
+#ifndef NETWARE
#include "ext/standard/php_standard.h"
+#else
+#include "ext/standard/basic_functions.h"
+#endif
#include "apr_strings.h"
#include "ap_config.h"
@@ -47,6 +51,10 @@
#include "php_apache.h"
+#ifdef NETWARE
+#undef shutdown /* To avoid Winsock confusion */
+#endif
+
/* A way to specify the location of the php.ini dir in an apache directive */
char *apache2_php_ini_path_override = NULL;
@@ -160,9 +168,16 @@
ctx->finfo.st_uid = ctx->r->finfo.user;
ctx->finfo.st_gid = ctx->r->finfo.group;
ctx->finfo.st_ino = ctx->r->finfo.inode;
+#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
+ ctx->finfo.st_atime.tv_sec = ctx->r->finfo.atime/1000000;
+ ctx->finfo.st_mtime.tv_sec = ctx->r->finfo.mtime/1000000;
+ ctx->finfo.st_ctime.tv_sec = ctx->r->finfo.ctime/1000000;
+#else
ctx->finfo.st_atime = ctx->r->finfo.atime/1000000;
ctx->finfo.st_mtime = ctx->r->finfo.mtime/1000000;
ctx->finfo.st_ctime = ctx->r->finfo.ctime/1000000;
+#endif
+
ctx->finfo.st_size = ctx->r->finfo.size;
ctx->finfo.st_nlink = ctx->r->finfo.nlink;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
-- PHP Development Mailing List <http://www.php.net/> To unsubscribe, visit: http://www.php.net/unsub.php
