From: Andi Gutmans <andi@php.net>
Date: Sat, 11 Jun 2005 16:59:24 +0000 (+0000)
Subject: - b2 (will post it to internals@)
X-Git-Tag: php-5.1.0b2~234
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0787f3d2442d72a619b2bc92d8a2e4f4d976ed6;p=php

- b2 (will post it to internals@)
---

diff --git a/NEWS b/NEWS
index 4041fc8cc4..245032b43c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+11 Jun 2005, PHP 5.1 Beta 2
+- Fixed PDO shutdown problem (possible inifite loop running rollback on
+  shutdown). (Wez)
+- Fixed PECL bug #3714 (beginTransaction doesn't work if you're in
+  auto-commit mode). (Wez)
+
 10 Jun 2005, PHP 5.1 Beta 1
 - Added user opcode API that allow overloading of opcode handlers. (Dmitry)
 - Opcodes ZEND_NEW, ZEND_JMP_NO_CTOR, ZEND_INIT_CTOR are mefget into one
diff --git a/Zend/zend.h b/Zend/zend.h
index 248e7d0233..68efea2913 100644
--- 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 1db39657d8..093ee32d95 100644
--- 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 eefa06de77..423e53eb9c 100644
--- 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"