cvs: php-src /ext/standard streamsfuncs.c
| From: | Wez Furlong | Date: | Thu, 23 Dec 2004 19:39:23 +0000 |
| Subject: | cvs: php-src /ext/standard streamsfuncs.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29653@lists.php.net to get a copy of this message | ||
wez Thu Dec 23 14:39:23 2004 EDT
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
really don't blow up
http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.47&r2=1.48&ty=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.47 php-src/ext/standard/streamsfuncs.c:1.48
--- php-src/ext/standard/streamsfuncs.c:1.47 Thu Dec 23 00:56:50 2004
+++ php-src/ext/standard/streamsfuncs.c Thu Dec 23 14:39:22 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.47 2004/12/23 05:56:50 wez Exp $ */
+/* $Id: streamsfuncs.c,v 1.48 2004/12/23 19:39:22 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -250,7 +250,7 @@
if (peername) {
zval_dtor(peername);
- ZVAL_STRING(peername, "", 0);
+ ZVAL_NULL(peername);
}
if (0 == php_stream_xport_accept(stream, &clistream,
@@ -260,6 +260,7 @@
&tv, &errstr
TSRMLS_CC) && clistream) {
+ Z_TYPE_P(peername) = IS_STRING;
php_stream_to_zval(clistream, return_value);
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "accept failed: %s", errstr ? errstr :
"Unknown error");
@@ -270,10 +271,6 @@
if (errstr) {
efree(errstr);
}
-
- if (peername && Z_STRVAL_P(peername) == NULL) {
- ZVAL_STRING(peername, "", 1);
- }
}
/* }}} */