summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-11-08 00:01:43 +0100
committerJohannes Schlüter <johannes@php.net>2012-11-08 00:01:43 +0100
commit417b1b238fe79aa6a70aa71b4bb473d88a0d097f (patch)
treefb133d7407fc0ebde75582489a9d962bef99d648
parent7fcbe4d5467300a0acee78330a0cdc9d1cbf05ad (diff)
downloadphp-git-417b1b238fe79aa6a70aa71b4bb473d88a0d097f.tar.gz
This will be PHP 5.3.20
-rw-r--r--NEWS7
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 11 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index d03a2da4f9..5981ec4bfd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,14 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2ß12, PHP 5.3.20
+
?? ??? 2012, PHP 5.3.19
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ADD NEWS ONLY ABOVE IN 5.3.20 SECTION
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+RM will merge 5.3.19 entries when merging to release branch
+
- Core
. Fixed bug #63241 (PHP fails to open Windows deduplicated files).
(daniel dot stelter-gliese at innogames dot de)
diff --git a/configure.in b/configure.in
index 050f8d40f1..66900b455c 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=19
+PHP_RELEASE_VERSION=20
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 e4ba15eba9..331f30a051 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 19
+#define PHP_RELEASE_VERSION 20
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.19-dev"
-#define PHP_VERSION_ID 50319
+#define PHP_VERSION "5.3.20-dev"
+#define PHP_VERSION_ID 50320