PHP6 Update: fsockopen/psfockopen

diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index 6970c038a430137bb405fbe0e7459a34388522b2..dcc6429bf4580c6c84b9244fb9d35349d899f2b7 100644 (file)
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -98,7 +98,7 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                if (zerrstr && errstr) {
                        /* no need to dup; we need to efree buf anyway */
                        zval_dtor(zerrstr);
-                       ZVAL_STRING(zerrstr, errstr, 0);
+                       ZVAL_RT_STRING(zerrstr, errstr, ZSTR_AUTOFREE);
                }
                else if (!zerrstr && errstr) {
                        efree(errstr);
@@ -116,14 +116,14 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 
 /* }}} */
 
-/* {{{ proto resource fsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]])
+/* {{{ proto resource fsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]]) U
    Open Internet or Unix domain socket connection */
 PHP_FUNCTION(fsockopen)
 {
        php_fsockopen_stream(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
 /* }}} */
-/* {{{ proto resource pfsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]])
+/* {{{ proto resource pfsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]]) U
    Open persistent Internet or Unix domain socket connection */
 PHP_FUNCTION(pfsockopen)
 {