cvs: php-src(PHP_5_2) /ext/sockets sockets.c
| From: | Ilia Alshanetsky | Date: | Tue, 03 Feb 2009 19:22:40 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/sockets sockets.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56086@lists.php.net to get a copy of this message | ||
iliaa Tue Feb 3 19:22:40 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sockets sockets.c
Log:
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.21&r2=1.171.2.9.2.22&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.21 php-src/ext/sockets/sockets.c:1.171.2.9.2.22
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.21 Wed Dec 31 11:17:43 2008
+++ php-src/ext/sockets/sockets.c Tue Feb 3 19:22:40 2009
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.171.2.9.2.21 2008/12/31 11:17:43 sebastian Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.22 2009/02/03 19:22:40 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -901,6 +901,9 @@
efree(tmpbuf);
RETURN_FALSE;
+ } else if (!retval) {
+ efree(tmpbuf);
+ RETURN_EMPTY_STRING();
}
tmpbuf = erealloc(tmpbuf, retval + 1);