com php-src: Merge branch 'PHP-5.5' into PHP-5.5.27: configure.in main/php_version.h

Commit: 0f8ea7cc44669c4f9041af68c488a429dcfd844e Author: Julien Pauli <jpauli@php.net> Wed, 8 Jul 2015 16:41:46 +0200 Parents: 5254ddb3550235542ab9352795e20c8bb63c46f9 b4b082e63ecab2a81e565fb07aafaaaf67b77f66 Branches: PHP-5.5.27 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f8ea7cc44669c4f9041af68c488a429dcfd844e Log: Merge branch 'PHP-5.5' into PHP-5.5.27 * PHP-5.5: Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file add missing second argument for ucfirst to the proto Better fix for bug #69958 Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file fix unknown size of void error 5.5.28 now - Security Only Move strlen() check to php_mail_detect_multiple_crlf() Fixed Bug #69874 : Can't set empty additional_headers for mail() Conflicts: configure.in main/php_version.h Bugs: https://bugs.php.net/69958 https://bugs.php.net/69669 https://bugs.php.net/69923 https://bugs.php.net/69874 Changed paths: MM configure.in MM main/php_version.h Diff: diff --cc configure.in index 3b50f85,efcf90e..5e04545 --- a/configure.in +++ b/configure.in @@@ -119,8 -119,8 +119,8 @@@ int zend_sprintf(char *buffer, const ch PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 -PHP_RELEASE_VERSION=28 -PHP_EXTRA_VERSION="-dev" +PHP_RELEASE_VERSION=27 - PHP_EXTRA_VERSION="RC1" ++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 --cc main/php_version.h index b079d94,29d484e..f7dc1a8 --- a/main/php_version.h +++ b/main/php_version.h @@@ -2,7 -2,7 +2,7 @@@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 -#define PHP_RELEASE_VERSION 28 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.27-dev" -#define PHP_VERSION_ID 50528 +#define PHP_RELEASE_VERSION 27 - #define PHP_EXTRA_VERSION "RC1" - #define PHP_VERSION "5.5.27RC1" ++#define PHP_EXTRA_VERSION "" ++#define PHP_VERSION "5.5.27" +#define PHP_VERSION_ID 50527