From d08a99eaca8f4d9dde1238b8796d2c1c2cbaade6 Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 8 Dec 2010 22:33:02 +0000
Subject: Back to dev, one final time ;-)

---
 NEWS               | 2 ++
 configure.in       | 4 ++--
 main/php_version.h | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index f836c68760..79c38fc593 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ?? ????, PHP 5.2.15
+
 09 Dec 2010, PHP 5.2.15
 - Fixed extract() to do not overwrite $GLOBALS and $this when using
   EXTR_OVERWRITE. (jorto at redhat dot com)  
diff --git a/configure.in b/configure.in
index 9cedfa8a19..a74485ce3b 100644
--- a/configure.in
+++ b/configure.in
@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=15
-PHP_EXTRA_VERSION=""
+PHP_RELEASE_VERSION=16
+PHP_EXTRA_VERSION="-dev"
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
 
diff --git a/main/php_version.h b/main/php_version.h
index fe29056662..883d5f2969 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
-#define PHP_RELEASE_VERSION 15
-#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.2.15"
-#define PHP_VERSION_ID 50215
+#define PHP_RELEASE_VERSION 16
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "5.2.16-dev"
+#define PHP_VERSION_ID 50216
-- 
cgit v1.2.1


From 5ab2577d638551ed9b8111a1ad21d252807b0fd5 Mon Sep 17 00:00:00 2001
From: Adam Harvey <aharvey@php.net>
Date: Thu, 9 Dec 2010 02:47:47 +0000
Subject: Fix the next version number in NEWS.

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 79c38fc593..b858ef31fd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ?? ????, PHP 5.2.15
+?? ?? ????, PHP 5.2.16
 
 09 Dec 2010, PHP 5.2.15
 - Fixed extract() to do not overwrite $GLOBALS and $this when using
-- 
cgit v1.2.1


From ec20844001b85aa4dd24c71c8adc209fdae73915 Mon Sep 17 00:00:00 2001
From: Pierre Joye <pajoye@php.net>
Date: Thu, 9 Dec 2010 17:04:29 +0000
Subject: - missing merge fix for #53352

---
 main/fopen_wrappers.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index a952a971e2..60452287c3 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -172,6 +172,9 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path
 				resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR;
 				resolved_basedir[++resolved_basedir_len] = '\0';
 			}
+		} else {
+				resolved_basedir[resolved_basedir_len++] = PHP_DIR_SEPARATOR;
+				resolved_basedir[resolved_basedir_len] = '\0';
 		}
 
 		resolved_name_len = strlen(resolved_name);
-- 
cgit v1.2.1


From 953b01e2f55816a90b95566faa90e6aedc931e3d Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 9 Dec 2010 19:35:13 +0000
Subject: Re-branch 5.2.15

---
 NEWS               | 2 --
 configure.in       | 4 ++--
 main/php_version.h | 8 ++++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index b858ef31fd..f836c68760 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ?? ????, PHP 5.2.16
-
 09 Dec 2010, PHP 5.2.15
 - Fixed extract() to do not overwrite $GLOBALS and $this when using
   EXTR_OVERWRITE. (jorto at redhat dot com)  
diff --git a/configure.in b/configure.in
index a74485ce3b..9cedfa8a19 100644
--- a/configure.in
+++ b/configure.in
@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=16
-PHP_EXTRA_VERSION="-dev"
+PHP_RELEASE_VERSION=15
+PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
 
diff --git a/main/php_version.h b/main/php_version.h
index 883d5f2969..fe29056662 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
-#define PHP_RELEASE_VERSION 16
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.2.16-dev"
-#define PHP_VERSION_ID 50216
+#define PHP_RELEASE_VERSION 15
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.2.15"
+#define PHP_VERSION_ID 50215
-- 
cgit v1.2.1