summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2012-06-14 16:02:21 +0200
committerOndřej Surý <ondrej@sury.org>2012-06-14 16:02:21 +0200
commitf0f8d7084aec4be5c07f02f2e29c2820f85c8315 (patch)
tree02e9b39d5b0088a0e27126010c96a748d824d055 /main
parent90ceaa9e92fadfef4c21ec0f76063c4387beb561 (diff)
downloadphp-f0f8d7084aec4be5c07f02f2e29c2820f85c8315.tar.gz
Imported Upstream version 5.4.4upstream/5.4.4
Diffstat (limited to 'main')
-rw-r--r--main/php_config.h.in3
-rw-r--r--main/php_version.h6
2 files changed, 3 insertions, 6 deletions
diff --git a/main/php_config.h.in b/main/php_config.h.in
index cd96c1418..326dc7bc7 100644
--- a/main/php_config.h.in
+++ b/main/php_config.h.in
@@ -1498,9 +1498,6 @@
/* */
#undef HAVE_SAPDB
-/* Whether you have sockaddr_storage.ss_family */
-#undef HAVE_SA_SS_FAMILY
-
/* Define to 1 if you have the `scandir' function. */
#undef HAVE_SCANDIR
diff --git a/main/php_version.h b/main/php_version.h
index 6b49f4086..4f953462a 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 4
-#define PHP_RELEASE_VERSION 5
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.5-dev"
+#define PHP_RELEASE_VERSION 4
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.4"
#define PHP_VERSION_ID 50404