hi Tony,
I would rather do something like:
#if PHP_API_VERSION < 20100412
# define PHP_OPENBASEDIR_CHECKPATH(filename) \
(PG(safe_mode) && (!php_checkuid(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename
TSRMLS_CC)
#else
#define PHP_OPENBASEDIR_CHECKPATH(filename) \
php_check_open_basedir(filename TSRMLS_CC)
#endif
instead of keeping dead define in our code. Maybe rename the macro
name to better reflect its goal (open basedir and safemode).
Cheers,
On Wed, Apr 28, 2010 at 12:36 PM, Antony Dovgal <tony2...@php.net> wrote:
> tony2001 Wed, 28 Apr 2010 10:36:33 +0000
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=298696
>
> Log:
> add the constant back. quite a lot of code uses it.
>
> Changed paths:
> U php/php-src/trunk/main/php_streams.h
>
> Modified: php/php-src/trunk/main/php_streams.h
> ===================================================================
> --- php/php-src/trunk/main/php_streams.h 2010-04-28 10:11:50 UTC (rev
> 298695)
> +++ php/php-src/trunk/main/php_streams.h 2010-04-28 10:36:33 UTC (rev
> 298696)
> @@ -480,6 +480,7 @@
> #define USE_PATH 0x00000001
> #define IGNORE_URL 0x00000002
> #define REPORT_ERRORS 0x00000008
> +#define ENFORCE_SAFE_MODE 0 /* for BC only */
>
> /* If you don't need to write to the stream, but really need to
> * be able to seek, use this flag in your options. */
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
