From: Sara Golemon <pollita@php.net>
Date: Sun, 24 Sep 2006 21:43:41 +0000 (+0000)
Subject: PHP6 Update: fsockopen/psfockopen
X-Git-Tag: RELEASE_1_0_0RC1~1561
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37bf98099f6e0c8a6f9e7a4cf5e46c6326288a25;p=php

PHP6 Update: fsockopen/psfockopen
---

diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index 6970c038a4..dcc6429bf4 100644
--- 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)
 {