From f7cb87f333adeeaf475d17b19745a1a1a53dce2d Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Fri, 2 May 2014 10:23:09 -0700 Subject: [PATCH 1/2] Fix author name on the #63228 patch. --- NEWS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 03b613b92ff..848029fcdc3 100644 --- a/NEWS +++ b/NEWS @@ -720,7 +720,8 @@ PHP NEWS . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam) - Litespeed: - . Fixed bug #63228 (-Werror=format-security error in lsapi code). (George) + . Fixed bug #63228 (-Werror=format-security error in lsapi code). + (Elan Ruusamäe, George) - ext/sqlite3: . Fixed bug #63921 (sqlite3::bindvalue and relative PHP functions aren't From f880013c4d0a65baa104c19cd8058a970295eb80 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 11 Apr 2014 12:43:35 +0400 Subject: [PATCH 2/2] Fixed tests (they might fail from time to time because of session GC) --- ext/session/tests/session_set_save_handler_class_005.phpt | 1 + ext/session/tests/session_set_save_handler_class_012.phpt | 1 + 2 files changed, 2 insertions(+) diff --git a/ext/session/tests/session_set_save_handler_class_005.phpt b/ext/session/tests/session_set_save_handler_class_005.phpt index a996eb8d260..c74c81de1db 100644 --- a/ext/session/tests/session_set_save_handler_class_005.phpt +++ b/ext/session/tests/session_set_save_handler_class_005.phpt @@ -3,6 +3,7 @@ Test session_set_save_handler() : incomplete implementation --INI-- session.save_handler=files session.name=PHPSESSID +session.gc_probability=0 --SKIPIF-- --FILE-- diff --git a/ext/session/tests/session_set_save_handler_class_012.phpt b/ext/session/tests/session_set_save_handler_class_012.phpt index 706ef793ef7..3899d28816e 100644 --- a/ext/session/tests/session_set_save_handler_class_012.phpt +++ b/ext/session/tests/session_set_save_handler_class_012.phpt @@ -3,6 +3,7 @@ Test session_set_save_handler() : incorrect arguments for existing handler open --INI-- session.save_handler=files session.name=PHPSESSID +session.gc_probability=0 --SKIPIF-- --FILE--