Merge branch 'PHP-5.5' into PHP-5.6

weltling · weltling · commit ad4d022bdf23 · 2015-05-21T08:21:53.000+02:00
* PHP-5.5:
  fix handling VAR vs VAR= in putenv
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -4120,7 +4120,7 @@ PHP_FUNCTION(putenv)
 		Obviously the CRT version will be useful more often. But
 		generally, doing both brings us on the safe track at least
 		in NTS build. */
-	&& _putenv(pe.putenv_string) == 0
+	&& _putenv_s(pe.key, value ? value : "") == 0
 # endif
 	) { /* success */
 # endif
