From: Rui Hirokawa <hirokawa@php.net>
Date: Fri, 4 May 2001 03:55:48 +0000 (+0000)
Subject: added status parameter to output handler in ext/iconv.
X-Git-Tag: php-4.0.6RC1~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93e75216393b95f8ae73f8bdc9d1d65c3903f183;p=php

added status parameter to output handler in ext/iconv.
---

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index f93a41392e..ff98e204a3 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -24,7 +24,7 @@
 
 #include "php_iconv.h"
 #include "ext/standard/info.h"
-
+#include "ext/standard/php_output.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(iconv)
 
@@ -171,20 +171,23 @@ PHP_FUNCTION(iconv)
 }
 /* }}} */
 
-/* {{{ proto string ob_iconv_handler(string contents)
+/* {{{ proto string ob_iconv_handler(string contents, int status)
    Returns str in output buffer converted to the iconv.output_encoding character set */
 PHP_FUNCTION(ob_iconv_handler)
 {
 	int coding;
 	char *out_buffer;
-	zval **zv_string;
+	zval **zv_string, **zv_status;
 	SLS_FETCH();
 	ICONVLS_FETCH();
 
-	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &zv_string)==FAILURE) {
+	if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &zv_string, &zv_status)==FAILURE) {
 		ZEND_WRONG_PARAM_COUNT();
 	}
 
+	convert_to_string_ex(zv_string);
+	convert_to_long_ex(zv_status);
+
 	if (SG(sapi_headers).send_default_content_type &&
 		php_iconv_string(Z_STRVAL_PP(zv_string), &out_buffer,
 						 ICONVG(internal_encoding),