From b070f1080bdb59cbecaebe617f890c2859cb4448 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Fri, 17 Jan 2014 12:34:23 +0900 Subject: [PATCH 1/2] Update NEWS --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 7dec1e52f15..2f098bf9c65 100644 --- a/NEWS +++ b/NEWS @@ -15,8 +15,8 @@ PHP NEWS ^M as lineend). (Laruence) - Session - . Fixed session module is sending multiple set-cookie headers when - session.use_strict_mode=1 (Yasuo) + . Fixed bug #66469 (Session module is sending multiple set-cookie headers when + session.use_strict_mode=1) (Yasuo) . Fixed bug #66481 (Segfaults on session_name()). (cmcdermottroe at engineyard dot com, Yasuo) From 7f0aff52cf35db89c1285ddb931fc118e1127561 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 17 Jan 2014 11:03:40 +0100 Subject: [PATCH 2/2] added appropriate exception handling flag to ext\intl According to the doc page http://msdn.microsoft.com/en-us/library/1deeycx5.aspx it's appropriate as none of the extern C functions do throw exceptions. This also fixes the warning C4530. --- ext/intl/config.w32 | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/intl/config.w32 b/ext/intl/config.w32 index bb1dca8124a..22cde6bd6d9 100644 --- a/ext/intl/config.w32 +++ b/ext/intl/config.w32 @@ -118,6 +118,7 @@ if (PHP_INTL != "no") { "intl"); ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib icule.lib iculx.lib"); + ADD_FLAG("CFLAGS_INTL", "/EHsc"); AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled"); } else { WARNING("intl not enabled; libraries and/or headers not found");