summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>1999-08-09 18:29:40 +0000
committerAndi Gutmans <andi@php.net>1999-08-09 18:29:40 +0000
commitc791d60ad9c264673fb29f6f26b2647a6544e011 (patch)
treed40ccf1991505e2eed33de1e24563f78258c839b
parent3516ee485aa2d683a2ca9b91fa4d0eb4a8761dfb (diff)
downloadphp-git-c791d60ad9c264673fb29f6f26b2647a6544e011.tar.gz
Go beta 2 (final)
-rw-r--r--ChangeLog10
-rw-r--r--configure.in.in2
-rw-r--r--main/internal_functions_win32.c4
-rw-r--r--main/php_version.h2
4 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d4f5277a22..c825e7a1d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,12 @@ PHP 4.0 CHANGE LOG ChangeLog
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
??? ?? 1999, Version 4.0 Beta 2
-- fixed SYSV-SHM interface (Thies).
-- updated hyperwave module, made it thread safe
-- updated pdflib module, version 0.6 of pdflib no longer supported
-- updated fdf module
+- Fixed a problem when sending HTTP/1.x header lines using header() (Zeev)
+- Win32 builds now include the ODBC module built-in (Zeev)
+- Fixed SYSV-SHM interface (Thies).
+- Updated hyperwave module, made it thread safe
+- Updated pdflib module, version 0.6 of pdflib no longer supported
+- Updated fdf module
- Built-in phpinfo() links are now turned off by default. They can be turned
on using the allow_builtin_links INI directive (Zeev)
- Changed phpinfo() to list modules that have no info function (Zeev)
diff --git a/configure.in.in b/configure.in.in
index 8e1086c4cc..fed45111d0 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -50,7 +50,7 @@ dnl ## Diversion 4 is the last one. Here we generate files and clean up.
divert(1)
dnl ## This is where the version number is changed from now on!
-AM_INIT_AUTOMAKE(php, 4.0B2-1)
+AM_INIT_AUTOMAKE(php, 4.0B2)
PHP_VERSION=$VERSION
echo "/* automatically generated by configure */" > php_version.h.new
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 9fcbecd98d..ba7be083fa 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -47,6 +47,7 @@
#include "ext/COM/php3_COM.h"
#include "ext/standard/reg.h"
#include "ext/pcre/php_pcre.h"
+#include "ext/odbc/php3_odbc.h"
/* SNMP has to be moved to ext */
/* #include "dl/snmp/php3_snmp.h" */
@@ -74,7 +75,8 @@ zend_module_entry *php3_builtin_modules[] = {
phpext_standard_ptr,
COM_module_ptr,
phpext_regex_ptr,
- phpext_pcre_ptr
+ phpext_pcre_ptr,
+ phpext_odbc_ptr
};
diff --git a/main/php_version.h b/main/php_version.h
index 48596cb597..712fd69b21 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -1,3 +1,3 @@
/* automatically generated by configure */
/* edit configure.in.in to change version number */
-#define PHP_VERSION "4.0B2-1"
+#define PHP_VERSION "4.0B2"