com php-src: Merge branch 'PHP-5.4' into PHP-5.5: configure.in ext/phar/phar_internal.h main/php_version.h
| From: | Stanislav Malyshev | Date: | Tue, 14 Apr 2015 07:34:02 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: configure.in ext/phar/phar_internal.h main/php_version.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86196@lists.php.net to get a copy of this message | ||
Commit: e21f87e9578884b8cc7914d1e68aca0a0b54c8b7
Author: Stanislav Malyshev <stas@php.net> Tue, 14 Apr 2015 00:34:02 -0700
Parents: 100614da271f898384cea4b2b1cead39a0dc8ccd e10272c628a1163fb493910bdd1bb47b6c730813
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e21f87e9578884b8cc7914d1e68aca0a0b54c8b7
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix type in fix for #69085
fix CVE num
Conflicts:
configure.in
main/php_version.h
Bugs:
https://bugs.php.net/69441
https://bugs.php.net/69085
Changed paths:
MM configure.in
MM ext/phar/phar_internal.h
MM main/php_version.h
Diff:
diff --cc configure.in
index 3d58d4c,11bfa6d..1669739
--- a/configure.in
+++ b/configure.in
@@@ -118,9 -118,9 +118,9 @@@ int zend_sprintf(char *buffer, const ch
])
PHP_MAJOR_VERSION=5
-PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=41
+PHP_MINOR_VERSION=5
- PHP_RELEASE_VERSION=24
- PHP_EXTRA_VERSION="RC1"
++PHP_RELEASE_VERSION=25
+ 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 --cc main/php_version.h
index 6a8e89e,e4ca1a5..053bc56
--- a/main/php_version.h
+++ b/main/php_version.h
@@@ -1,8 -1,8 +1,8 @@@
/* automatically generated by configure */
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 41
+#define PHP_MINOR_VERSION 5
- #define PHP_RELEASE_VERSION 24
- #define PHP_EXTRA_VERSION "RC1"
- #define PHP_VERSION "5.5.24RC1"
- #define PHP_VERSION_ID 50524
++#define PHP_RELEASE_VERSION 25
+ #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.41-dev"
-#define PHP_VERSION_ID 50441
++#define PHP_VERSION "5.5.25-dev"
++#define PHP_VERSION_ID 50525