dmitry Mon Feb 19 13:21:14 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi fastcgi.c
Log:
Fixed fcgi_putenv() semantic with NULL value
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.16&r2=1.4.2.13.2.17&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.16
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.17
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.16 Thu Feb 15 12:33:16 2007
+++ php-src/sapi/cgi/fastcgi.c Mon Feb 19 13:21:14 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fastcgi.c,v 1.4.2.13.2.16 2007/02/15 12:33:16 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.17 2007/02/19 13:21:14 dmitry Exp $ */
#include "php.h"
#include "fastcgi.h"
@@ -975,14 +975,15 @@
char* fcgi_putenv(fcgi_request *req, char* var, int var_len, char* val)
{
if (var && req) {
- char **ret;
-
if (val == NULL) {
- val = "";
- }
- val = strdup(val);
- if (zend_hash_update(&req->env, var, var_len+1, &val,
sizeof(char*), (void**)&ret) == SUCCESS) {
- return *ret;
+ zend_hash_del(&req->env, var, var_len+1);
+ } else {
+ char **ret;
+
+ val = strdup(val);
+ if (zend_hash_update(&req->env, var, var_len+1, &val,
sizeof(char*), (void**)&ret) == SUCCESS) {
+ return *ret;
+ }
}
}
return NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
