hi Ilia,

It was requested to do not commit anything but svn move related
changes. Real commits should wait until we got an OK from Gwynne. Btw,
that's also why Stan did not commit eitehr (see the discussion about
this fix).

thanks for your understanding,

Cheers,
--
Pierre

On Sun, Jul 12, 2009 at 6:38 PM, Ilia Alshanetsky<il...@php.net> wrote:
> iliaa           Sun, 12 Jul 2009 16:38:14 +0000
>
> ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=283944
>
> Changed paths:
>        U   php/php-src/branches/PHP_5_3/main/main.c
>
> Log:
> Fixed a possible crash inside OnUpdateErrorLog() when restoring an empty value
> Avoid pointless safe_mode/open_basedir checks on OnUpdateMailLog() if value is
> empty
>
>
>
> Modified: php/php-src/branches/PHP_5_3/main/main.c
> ===================================================================
> --- php/php-src/branches/PHP_5_3/main/main.c    2009-07-12 16:32:23 UTC (rev 
> 283943)
> +++ php/php-src/branches/PHP_5_3/main/main.c    2009-07-12 16:38:14 UTC (rev 
> 283944)
> @@ -349,8 +349,7 @@
>  static PHP_INI_MH(OnUpdateErrorLog)
>  {
>        /* Only do the safemode/open_basedir check at runtime */
> -       if ((stage == PHP_INI_STAGE_RUNTIME || stage == 
> PHP_INI_STAGE_HTACCESS) &&
> -               strcmp(new_value, "syslog")) {
> +       if ((stage == PHP_INI_STAGE_RUNTIME || stage == 
> PHP_INI_STAGE_HTACCESS) && new_value && strcmp(new_value, "syslog")) {
>                if (PG(safe_mode) && (!php_checkuid(new_value, NULL, 
> CHECKUID_CHECK_FILE_AND_DIR))) {
>                        return FAILURE;
>                }
> @@ -370,7 +369,7 @@
>  static PHP_INI_MH(OnUpdateMailLog)
>  {
>        /* Only do the safemode/open_basedir check at runtime */
> -       if (stage == PHP_INI_STAGE_RUNTIME || stage == 
> PHP_INI_STAGE_HTACCESS) {
> +       if ((stage == PHP_INI_STAGE_RUNTIME || stage == 
> PHP_INI_STAGE_HTACCESS) && new_value) {
>                if (PG(safe_mode) && (!php_checkuid(new_value, NULL, 
> CHECKUID_CHECK_FILE_AND_DIR))) {
>                        return FAILURE;
>                }
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>



-- 
Pierre

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

Reply via email to