summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-02-02 17:25:23 (GMT)
committerJohannes Schlüter <johannes@php.net>2012-02-02 17:25:23 (GMT)
commit1e16c821aa4b62d28a36fc8dc2f27183d631af83 (patch)
treeb6f0c9378eefa3ce6dc43960c04a28ea87fe5bf7
parentd54bdbbbe432efe83aa4b32503f2d82c39677474 (diff)
downloadphp-1e16c821aa4b62d28a36fc8dc2f27183d631af83.tar.gz
This will be PHP 5.3.11, 5.3.10 will be released from other branch
-rw-r--r--NEWS6
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 9 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 438fbe2..c16f316 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ?? 2012, PHP 5.3.10
+?? ??? 2012, PHP 5.3.11
- Session:
. Fixed bug #60860 (session.save_handler=user without defined function core
dumps). (Felipe)
@@ -36,6 +36,10 @@ PHP NEWS
- SOAP:
. Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
+?? ??? 2012, PHP 5.3.10
+
+(to be added)
+
10 Jan 2012, PHP 5.3.9
- Core:
diff --git a/configure.in b/configure.in
index bb0fbf5..7ed2d93 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=10
+PHP_RELEASE_VERSION=11
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 ae47b88..c2f3e45 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 3
-#define PHP_RELEASE_VERSION 10
+#define PHP_RELEASE_VERSION 11
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.10-dev"
-#define PHP_VERSION_ID 50310
+#define PHP_VERSION "5.3.11-dev"
+#define PHP_VERSION_ID 50311