hyanantha Sat Jul 16 08:30:11 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/sapi/apache2filter php_apache.h sapi_apache2.c
Log:
sapi/apache2filter/php_apache.h
Removing redundant CLIB_STAT_PATCH
sapi/apache2filter/sapi_apache2.c
Removing redundant CLIB_STAT_PATCH
-- Kamesh
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/php_apache.h?r1=1.23&r2=1.23.2.1&ty=u
Index: php-src/sapi/apache2filter/php_apache.h
diff -u php-src/sapi/apache2filter/php_apache.h:1.23
php-src/sapi/apache2filter/php_apache.h:1.23.2.1
--- php-src/sapi/apache2filter/php_apache.h:1.23 Thu Jan 8 12:33:17 2004
+++ php-src/sapi/apache2filter/php_apache.h Sat Jul 16 08:30:10 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.h,v 1.23 2004/01/08 17:33:17 sniper Exp $ */
+/* $Id: php_apache.h,v 1.23.2.1 2005/07/16 12:30:10 hyanantha Exp $ */
#ifndef PHP_APACHE_H
#define PHP_APACHE_H
@@ -41,11 +41,7 @@
/* 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. */
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.125.2.4&r2=1.125.2.5&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.4
php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.5
--- php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.4 Mon Jun 20 08:46:52 2005
+++ php-src/sapi/apache2filter/sapi_apache2.c Sat Jul 16 08:30:10 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.125.2.4 2005/06/20 12:46:52 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.125.2.5 2005/07/16 12:30:10 hyanantha Exp $ */
#include <fcntl.h>
@@ -171,7 +171,7 @@
ctx->finfo.st_gid = ctx->r->finfo.group;
ctx->finfo.st_dev = ctx->r->finfo.device;
ctx->finfo.st_ino = ctx->r->finfo.inode;
-#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
+#ifdef NETWARE
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
