cvs: php-src /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c
| From: | Ilia Alshanetsky | Date: | Fri, 18 Jun 2004 00:36:59 +0000 |
| Subject: | cvs: php-src /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-27640@lists.php.net to get a copy of this message | ||
iliaa Thu Jun 17 20:36:59 2004 EDT
Modified files:
/php-src/sapi/apache2filter sapi_apache2.c
/php-src/sapi/apache2handler sapi_apache2.c
Log:
Fixed bug #28818 (Apache 2 sapis do not export st_dev).
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.124&r2=1.125&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.124
php-src/sapi/apache2filter/sapi_apache2.c:1.125
--- php-src/sapi/apache2filter/sapi_apache2.c:1.124 Sun Mar 7 22:15:38 2004
+++ php-src/sapi/apache2filter/sapi_apache2.c Thu Jun 17 20:36:58 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.124 2004/03/08 03:15:38 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.125 2004/06/18 00:36:58 iliaa Exp $ */
#include <fcntl.h>
@@ -171,6 +171,7 @@
ctx->finfo.st_uid = ctx->r->finfo.user;
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)
ctx->finfo.st_atime.tv_sec = ctx->r->finfo.atime/1000000;
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.38&r2=1.39&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.38
php-src/sapi/apache2handler/sapi_apache2.c:1.39
--- php-src/sapi/apache2handler/sapi_apache2.c:1.38 Tue Mar 16 17:38:07 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Jun 17 20:36:58 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.38 2004/03/16 22:38:07 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.39 2004/06/18 00:36:58 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -181,6 +181,7 @@
ctx->finfo.st_uid = ctx->r->finfo.user;
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)
ctx->finfo.st_atime.tv_sec = ctx->r->finfo.atime/1000000;