com php-src: fix NEWS & version: NEWS configure.in main/php_v ersion.h

Commit: 4d54c4bdf0213bed112af70c98e92de51cdf49f7 Author: Stanislav Malyshev <stas@php.net> Wed, 22 Oct 2014 13:16:29 -0700 Parents: de4fff0fb38e54b69918e381e0445d831fe87868 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4d54c4bdf0213bed112af70c98e92de51cdf49f7 Log: fix NEWS & version Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index f99fe84..8f8cd49 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 19aec59..91ae7fc 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 0ef8760..a3e2cfc 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