From 3365a94101db9296945b6a156cb51fc3eef0c9c8 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Thu, 23 Dec 2004 19:39:49 +0000 Subject: [PATCH] MFH --- ext/standard/streamsfuncs.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 6890842a61..48147472be 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -217,7 +217,7 @@ PHP_FUNCTION(stream_socket_accept) if (peername) { zval_dtor(peername); - ZVAL_STRING(peername, "", 0); + ZVAL_NULL(peername); } if (0 == php_stream_xport_accept(stream, &clistream, @@ -227,6 +227,7 @@ PHP_FUNCTION(stream_socket_accept) &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"); @@ -237,10 +238,6 @@ PHP_FUNCTION(stream_socket_accept) if (errstr) { efree(errstr); } - - if (peername && Z_STRVAL_P(peername) == NULL) { - ZVAL_STRING(peername, "", 1); - } } /* }}} */ -- 2.50.1