MFH: Fixed bug #28818 (Apache 2 sapis do not export st_dev).

diff --git a/NEWS b/NEWS
index a90bb2c34342c8e72a53a09fb007aa27d2c53db8..ff38bf438a05ff0b396cb93022e79c4e217ba368 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2004, Version 4.3.8
+- Fixed bug #28818 (Apache 2 sapis do not export st_dev).
+  (xuefer at 21cn dot com, Ilia).
 - Fixed bug #28723 (Fixed mbstring config.m4 to work on OSes where test
   command does not support -e parameter). (Ilia)
 - Fixed bug #28692 (\0 in Authenticate header passed via safe_mode). (Ilia)

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index c668caecac58142b6259a6d1eb957270875fa659..cc1d8e59a3588c61c066710dfe15cd3712bbde34 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -166,6 +166,7 @@ php_apache_sapi_get_stat(TSRMLS_D)
 
        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;
        ctx->finfo.st_atime = ctx->r->finfo.atime/1000000;
        ctx->finfo.st_mtime = ctx->r->finfo.mtime/1000000;

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 357248470edf854115a6fc5be63480fbfdbe2259..6043e34f2917c7c350beedbe85880eef13efe7f1 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -179,6 +179,7 @@ php_apache_sapi_get_stat(TSRMLS_D)
 
        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;