nlopess Sat Jun 17 11:14:21 2006 UTC Modified files: /php-src configure.in /php-src/sapi/cgi cgi_main.c Log: MFB http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.603&r2=1.604&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.603 php-src/configure.in:1.604 --- php-src/configure.in:1.603 Mon Apr 10 12:16:08 2006 +++ php-src/configure.in Sat Jun 17 11:14:21 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.603 2006/04/10 12:16:08 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.604 2006/06/17 11:14:21 nlopess Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -502,6 +502,7 @@ setitimer \ setlocale \ localeconv \ +setenv \ setpgid \ setsockopt \ setvbuf \ http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.292&r2=1.293&diff_format=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.292 php-src/sapi/cgi/cgi_main.c:1.293 --- php-src/sapi/cgi/cgi_main.c:1.292 Tue Jun 13 14:22:27 2006 +++ php-src/sapi/cgi/cgi_main.c Sat Jun 17 11:14:21 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.292 2006/06/13 14:22:27 dmitry Exp $ */ +/* $Id: cgi_main.c,v 1.293 2006/06/17 11:14:21 nlopess Exp $ */ #include "php.h" #include "php_globals.h" @@ -385,6 +385,18 @@ return fcgi_putenv(request, name, name_len, value); } +#if HAVE_SETENV + if (value) { + setenv(name, value, 1); + } +#endif +#if HAVE_UNSETENV + if (!value) { + unsetenv(name); + } +#endif + +#if !HAVE_SETENV || !HAVE_UNSETENV /* if cgi, or fastcgi and not found in fcgi env check the regular environment this leaks, but it's only cgi anyway, we'll fix @@ -395,12 +407,19 @@ if (buf == NULL) { return getenv(name); } +#endif +#if !HAVE_SETENV if (value) { len = snprintf(buf, len - 1, "%s=%s", name, value); - } else { + putenv(buf); + } +#endif +#if !HAVE_UNSETENV + if (!value) { len = snprintf(buf, len - 1, "%s=", name); + putenv(buf); } - putenv(buf); +#endif return getenv(name); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php