iliaa Tue Feb 3 19:22:55 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sockets sockets.c
Log:
MFB: Return empty string when recv() does not fetch any data
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.14.2.15&r2=1.171.2.9.2.14.2.16&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.15
php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.16
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.15 Sat Jan 24 13:06:21 2009
+++ php-src/ext/sockets/sockets.c Tue Feb 3 19:22:55 2009
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.171.2.9.2.14.2.15 2009/01/24 13:06:21 tony2001 Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.14.2.16 2009/02/03 19:22:55 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1046,6 +1046,9 @@
efree(tmpbuf);
RETURN_FALSE;
+ } else if (!retval) {
+ efree(tmpbuf);
+ RETURN_EMPTY_STRING();
}
tmpbuf = erealloc(tmpbuf, retval + 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
