changelog               Sun Apr 23 05:31:46 2006 UTC

  Modified files:              
    /php-src    ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2323&r2=1.2324&diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2323 php-src/ChangeLog:1.2324
--- php-src/ChangeLog:1.2323    Sat Apr 22 05:31:49 2006
+++ php-src/ChangeLog   Sun Apr 23 05:31:45 2006
@@ -1,3 +1,41 @@
+2006-04-22  Antony Dovgal  <[EMAIL PROTECTED]>
+
+    * ext/standard/tests/file/bug37158.phpt
+      main/streams/php_streams_int.h
+      main/streams/streams.c
+      main/streams/userspace.c:
+      merge fix for #37158 into HEAD
+      add test
+
+    * (PHP_5_1)
+      ext/standard/tests/file/bug37158.phpt:
+      bah.. no UEXPECT in this branch..
+
+    * ext/standard/tests/file/bug37158.phpt
+      ext/standard/tests/file/bug37158.phpt:
+      
+      file bug37158.phpt was initially added on branch PHP_5_1.
+
+    * (PHP_5_1)
+      NEWS:
+      BFN
+
+2006-04-22  Wez Furlong  <[EMAIL PROTECTED]>
+
+    * (PHP_5_1)
+      NEWS
+      main/streams/php_streams_int.h
+      main/streams/streams.c
+      main/streams/userspace.c:
+      fix for #37158
+
+2006-04-22  Frank M. Kromann  <[EMAIL PROTECTED]>
+
+    * ext/standard/file.c
+      ext/standard/image.c
+      sapi/cli/php_cli.c:
+      Fix Win32 build. NULL_ZSTR was converted to ZSTR(NULL_ZSTR)
+
 2006-04-21  Andrei Zmievski  <[EMAIL PROTECTED]>
 
     * ZendEngine2/zend_objects_API.c:

Reply via email to