summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2010-12-15 13:47:14 +0000
committerIlia Alshanetsky <iliaa@php.net>2010-12-15 13:47:14 +0000
commite3e7c70da5cdd938efbd508cd307b4e4c5ad2095 (patch)
tree8cc0981cf5b9219d4cf5db6158ee580ba8c34e10
parent643629a7b76dbb0760bdaa51d052469771b5bf4e (diff)
downloadphp-git-e3e7c70da5cdd938efbd508cd307b4e4c5ad2095.tar.gz
back to dev
-rw-r--r--NEWS2
-rw-r--r--configure.in4
-rw-r--r--main/php_version.h8
3 files changed, 8 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 2613534240..73cb0663c6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? ????, PHP 5.2.17
+
16 Dec 2010, PHP 5.2.16
- Fixed bug #53517 (segfault in pgsql_stmt_execute() when postgres is down).
(gyp at balabit dot hu)
diff --git a/configure.in b/configure.in
index a6a7384405..bb6624d782 100644
--- a/configure.in
+++ b/configure.in
@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=16
-PHP_EXTRA_VERSION=""
+PHP_RELEASE_VERSION=17
+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 --git a/main/php_version.h b/main/php_version.h
index d120f0d2c8..7d71d61903 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 2
-#define PHP_RELEASE_VERSION 16
-#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.2.16"
-#define PHP_VERSION_ID 50216
+#define PHP_RELEASE_VERSION 17
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "5.2.16-dev"
+#define PHP_VERSION_ID 50217