- Beta 2

diff --git a/NEWS b/NEWS
index eb55b0c2cb173753ec1e1809d2ce2e69c2d34211..eee7a6fe37f730dec5194cb892fc465792dcca4b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,16 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2005, PHP 5.1 Beta 3?
-- Fixed bug #33427 (ext/odbc: check if unixODBC header file exists). (Jani)
-- Fixed bug #33299 (php:function no longer handles returned dom objects). 
-  (Rob, Joe Orton)
-- Fixed bug #33257 (array_splice() inconsistent when passed function instead
-  of variable). (Dmitry)
-- Fixed bug #29896 (Backtrace argument list out of sync). (Dmitry)
-- Fixed bug #15854 (boolean ini options may be incorrectly displayed as Off 
-  when they are On). (Tony)
-
-21 Jun 2005, PHP 5.1 Beta 2
+22 Jun 2005, PHP 5.1 Beta 2
 - Improved PHP extension loading mechanism with support for module dependencies
   and conflicts. (Jani, Dmitry) 
 - Allowed return by reference from internal functions. (Marcus, Andi, Dmitry)
@@ -27,6 +17,7 @@ PHP                                                                        NEWS
   shutdown). (Wez)
 - Fixed PECL bug #3714 (PDO: beginTransaction doesn't work if you're in
   auto-commit mode). (Wez)
+- Fixed bug #33427 (ext/odbc: check if unixODBC header file exists). (Jani)
 - Fixed bug #33389 (double free() when exporting a ReflectionClass). (Marcus)
 - Fixed bug #33382 (array_reverse() fails after *sort()), 
   introduced by zend_hash_sort() optimizations in HEAD. (Tony)
@@ -34,24 +25,31 @@ PHP                                                                        NEWS
 - Fixed bug #33318 (throw 1; results in Invalid opcode 108/1/8). (Dmitry)
 - Fixed bug #33312 (ReflectionParameter methods do not work correctly).
   (Dmitry)
+- Fixed bug #33299 (php:function no longer handles returned dom objects). 
+  (Rob, Joe Orton)
 - Fixed bug #33286 (nested array_walk() calls and user array compare functions
   broken; FCI cache). (Andrei, patch from m.bretz@metropolis-ag.de)
 - Fixed bug #33277 (private method accessed by child class). (Dmitry)
+- Fixed bug #33257 (array_splice() inconsistent when passed function instead
+  of variable). (Dmitry)
 - Fixed bug #33212 ([GCC 4]: 'zend_error_noreturn' aliased to external symbol
   'zend_error'). (Dmitry)
 - Fixed bug #33150 (shtool: insecure temporary file creation). (Jani)
 - Fixed bug #33136 (method offsetSet in class extended from ArrayObject crash 
   PHP). (Marcus)
+- Fixed bug #32160 (copying a file into itself leads to data loss). (Ilia)
 - Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle -pthread).
   (Jani)
 - Fixed bug #31213 (Sideeffects caused by fix of bug #29493). (Dmitry)
-- Fixed bug #32160 (copying a file into itself leads to data loss). (Ilia)
 - Fixed bug #31054 (safe_mode & open_basedir checks only check first 
   include_path value). (Ilia)
+- Fixed bug #29896 (Backtrace argument list out of sync). (Dmitry)
 - Fixed bug #29683 (headers_list() returns empty array). (Tony)
 - Fixed bug #28355 (glob wont error if dir is not readable). (Hartmut)
 - Fixed bugs #20382, #28024, #30532, #32086, #32270, #32555, #32588, #33056
   (strtotime() related bugs). (Derick)
+- Fixed bug #15854 (boolean ini options may be incorrectly displayed as Off 
+  when they are On). (Tony)
 
 10 Jun 2005, PHP 5.1 Beta 1
 - Upgraded PCRE library to version 5.0. (Andrei)

diff --git a/Zend/zend.h b/Zend/zend.h
index eb06003029937609bc919b853209660031883efb..190df20e0018e9980558ce9669ba204db0d97b0b 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -22,7 +22,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "2.1.0-dev"
+#define ZEND_VERSION "2.1.0b2"
 
 #define ZEND_ENGINE_2
 

diff --git a/configure.in b/configure.in
index 1b7274bfdcfa875bac253e10fcf90e24522b1acf..40e55b2cc547e566b3b0d63575ebe9241caf56dc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h)
 MAJOR_VERSION=5
 MINOR_VERSION=1
 RELEASE_VERSION=0
-EXTRA_VERSION="-dev"
+EXTRA_VERSION="b2"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
 dnl Define where extension directories are located in the configure context

diff --git a/main/php_version.h b/main/php_version.h
index eefa06de776db7c4389d5dcfda0c97181c152db5..423e53eb9c7edb6d4fbde130c8f632b29a8394e5 100644 (file)
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 1
 #define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.1.0-dev"
+#define PHP_EXTRA_VERSION "b2"
+#define PHP_VERSION "5.1.0b2"