From b5a926f78d0b4bd16abd17891a3d36308945417c Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Fri, 23 Jul 2004 00:36:00 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog |  5 ++++
 2 files changed, 71 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 25ca56a1b0..b6a1846b06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,69 @@
+2004-07-22  Stefan Esser  <sesser@suspekt.org>
+
+    * ext/gd/gd.dsp:
+      Fix .dsp
+
+    * ext/gd/config.m4
+      ext/gd/config.w32
+      ext/gd/gd.dsp
+      ext/gd/libgd/gd.h
+      ext/gd/libgd/gd_gif_out.c
+      ext/gd/libgd/gd_topal.c:
+      Merge changes from GD 2.0.28
+
+2004-07-22  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * tests/classes/bug26737.phpt
+      tests/classes/bug26737.phpt:
+      Fix testcase
+
+2004-07-22  Wez Furlong  <wez.php@thebrainroom.net>
+
+    * NEWS:
+      news...
+
+    * ext/standard/basic_functions.c
+      ext/standard/file.c
+      ext/standard/streamsfuncs.c
+      ext/standard/streamsfuncs.h:
+      Added stream_context_get_default() which returns the default context
+      option.
+      You may then set options that affect streams operations for the whole
+      script.
+      
+      Added stream_socket_enable_crypto() which allows you to turn on or off a
+      crypto
+      layer (eg: SSL/TLS) on stream, if supported by the underlying transport.
+      
+      Registered a bunch of constants for that.
+
+2004-07-22  Zeev Suraski  <zeev@zend.com>
+
+    * ZendEngine2/zend_object_handlers.c:
+      Fix bug in handling of protected properties
+
+    * win32/php5dllts.dsp:
+      Fix Windows build
+
+2004-07-22  Georg Richter  <georg@mysql.com>
+
+    * (PHP_5_0)
+      ext/mysqli/config.m4:
+      MFH: changed warning (bug #29298) for outdated client library
+
+    * ext/mysqli/config.m4:
+      changed warning (bug #29298) for outdated client library
+
+2004-07-22  Sara Golemon  <php@alphaweb.net>
+
+    * (PHP_5_0)
+      ext/mysqli/mysqli_api.c:
+      MFH: This should fix binary safety for bound results.
+
+    * ext/mysqli/mysqli_api.c:
+      This should fix binary safety for bound results or may coogle strike me
+      down.
+
 2004-07-21  Edin Kadribasic  <edink@emini.dk>
 
     * configure.in
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 67b32f5499..c010be38c8 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-22  Zeev Suraski  <zeev@zend.com>
+
+    * zend_object_handlers.c:
+      Fix bug in handling of protected properties
+
 2004-07-21  Edin Kadribasic  <edink@emini.dk>
 
     * zend_builtin_functions.c:
-- 
2.50.1