Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c basic_functions.c

2008-05-18 Thread Hannes Magnusson 
On Sun, May 18, 2008 at 11:50 PM, Felipe Pena [EMAIL PROTECTED] wrote:
 felipe  Sun May 18 21:50:58 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   array.c basic_functions.c
  Log:
  - MFB: Making compatible with 64bit platform
 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.71r2=1.725.2.31.2.72diff_format=u
 Index: php-src/ext/standard/basic_functions.c
 diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.71 
 php-src/ext/standard/basic_functions.c:1.725.2.31.2.72
 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.71  Mon May 12 
 08:47:29 2008
 +++ php-src/ext/standard/basic_functions.c  Sun May 18 21:50:58 2008
 @@ -17,7 +17,7 @@
+--+
  */

 -/* $Id: basic_functions.c,v 1.725.2.31.2.71 2008/05/12 08:47:29 tony2001 Exp 
 $ */
 +/* $Id: basic_functions.c,v 1.725.2.31.2.72 2008/05/18 21:50:58 felipe Exp $ 
 */

  #include php.h
  #include php_streams.h
 @@ -3859,9 +3859,17 @@
SetEnvironmentVariable(pe-key, bugbug);
  #endif
putenv(pe-previous_value);
 + basic_functions.c
 +#if defined(PHP_WIN32) || (defined (__FreeBSD__)  (__FreeBSD__  7))
 +===
  # if defined(PHP_WIN32)
 + 1.725.2.31.2.71
efree(pe-previous_value);
 + basic_functions.c
 +#endif
 +===
  # endif
 + 1.725.2.31.2.71
} else {
  # if HAVE_UNSETENV
unsetenv(pe-key);
 @@ -4461,8 +4469,13 @@
pe.previous_value = NULL;
for (env = environ; env != NULL  *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len)  
 (*env)[pe.key_len] == '=') {  /* found it */
 + basic_functions.c
 +#if defined(PHP_WIN32) || (defined (__FreeBSD__)  (__FreeBSD__  7))
 +   /* must copy previous value because putenv 
 can free the string without notice */
 +===
  #if defined(PHP_WIN32)
/* must copy previous value because MSVCRT's 
 putenv can free the string without notice */
 + 1.725.2.31.2.71

Multiple cvs conflict alert..

-Hannes

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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c basic_functions.c

2008-05-18 Thread Felipe Pena 
Em Seg, 2008-05-19 às 00:16 +0200, Hannes Magnusson escreveu:
 On Sun, May 18, 2008 at 11:50 PM, Felipe Pena [EMAIL PROTECTED] wrote:
  felipe  Sun May 18 21:50:58 2008 UTC
 
   Modified files:  (Branch: PHP_5_2)
 /php-src/ext/standard   array.c basic_functions.c
   Log:
   - MFB: Making compatible with 64bit platform
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.71r2=1.725.2.31.2.72diff_format=u
  Index: php-src/ext/standard/basic_functions.c
  diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.71 
  php-src/ext/standard/basic_functions.c:1.725.2.31.2.72
  --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.71  Mon May 12 
  08:47:29 2008
  +++ php-src/ext/standard/basic_functions.c  Sun May 18 21:50:58 2008
  @@ -17,7 +17,7 @@
 +--+
   */
 
  -/* $Id: basic_functions.c,v 1.725.2.31.2.71 2008/05/12 08:47:29 tony2001 
  Exp $ */
  +/* $Id: basic_functions.c,v 1.725.2.31.2.72 2008/05/18 21:50:58 felipe Exp 
  $ */
 
   #include php.h
   #include php_streams.h
  @@ -3859,9 +3859,17 @@
 SetEnvironmentVariable(pe-key, bugbug);
   #endif
 putenv(pe-previous_value);
  + basic_functions.c
  +#if defined(PHP_WIN32) || (defined (__FreeBSD__)  (__FreeBSD__  7))
  +===
   # if defined(PHP_WIN32)
  + 1.725.2.31.2.71
 efree(pe-previous_value);
  + basic_functions.c
  +#endif
  +===
   # endif
  + 1.725.2.31.2.71
 } else {
   # if HAVE_UNSETENV
 unsetenv(pe-key);
  @@ -4461,8 +4469,13 @@
 pe.previous_value = NULL;
 for (env = environ; env != NULL  *env != NULL; env++) {
 if (!strncmp(*env, pe.key, pe.key_len)  
  (*env)[pe.key_len] == '=') {  /* found it */
  + basic_functions.c
  +#if defined(PHP_WIN32) || (defined (__FreeBSD__)  (__FreeBSD__  7))
  +   /* must copy previous value because putenv 
  can free the string without notice */
  +===
   #if defined(PHP_WIN32)
 /* must copy previous value because MSVCRT's 
  putenv can free the string without notice */
  + 1.725.2.31.2.71
 
 Multiple cvs conflict alert..

Ops, the 'basic_functions.c' was accidentally.

Thanks.

 
 -Hannes
-- 
Regards,
Felipe Pena.


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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c

2007-03-19 Thread Antony Dovgal 

On 03/18/2007 11:20 PM, Wez Furlong wrote:

wez Sun Mar 18 20:20:23 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard	array.c 
  Log:

  fixes #40848


Is there any test case?

--
Wbr, 
Antony Dovgal


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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c

2007-03-19 Thread Wez Furlong 

I'm surprised that we don't have one for this already.

You can observe that the patch is correct because this list:
http://omniti.com/people
is sorted alphabetically by last name when running on amd64 solaris,  
and without the patch, it was not.


--Wez.



On Mar 19, 2007, at 3:59 AM, Antony Dovgal wrote:


On 03/18/2007 11:20 PM, Wez Furlong wrote:

wez Sun Mar 18 20:20:23 2007 UTC
  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   array.c   Log:
  fixes #40848


Is there any test case?

--
Wbr, Antony Dovgal


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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c

2007-03-19 Thread Antony Dovgal 

On 03/19/2007 05:40 PM, Wez Furlong wrote:

I'm surprised that we don't have one for this already.

You can observe that the patch is correct because this list:
http://omniti.com/people
is sorted alphabetically by last name when running on amd64 solaris,  
and without the patch, it was not.


Well, then how about creating one?
I don't think I can find an AMD64 Solaris machine for tests.

--
Wbr, 
Antony Dovgal


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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c

2007-03-19 Thread Wez Furlong 

On 3/19/07, Antony Dovgal [EMAIL PROTECTED] wrote:

On 03/19/2007 05:40 PM, Wez Furlong wrote:
 I'm surprised that we don't have one for this already.

 You can observe that the patch is correct because this list:
 http://omniti.com/people
 is sorted alphabetically by last name when running on amd64 solaris,
 and without the patch, it was not.

Well, then how about creating one?
I don't think I can find an AMD64 Solaris machine for tests.


You don't need an AMD64 Solaris machine to write a test, you need time.

--Wez.

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