From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 18 Jun 2004 00:37:02 +0000 (+0000)
Subject: MFH: Fixed bug #28818 (Apache 2 sapis do not export st_dev).
X-Git-Tag: php-4.3.9RC1~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b67e80ea4f2f5fe5f71c11795c6349a616a993c0;p=php

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

diff --git a/NEWS b/NEWS
index a90bb2c343..ff38bf438a 100644
--- 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 c668caecac..cc1d8e59a3 100644
--- 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 357248470e..6043e34f29 100644
--- 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;