From 6937e71720581301e4c356249e44876a6a59521d Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Wed, 19 Apr 2006 05:31:51 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 10 +++++++
 2 files changed, 84 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6518335d12a..935a504eda6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,77 @@
+2006-04-18  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_1)
+      configure.in
+      main/php_version.h:
+      Restore dev so win32 snaps can build
+
+2006-04-18  Sara Golemon  <sara@golemon.com>
+
+    * ext/standard/file.c:
+      Silence compiler warnings
+
+    * main/php_streams.h
+      main/streams/streams.c:
+      Fix copy/paste typo in php_stream_path_decode() proto
+
+    * ZendEngine2/zend_API.c:
+      Fix ZTS build
+
+2006-04-18  Antony Dovgal  <antony@zend.com>
+
+    * ZendEngine2/zend_API.c:
+      binary strings exist only in unicode mode
+
+2006-04-18  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * ext/sqlite/sqlite.c:
+      MFB51: Fixed bug #29476 (sqlite_fetch_column_types() locks the database
+      forever).
+
+    * (PHP_5_1)
+      NEWS
+      ext/sqlite/sqlite.c:
+      Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever).
+
+2006-04-18  Dmitry Stogov  <dmitry@zend.com>
+
+    * (PHP_5_1)
+      NEWS:
+      Fixed bug #37083 (Frequent crashs in SOAP extension with new WSDL caching
+      code in multithread WS). (Andrei, Dmitry)
+
+2006-04-18  Antony Dovgal  <antony@zend.com>
+
+    * run-tests.php:
+      typofix
+
+2006-04-18  Dmitry Stogov  <dmitry@zend.com>
+
+    * sapi/cgi/fastcgi.c
+      sapi/cgi/fastcgi.c:
+      Fixed SUN_LEN calculation
+
+    * main/php_variables.c
+      main/php_variables.c
+      sapi/cgi/cgi_main.c
+      sapi/cgi/cgi_main.c:
+      Fixed memory leaks
+
+2006-04-18  Andrei Zmievski  <andrei@gravitonic.com>
+
+    * ext/standard/string.c:
+      I'm not sure what the heck people were thinking here, but it should be
+      fixed finally. Please test.
+
+    * ext/standard/string.c:
+      Fix trim("a") bug.
+
+2006-04-18  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_1)
+      ext/session/mod_files.c:
+      Commit the actual fix
+
 2006-04-17  Ilia Alshanetsky  <ilia@prohost.org>
 
     * ext/session/mod_files.c:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 17a377e0f39..55d73779b34 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-18  Sara Golemon  <sara@golemon.com>
+
+    * zend_API.c:
+      Fix ZTS build
+
+2006-04-18  Antony Dovgal  <antony@zend.com>
+
+    * zend_API.c:
+      binary strings exist only in unicode mode
+
 2006-04-15  Antony Dovgal  <antony@zend.com>
 
     * zend_strtod.c: