MFH

diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 6890842a61da36eadb5b5352df11b90953e0e596..48147472be1eac2a1cc181564efd93aa1f46672c 100644 (file)
--- 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);
-       }
 }
 /* }}} */