summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-10-22 13:16:29 -0700
committerStanislav Malyshev <stas@php.net>2014-10-22 13:16:29 -0700
commit4d54c4bdf0213bed112af70c98e92de51cdf49f7 (patch)
tree55fb76ea91ec161428840360c5daf96516a2af0e
parentde4fff0fb38e54b69918e381e0445d831fe87868 (diff)
downloadphp-git-4d54c4bdf0213bed112af70c98e92de51cdf49f7.tar.gz
fix NEWS & version
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index f99fe84d1b..8f8cd49e7a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-???, PHP 5.4.34
+?? ??? ???, PHP 5.4.35
- Fileinfo:
. Fixed bug #68283 (fileinfo: out-of-bounds read in elf note headers).
diff --git a/configure.in b/configure.in
index 19aec5936c..91ae7fce91 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=34
+PHP_RELEASE_VERSION=35
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 0ef8760e08..a3e2cfc31f 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,8 +2,8 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 34
+#define PHP_RELEASE_VERSION 35
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.34-dev"
-#define PHP_VERSION_ID 50434
+#define PHP_VERSION "5.4.35-dev"
+#define PHP_VERSION_ID 50435