iliaa Sat May 19 17:52:30 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/iconv iconv.c
Log:
Avoid strlen()
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.124.2.8.2.15&r2=1.124.2.8.2.16&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.124.2.8.2.15
php-src/ext/iconv/iconv.c:1.124.2.8.2.16
--- php-src/ext/iconv/iconv.c:1.124.2.8.2.15 Mon Mar 12 19:34:26 2007
+++ php-src/ext/iconv/iconv.c Sat May 19 17:52:30 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.124.2.8.2.15 2007/03/12 19:34:26 tony2001 Exp $ */
+/* $Id: iconv.c,v 1.124.2.8.2.16 2007/05/19 17:52:30 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2305,8 +2305,8 @@
ICONVG(output_encoding),
ICONVG(internal_encoding));
_php_iconv_show_error(err, ICONVG(output_encoding),
ICONVG(internal_encoding) TSRMLS_CC);
if (out_buffer != NULL) {
- spprintf(&content_type, 0, "Content-Type:%s;
charset=%s", mimetype, ICONVG(output_encoding));
- if (content_type && sapi_add_header(content_type,
strlen(content_type), 0) != FAILURE) {
+ int len = spprintf(&content_type, 0, "Content-Type:%s;
charset=%s", mimetype, ICONVG(output_encoding));
+ if (content_type && sapi_add_header(content_type, len,
0) != FAILURE) {
SG(sapi_headers).send_default_content_type = 0;
}
if (mimetype_alloced) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
