php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Reverted the accidental previous commit

Browse Source
This commit is contained in:
Felipe Pena
2008-05-18 22:32:33 +00:00
parent 0f3bde23fd
commit a0e34ecfee
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/basic_functions.c
-13
View File
@@ -3859,17 +3859,9 @@ static void php_putenv_destructor(putenv_entry *pe)
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);
@@ -4469,13 +4461,8 @@ PHP_FUNCTION(putenv)
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
pe.previous_value = estrdup(*env);
#else
pe.previous_value = *env;