svn: /php/php-src/trunk/sapi/cgi/ fastcgi.c

[Dmitry Stogov]

dmitry Wed, 01 Sep 2010 14:42:43 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=302977

Log:
invalid length

Changed paths:
U php/php-src/trunk/sapi/cgi/fastcgi.c

Modified: php/php-src/trunk/sapi/cgi/fastcgi.c
===================================================================
--- php/php-src/trunk/sapi/cgi/fastcgi.c 2010-09-01 13:14:40 UTC (rev 302976)
+++ php/php-src/trunk/sapi/cgi/fastcgi.c 2010-09-01 14:42:43 UTC (rev 302977)
@@ -1438,7 +1438,7 @@
if (val == NULL) {
fcgi_hash_del(&req->env, var, var_len);
} else {
- return fcgi_hash_set(&req->env, var, var_len+1, val, strlen(val));
+ return fcgi_hash_set(&req->env, var, var_len, val, strlen(val));
}
}
return NULL;

[Felipe Pena]

felipe Wed, 01 Sep 2010 23:21:03 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=302985

Log:
- Fixed compiler warning (missing return statement)

Changed paths:
U php/php-src/trunk/sapi/cgi/fastcgi.c

Modified: php/php-src/trunk/sapi/cgi/fastcgi.c
===================================================================
--- php/php-src/trunk/sapi/cgi/fastcgi.c 2010-09-01 22:59:25 UTC (rev 302984)
+++ php/php-src/trunk/sapi/cgi/fastcgi.c 2010-09-01 23:21:03 UTC (rev 302985)
@@ -1445,6 +1445,7 @@
if (!req) return NULL;
if (val == NULL) {
fcgi_hash_del(&req->env, FCGI_HASH_FUNC(var, var_len), var, var_len);
+ return NULL;
} else {
return fcgi_hash_set(&req->env, FCGI_HASH_FUNC(var, var_len), var, var_len, val, strlen(val));
}
@@ -1454,6 +1455,7 @@
{
if (val == NULL) {
fcgi_hash_del(&req->env, hash_value, var, var_len);
+ return NULL;
} else {
return fcgi_hash_set(&req->env, hash_value, var, var_len, val, strlen(val));
}