Merge remote-tracking branch 'origin/master' into PHP-7.0.0

* origin/master: add missing NEWS entries add missing NEWS entries Fixed bug #69646 (OS command injection vulnerability in escapeshellarg) add NEWS Fixed bug #68776 fix test update NEWS fix typo Fix bug #69646 OS command injection vulnerability in escapeshellarg Fix #69719 - more checks for nulls in paths fix test description Fixed Buf #68812 Unchecked return value.
Merge branch 'master' into PHP-7.0.0
2026-11-12 19:50:50 +00:00 · 2015-06-10 10:49:51 +02:00 · 2015-06-09 16:42:24 +02:00 · 2015-06-09 14:24:39 +02:00
3 changed files with 3 additions and 5 deletions
@@ -1,7 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-25 Jun 2015, PHP 7.0.0 Alpha 2
-
 11 Jun 2015, PHP 7.0.0 Alpha 1

 - Core:
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=7
 PHP_MINOR_VERSION=0
 PHP_RELEASE_VERSION=0
-PHP_EXTRA_VERSION="-dev"
+PHP_EXTRA_VERSION="alpha1"
 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`

@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "7.0.0-dev"
+#define PHP_EXTRA_VERSION "alpha1"
+#define PHP_VERSION "7.0.0alpha1"
 #define PHP_VERSION_ID 70000