From: Derick Rethans <derick@php.net>
Date: Wed, 24 Apr 2002 06:40:36 +0000 (+0000)
Subject: Merge fixes
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~455
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df97b95b4d21ab742e16fd44e59a8b7227e1c643;p=php

Merge fixes
---

diff --git a/NEWS b/NEWS
index 9b474e01ba..ed63f15c07 100644
--- a/NEWS
+++ b/NEWS
@@ -66,7 +66,10 @@ PHP 4                                                                      NEWS
   dependencies. Automake is only needed for its aclocal tool. The build 
   process is now more portable and less resource-consuming. (Sascha)
 
-xx xxx 2002, Version 4.2.1
+03 May 2002, Version 4.2.1
+- Fixed SJIS directory name handling under Windows. (Rui)
+- Fixed empty mb_output_handler() output when Content-Type is specified.
+  (Yasuo) 
 - Fixed the false logic in ext/session which made SID constant not to be
   defined when cookies are disabled. (Sascha)
 - Fixed possible crash bug in HTTP uploads. (Patch: Lucas Schroeder)