*** empty log message ***

3 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 060a1f8891..4fcab86c16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@ PHP 4.0 CHANGE LOG                                                    ChangeLog
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ?? ?? 1999, Version 4.0 Beta 3
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+- Renamed allow_builtin_links to expose_php (defaults to On).  This directive
+  tells PHP whether it may expose its existence to the outside world, e.g.
+  by adding itself to the Web server header (Zeev)
 - Added support for transparent session id propagation (Sascha)
 - Made WDDX serialize object properties properly (Andrey)
 - Fixed WDDX mem leak when undefined variable is passed in
@@ -22,7 +27,7 @@ PHP 4.0 CHANGE LOG                                                    ChangeLog
 - Resourcified Informix driver (Danny)
 - New resource handling for odbc, renamed to php_odbc.[ch]
 - Make set_time_limit() work on Unix (Rasmus)
-- Add connection handling support (Rasmus)
+- Added connection handling support (Rasmus)
 - Improved the Sybase-CT module to make use of resources (Zeev)
 - Improved the mSQL module to make use of resources (Zeev)
 - Changed mysql_query() and mysql_db_query() to return false in case of saving
diff --git a/mod_php4.c b/mod_php4.c
index bcd7415cb2..cc73f4bc89 100644
--- a/mod_php4.c
+++ b/mod_php4.c
@@ -488,7 +488,9 @@ void php_init_handler(server_rec *s, pool *p)
 		apache_php_initialized = 1;
 	}
 #if MODULE_MAGIC_NUMBER >= 19980527
-	ap_add_version_component("PHP/" PHP_VERSION);
+	if (INI_INT("expose_php")) {
+		ap_add_version_component("PHP/" PHP_VERSION);
+	}
 #endif
 }
 
diff --git a/output.c b/output.c
index e1363d6c42..7a64e544e5 100644
--- a/output.c
+++ b/output.c
@@ -207,7 +207,7 @@ static int zend_ub_body_write(const char *str, uint str_length)
 		}
 
 		zend_body_write = zend_ub_body_write_no_header;
-		result = zend_header_write(str, str_length);
+		result = zend_ub_body_write_no_header(str, str_length);
 
 		if (newstr) {
 			free(newstr);