iliaa Thu Jun 17 20:37:02 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/sapi/apache2filter sapi_apache2.c
/php-src/sapi/apache2handler sapi_apache2.c
Log:
MFH: Fixed bug #28818 (Apache 2 sapis do not export st_dev).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.682&r2=1.1247.2.683&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.682 php-src/NEWS:1.1247.2.683
--- php-src/NEWS:1.1247.2.682 Thu Jun 10 10:06:19 2004
+++ php-src/NEWS Thu Jun 17 20:37:01 2004
@@ -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)
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.91.2.24&r2=1.91.2.25&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.24
php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.25
--- php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.24 Sun Mar 7 22:16:11 2004
+++ php-src/sapi/apache2filter/sapi_apache2.c Thu Jun 17 20:37:02 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.91.2.24 2004/03/08 03:16:11 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.91.2.25 2004/06/18 00:37:02 iliaa Exp $ */
#include <fcntl.h>
@@ -166,6 +166,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;
ctx->finfo.st_atime = ctx->r->finfo.atime/1000000;
ctx->finfo.st_mtime = ctx->r->finfo.mtime/1000000;
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.30&r2=1.1.2.31&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.30
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.31
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.30 Tue Mar 16 17:38:17 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Jun 17 20:37:02 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.30 2004/03/16 22:38:17 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.31 2004/06/18 00:37:02 iliaa Exp $ */
#include <fcntl.h>
@@ -179,6 +179,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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
