[PHP-CVS] com php-src: fix NEWS: NEWS
Commit:38847482c8192ea9914b826f54bf858df215abac Author:Stanislav Malyshev s...@php.net Wed, 6 Mar 2013 00:44:43 -0800 Parents: 4e46a873923b9a608cd2cdcef98ec7faad749d0e Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=38847482c8192ea9914b826f54bf858df215abac Log: fix NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 36f6f9a..17ecbe5 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,8 @@ PHP NEWS - Core: . Fixed bug #64235 (Insteadof not work for class method in 5.4.11). (Laruence) + . Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang). +(Ard Biesheuvel) . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi) . Fixed bug #64070 (Inheritance with Traits failed with error). (Dmitry) @@ -20,6 +22,8 @@ PHP NEWS . mb_split() can now handle empty matches like preg_split() does. (Moriyoshi) - OpenSSL: + . New SSL stream context option to prevent CRIME attack vector. (Daniel Lowrey, + Lars) . Fixed bug #61930 (openssl corrupts ssl key resource when using openssl_get_publickey()). (Stas) @@ -95,10 +99,6 @@ PHP NEWS . Fixed bug #63916 (PDO::PARAM_INT casts to 32bit int internally even on 64bit builds in pdo_sqlite). (srgoogleguy, Lars) -- OpenSSL: - . New SSL stream context option to prevent CRIME attack vector. (Daniel Lowrey, -Lars) - 17 Jan 2012, PHP 5.4.11 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #64359 strftime crash with VS2012: NEWS ext/date/php_date.c
Commit:371000a877c91cfc11ff3c75ce83826797478569 Author:Anatol Belski a...@php.net Wed, 6 Mar 2013 12:37:57 +0100 Parents: 9ed7eab514ae81b90987c8729cf73ef18ecd8f7b Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=371000a877c91cfc11ff3c75ce83826797478569 Log: Fixed bug #64359 strftime crash with VS2012 Bugs: https://bugs.php.net/64359 Changed paths: M NEWS M ext/date/php_date.c Diff: diff --git a/NEWS b/NEWS index a5b11c0..6ac8418 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,9 @@ PHP NEWS - PCRE: . Merged PCRE 8.32. (Anatol) +- DateTime: + . Fixed bug #64359 (strftime crash with VS2012). (Anatol) + 21 Feb 2013, PHP 5.5.0 Alpha 5 - Core: diff --git a/ext/date/php_date.c b/ext/date/php_date.c index f4115dc..418747c 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -1574,7 +1574,17 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt) long timestamp = 0; struct tmta; int max_reallocs = 5; - size_t buf_len = 64, real_len; +#ifdef PHP_WIN32 + /* VS2012 has a bug where strftime crash with %z and %Z format when the + initial buffer is too small. Increasing the buffer size helps in a + workaround to fixs longer format strings for this VS version. + http://connect.microsoft.com/VisualStudio/feedback/details/759720/vs2012-strftime-crash-with-z-formatting-code + */ + size_t buf_len = 256; +#else + size_t buf_len = 64; +#endif + size_t real_len; timelib_time*ts; timelib_tzinfo *tzi; timelib_time_offset *offset = NULL; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed bug #64359 strftime crash with VS2012: NEWS ext/date/php_date.c
On Wed, 6 Mar 2013, Anatol Belski wrote: +#ifdef PHP_WIN32 + /* VS2012 has a bug where strftime crash with %z and %Z format when the +initial buffer is too small. Increasing the buffer size helps in a +workaround to fixs longer format strings for this VS version. + http://connect.microsoft.com/VisualStudio/feedback/details/759720/vs2012-strftime-crash-with-z-formatting-code + */ + size_t buf_len = 256; +#else + size_t buf_len = 64; +#endif + size_t real_len; Why the ifdef? You can just set it to 256 for everything. cheers, Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: simplified the previous fix for #64359: ext/date/php_date.c
Commit:8589dfb6cce4de3c13456486760c5d9e3dbc3b43
Author:Anatol Belski a...@php.net Wed, 6 Mar 2013 16:48:51 +0100
Parents: 371000a877c91cfc11ff3c75ce83826797478569
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=8589dfb6cce4de3c13456486760c5d9e3dbc3b43
Log:
simplified the previous fix for #64359
Bugs:
https://bugs.php.net/64359
Changed paths:
M ext/date/php_date.c
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 418747c..7195857 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -1574,17 +1574,7 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS,
int gmt)
long timestamp = 0;
struct tmta;
int max_reallocs = 5;
-#ifdef PHP_WIN32
- /* VS2012 has a bug where strftime crash with %z and %Z format when the
- initial buffer is too small. Increasing the buffer size helps in a
- workaround to fixs longer format strings for this VS version.
-
http://connect.microsoft.com/VisualStudio/feedback/details/759720/vs2012-strftime-crash-with-z-formatting-code
- */
- size_t buf_len = 256;
-#else
- size_t buf_len = 64;
-#endif
- size_t real_len;
+ size_t buf_len = 256, real_len;
timelib_time*ts;
timelib_tzinfo *tzi;
timelib_time_offset *offset = NULL;
@@ -1637,6 +1627,9 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS,
int gmt)
#endif
}
+ /* VS2012 crt has a bug where strftime crash with %z and %Z format when
the
+ initial buffer is too small. See
+
http://connect.microsoft.com/VisualStudio/feedback/details/759720/vs2012-strftime-crash-with-z-formatting-code
*/
buf = (char *) emalloc(buf_len);
while ((real_len=strftime(buf, buf_len, format, ta))==buf_len ||
real_len==0) {
buf_len *= 2;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for the next beta: NEWS
Commit:4923bb579aba94e0a6ff6d23e2320daba52f762c Author:David Soria Parra d...@php.net Wed, 6 Mar 2013 23:51:27 +0100 Parents: b6ae7cba1ec4f999602241e690d2e5cc13ec4120 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4923bb579aba94e0a6ff6d23e2320daba52f762c Log: NEWS for the next beta Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index c00c0c5..74fda06 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 20??, PHP 5.5.0 Beta 2 + 07 Mar 2013, PHP 5.5.0 Beta 1 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: NEWS for PHP 5.5.0 Beta 1: NEWS
Commit:b6ae7cba1ec4f999602241e690d2e5cc13ec4120 Author:David Soria Parra d...@php.net Wed, 6 Mar 2013 22:39:54 +0100 Parents: 8589dfb6cce4de3c13456486760c5d9e3dbc3b43 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b6ae7cba1ec4f999602241e690d2e5cc13ec4120 Log: NEWS for PHP 5.5.0 Beta 1 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 6ac8418..c00c0c5 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 201?, PHP 5.5.0 Beta 1 +07 Mar 2013, PHP 5.5.0 Beta 1 - Core: . Fixed bug #49348 (Uninitialized ++$foo-bar; does not cause a notice). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.5.0beta1
Tag php-5.5.0beta1 in php-src.git was created Link: http://git.php.net/?p=php-src.git;a=tag;h=401261a0aa11c29c2210a77a3a6a042a8200ea0b Target: 401261a0aa11c29c2210a77a3a6a042a8200ea0b Author: David Soria Parra d...@php.net Wed, 6 Mar 2013 23:56:09 +0100 Parents: b6ae7cba1ec4f999602241e690d2e5cc13ec4120 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=401261a0aa11c29c2210a77a3a6a042a8200ea0b Target log: PHP 5.5.0 Beta 1 Changed paths: M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
