com php-src: brought back that vs2012 fix: ext/date/php_date .c
| From: | Anatol Belski | Date: | Tue, 19 Aug 2014 07:37:38 +0000 |
| Subject: | com php-src: brought back that vs2012 fix: ext/date/php_date .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80602@lists.php.net to get a copy of this message | ||
Commit: d4f463cf0830de08c2b08557194883181a91fb08
Author: Anatol Belski <ab@php.net> Tue, 19 Aug 2014 09:37:38 +0200
Parents: 53c4c571b3d3b7891526ff616e69c4d74a04afe5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d4f463cf0830de08c2b08557194883181a91fb08
Log:
brought back that vs2012 fix
Changed paths:
M ext/date/php_date.c
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 6cea2af..b611a91 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -1698,7 +1698,7 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
/* VS2012 strftime() returns number of characters, not bytes.
See VC++11 bug id 766205. */
if (real_len > 0) {
- real_len = buf->len;
+ real_len = strlen(buf->val);
}
#endif