felipe Sun May 18 22:32:34 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c
Log:
- Reverted the accidental previous commit
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.72&r2=1.725.2.31.2.73&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u 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.73
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.72 Sun May 18
21:50:58 2008
+++ php-src/ext/standard/basic_functions.c Sun May 18 22:32:33 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.72 2008/05/18 21:50:58 felipe Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.73 2008/05/18 22:32:33 felipe Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3859,17 +3859,9 @@
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 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
