I am all for that, but don't forget filestat.c and the macro
in php_filestat.h.

Thanks,
Jason

----- Original Message ----- 
From: "Andi Gutmans" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Friday, May 18, 2001 3:08 PM
Subject: [PHP-DEV] Re: [PHP-CVS] cvs: php4 /ext/standard file.c 


> I was just about to do an automatic merge of this fix to the PHP_4_0_6 
> branch when I saw that the merge will also merge the stat() update which 
> creates associative keys too (cvs update -j 1.159 file.c after an update -r 
> PHP_4_0_6).
> Any objections to me merging that one too? I think it would be good to have 
> it in 4.0.6.
> If people mind I can just merge this one by hand.
> 
> Andi
> 
> At 05:48 PM 5/18/2001 +0000, Sascha Schumann wrote:
> >sas             Fri May 18 10:48:43 2001 EDT
> >
> >   Modified files:
> >     /php4/ext/standard  file.c
> >   Log:
> >   Files should be shared among processes.
> >
> >
> >Index: php4/ext/standard/file.c
> >diff -u php4/ext/standard/file.c:1.158 php4/ext/standard/file.c:1.159
> >--- php4/ext/standard/file.c:1.158      Sat May 12 14:48:39 2001
> >+++ php4/ext/standard/file.c    Fri May 18 10:48:43 2001
> >@@ -21,7 +21,7 @@
> >     +----------------------------------------------------------------------+
> >   */
> >
> >-/* $Id: file.c,v 1.158 2001/05/12 21:48:39 wez Exp $ */
> >+/* $Id: file.c,v 1.159 2001/05/18 17:48:43 sas Exp $ */
> >
> >  /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
> >
> >@@ -1546,7 +1546,7 @@
> >                 if (sbuf.st_size > sizeof(buf)) {
> >                         off = ftell(fp);
> >                         len = sbuf.st_size - off;
> >-                       p = mmap(0, len, PROT_READ, MAP_PRIVATE, fd, off);
> >+                       p = mmap(0, len, PROT_READ, MAP_SHARED, fd, off);
> >                         if (p != (void *) MAP_FAILED) {
> >                                 PHPWRITE(p, len);
> >                                 munmap(p, len);
> >
> >
> >
> >--
> >PHP CVS Mailing List (http://www.php.net/)
> >To unsubscribe, e-mail: [EMAIL PROTECTED]
> >For additional commands, e-mail: [EMAIL PROTECTED]
> >To contact the list administrators, e-mail: [EMAIL PROTECTED]
> 
> 
> -- 
> PHP Development Mailing List <http://www.php.net/>
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> To contact the list administrators, e-mail: [EMAIL PROTECTED]
> 
> 


-- 
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Reply via email to