Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:39799
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.198.227 as permitted sender)
DomainKey-Status: bad
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:to:subject:cc:in-reply-to:mime-version
         :content-type:content-transfer-encoding:content-disposition
         :references;
        b=RoY+8X21nNsvXF5JZ2dTzr+qUMPPTo/x99M5jFGWgyjyy6ru2y+lNAIQI15x8wQPrF
         wH4U+qTDIMZNzzQWEpdUv3TncwvG1LA5fuGIc4js3CrUpKlXQCG7HbJlSH4ePo03GGkp
         ICMvqEX6OlpeKik6RiHJZ59Japn5swE4fqfG4=
Message-ID: <fe05d1540808091154lf892d2ap84c80f626edb7d3b@mail.gmail.com>
Date: Sat, 9 Aug 2008 20:54:27 +0200
To: "Dmitry Stogov" <dmitry@zend.com>
Cc: "Rasmus Lerdorf" <rasmus@lerdorf.com>, 
	"Hannes Magnusson" <hannes.magnusson@gmail.com>, 
	"Arnaud Le Blanc" <arnaud.lb@gmail.com>, internals@lists.php.net, 
	"Felipe Pena" <felipensp@gmail.com>, 
	"Christian Stocker" <christian.stocker@liip.ch>, 
	"Andi Gutmans" <andi@zend.com>, "Stanislav Malyshev" <stas@zend.com>
In-Reply-To: <489DB787.8060508@zend.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <4899C4B4.3060902@liip.ch> <1218138548.5346.3.camel@felipe>
	 <489B5285.1070000@lerdorf.com>
	 <200808072237.01841.arnaud.lb@gmail.com>
	 <7f3ed2c30808080011l3c62d416k7fd9b4dd455df99e@mail.gmail.com>
	 <489C6BBA.8030101@zend.com> <489CBDD8.6070502@lerdorf.com>
	 <489CBE81.5030003@lerdorf.com> <489DB787.8060508@zend.com>
Subject: Re: [PHP-DEV] include bug in 5.3
From: pierre.php@gmail.com ("Pierre Joye")

hi Dmitry,

On Sat, Aug 9, 2008 at 5:28 PM, Dmitry Stogov <dmitry@zend.com> wrote:
> The improved patch fixes all the issues I found during testing.
> However I wasn't able to test it on NETWARE and on Solaris with relative
> paths.
>
> Please test it as much as possible.

I run the test suite and the results can be seen here:

http://phpfi.com/341752

There is two failing for real path (Server 2008, Vista 64 and XP (32 and 64)):

Test realpath() function: basic functionality
[C:\Users\pierre\Documents\php-sdk\vc9\x86\php_5_3\ext\standard\tests\file\realpath_basic-win32.phpt]
realpath() with relative directory
[C:\Users\pierre\Documents\php-sdk\vc9\x86\php_5_3\ext\standard\tests\file\realpath_basic2.phpt]


Some other may fail because of a change in realpath behavior. I will
run them again without the patch and post again the affected tests.

> I'm going to commit it on Tuesday in case of no objections.

A FindClose is missing:

> +#ifdef TSRM_WIN32
> +               if (save && (hFind = FindFirstFile(path, &data)) ==  INVALID_HANDLE_VALUE) {
>                        if (use_realpath == CWD_REALPATH) {
> -                               return 1;
> +                               /* file not found */
> +                               return -1;
>                        }

.....

> +               if (save) {
> +                       directory = (data.dwFileAttributes &  FILE_ATTRIBUTE_DIRECTORY) != 0;
> +                       if (is_dir && !directory) {
> +                               /* not a directory */

FindClose(hFind);

> +                               return -1;
> +                       }
> +               }
> +               tmp = tsrm_do_alloca(len+1, use_heap);
> +               memcpy(tmp, path, len+1);
> +#elif defined(NETWARE)
> +               save = 0;
> +               tmp = tsrm_do_alloca(len+1, use_heap);
> +               memcpy(tmp, path, len+1);
>  #else

Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org