Hello Michael,

  can you please also MFH to 4.4 - thanks

best regards
marcus

Wednesday, November 22, 2006, 11:45:06 AM, you wrote:

> mike            Wed Nov 22 10:45:06 2006 UTC

>   Modified files:              (Branch: PHP_5_2)
>     /php-src    run-tests.php 
>   Log:
>   - fix ENV section handling
>   
>   
> http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.15&r2=1.226.2.37.2.16&diff_format=u
> Index: php-src/run-tests.php
> diff -u php-src/run-tests.php:1.226.2.37.2.15
> php-src/run-tests.php:1.226.2.37.2.16
> --- php-src/run-tests.php:1.226.2.37.2.15       Thu Sep 14 16:58:52 2006
> +++ php-src/run-tests.php       Wed Nov 22 10:45:06 2006
> @@ -23,7 +23,7 @@
>     +----------------------------------------------------------------------+
>   */
>  
> -/* $Id: run-tests.php,v 1.226.2.37.2.15 2006/09/14 16:58:52 nlopess Exp $ */
> +/* $Id: run-tests.php,v 1.226.2.37.2.16 2006/11/22 10:45:06 mike Exp $ */
>  
>  /* Sanity check to ensure that pcre extension needed by this script is 
> available.
>   * In the event it is not, print a nice error message indicating that this 
> script will
> @@ -397,7 +397,7 @@
>                                         $html_output = 
> is_resource($html_file);
>                                         break;
>                                 case '--version':
> -                                       echo '$Revision: 1.226.2.37.2.15 
> $'."\n";
> +                                       echo '$Revision: 1.226.2.37.2.16 
> $'."\n";
>                                         exit(1);
>                                 default:
>                                         echo "Illegal switch '$switch' 
> specified!\n";
> @@ -1134,11 +1134,9 @@
>         $env['CONTENT_TYPE']='';
>         $env['CONTENT_LENGTH']='';
>         if (!empty($section_text['ENV'])) {
> -               foreach(explode("\n", $section_text['ENV']) as $e) {
> -                       $e = explode('=',trim($e));
> -                       if (count($e) == 2) {
> -                               $env[$e[0]] = $e[1];
> -                       }
> +               foreach(explode("\n", trim($section_text['ENV'])) as $e) {
> +                       $e = explode('=',trim($e),2);
> +                       $env[$e[0]] = $e[1];
>                 }
>         }
>  




Best regards,
 Marcus

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to