mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed bug #48802 (printf() returns incorrect outputted length)

Browse Source
This commit is contained in:
Jani Taskinen 2009-07-23 14:54:04 +00:00
parent 855034b955
commit 6dc86facd0
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@ -14,17 +14,18 @@ PHP NEWS
(Greg)
- Fixed bug #49018 (phar tar stores long filenames wit prefix/name reversed).
(Greg)
- Fixed bug #49014 (dechunked filter broken when serving more than 8192 bytes in
a chunk). (andreas dot streichardt at globalpark dot com, Ilia)
- Fixed bug #48962 (cURL does not upload files with specified filename).
(Ilia)
- Fixed bug #48929 (Double \r\n after HTTP headers when "header" context
option is an array). (David Zülke)
- Fixed bug #49014 (dechunked filter broken when serving more than 8192 bytes in
a chunk) (andreas dot streichardt at globalpark dot com, Ilia)
- Fixed bug #48899 (is_callable returns true even if method does not exist in
parent class). (Felipe)
- Fixed bug #48893 (Problems compiling with Curl). (Felipe)
- Fixed bug #48854 (array_merge_recursive modifies arrays after first one).
(Felipe)
- Fixed bug #48802 (printf() returns incorrect outputted length). (Jani)
- Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked
directories). (Ilia)
- Fixed bug #48771 (rename() between volumes fails and reports no error on

12
ext/standard/formatted_print.c
View File

@ -697,14 +697,14 @@ PHP_FUNCTION(vsprintf)
PHP_FUNCTION(user_printf)
{
char *result;
int len;
int len, rlen;
if ((result=php_formatted_print(ht, &len, 0, 0 TSRMLS_CC))==NULL) {
RETURN_FALSE;
}
PHPWRITE(result, len);
rlen = PHPWRITE(result, len);
efree(result);
RETURN_LONG(len);
RETURN_LONG(rlen);
}
/* }}} */
@ -713,14 +713,14 @@ PHP_FUNCTION(user_printf)
PHP_FUNCTION(vprintf)
{
char *result;
int len;
int len, rlen;
if ((result=php_formatted_print(ht, &len, 1, 0 TSRMLS_CC))==NULL) {
RETURN_FALSE;
}
PHPWRITE(result, len);
rlen = PHPWRITE(result, len);
efree(result);
RETURN_LONG(len);
RETURN_LONG(rlen);
}
/* }}} */

2
sapi/cli/php_cli.c
View File

@ -298,7 +298,7 @@ static int sapi_cli_ub_write(const char *str, uint str_length TSRMLS_DC) /* {{{
remaining -= ret;
}
return str_length;
return (ptr - str);
}
/* }}} */