pajoye                                   Thu, 04 Feb 2010 09:08:57 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=294503

Log:
- #50690, putenv does assign value when their length is one char on windows

Bug: http://bugs.php.net/50690 (unknown) 
      
Changed paths:
    _U  php/php-src/branches/PHP_5_3_2/
    U   php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.c
    A + 
php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug50690.phpt
        (from 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug50690.phpt:r293902)
    _U  php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
    _U  
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_2
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901,293906,293974,294040
/php/php-src/trunk:284726
   + 
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293974,294040
/php/php-src/trunk:284726

Modified: php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.c
===================================================================
--- php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.c       
2010-02-04 09:04:37 UTC (rev 294502)
+++ php/php-src/branches/PHP_5_3_2/ext/standard/basic_functions.c       
2010-02-04 09:08:57 UTC (rev 294503)
@@ -4056,7 +4056,7 @@
                pe.key_len = strlen(pe.key);
 #ifdef PHP_WIN32
                if (equals) {
-                       if (pe.key_len < setting_len - 2) {
+                       if (pe.key_len < setting_len - 1) {
                                value = p + 1;
                        } else {
                                /* empty string*/

Copied: 
php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug50690.phpt
 (from rev 293902, 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug50690.phpt)
===================================================================
--- 
php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug50690.phpt
                           (rev 0)
+++ 
php/php-src/branches/PHP_5_3_2/ext/standard/tests/general_functions/bug50690.phpt
   2010-02-04 09:08:57 UTC (rev 294503)
@@ -0,0 +1,14 @@
+--TEST--
+Bug #23650 (putenv() does not assign values when the value is one character)
+--FILE--
+<?php
+putenv("foo=ab");
+putenv("bar=c");
+var_dump(getenv("foo"));
+var_dump(getenv("bar"));
+var_dump(getenv("thisvardoesnotexist"));
+?>
+--EXPECT--
+string(2) "ab"
+string(1) "c"
+bool(false)


Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901,293906,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
   + 
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,294040
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941


Property changes on: 
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901,293906,294040
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
   + 
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,294040
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951

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

Reply via email to